diff options
| author | Lester Solbakken <lester.solbakken@gmail.com> | 2024-04-15 15:06:45 +0200 |
|---|---|---|
| committer | Lester Solbakken <lester.solbakken@gmail.com> | 2024-04-15 15:06:45 +0200 |
| commit | 58bed89d3f1546a4c3103479d9686ad9b77fd5fd (patch) | |
| tree | 2216bcbe9f0429338276e94bd511d1570cf947b8 | |
| parent | 6f568fd79c35d7034eef3cb6ee5132d6aa0fe2f4 (diff) | |
Don't load native libraries in standalone
| -rw-r--r-- | client/go/internal/admin/vespa-wrapper/standalone/start.go | 1 | ||||
| -rw-r--r-- | container-llama/src/main/java/ai/vespa/llama/LlamaBundleActivator.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/client/go/internal/admin/vespa-wrapper/standalone/start.go b/client/go/internal/admin/vespa-wrapper/standalone/start.go index a3703ce930c..16e76562b99 100644 --- a/client/go/internal/admin/vespa-wrapper/standalone/start.go +++ b/client/go/internal/admin/vespa-wrapper/standalone/start.go @@ -41,6 +41,7 @@ func StartStandaloneContainer(extraArgs []string) int { c := jvm.NewStandaloneContainer(serviceName) jvmOpts := c.JvmOptions() jvmOpts.AddOption("-DOnnxBundleActivator.skip=true") + jvmOpts.AddOption("-DLlamaBundleActivator.skip=true") for _, extra := range extraArgs { jvmOpts.AddOption(extra) } diff --git a/container-llama/src/main/java/ai/vespa/llama/LlamaBundleActivator.java b/container-llama/src/main/java/ai/vespa/llama/LlamaBundleActivator.java index 11ba05e363d..846a2008858 100644 --- a/container-llama/src/main/java/ai/vespa/llama/LlamaBundleActivator.java +++ b/container-llama/src/main/java/ai/vespa/llama/LlamaBundleActivator.java @@ -13,12 +13,19 @@ import java.util.logging.Logger; **/ public class LlamaBundleActivator implements BundleActivator { + private static final String SKIP_SUFFIX = ".skip"; + private static final String SKIP_VALUE = "true"; private static final String PATH_PROPNAME = "de.kherud.llama.lib.path"; private static final Logger log = Logger.getLogger(LlamaBundleActivator.class.getName()); @Override public void start(BundleContext ctx) { log.fine("start bundle"); + String skipAll = LlamaBundleActivator.class.getSimpleName() + SKIP_SUFFIX; + if (SKIP_VALUE.equals(System.getProperty(skipAll))) { + log.info("skip loading of native libraries"); + return; + } if (checkFilenames( "/dev/nvidia0", "/opt/vespa-deps/lib64/cuda/libllama.so", |