diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-01-17 12:28:19 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-01-17 12:28:19 +0000 |
commit | 50bb812c11f055ca9dc7f726fff926051201b64f (patch) | |
tree | a4ea3c12dddd41e90e3cdc6431d68710486e815e /container-onnxruntime | |
parent | 2d96663b5067e6646e0e3b737a8607865ea6d586 (diff) |
tell onnxruntime where to find provider libraries
Diffstat (limited to 'container-onnxruntime')
-rw-r--r-- | container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java b/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java index 81eff2be250..6d4f41e1d1c 100644 --- a/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java +++ b/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java @@ -15,7 +15,8 @@ import java.util.logging.Logger; **/ public class OnnxBundleActivator implements BundleActivator { - private static final String SKIP_PREFIX = "onnxruntime.native."; + private static final String ONNX_PREFIX = "onnxruntime.native."; + private static final String PATH_SUFFIX = ".path"; private static final String SKIP_SUFFIX = ".skip"; private static final String SKIP_VALUE = "true"; private static final String[] LIBRARY_NAMES = { "onnxruntime", "onnxruntime4j_jni" }; @@ -28,8 +29,9 @@ public class OnnxBundleActivator implements BundleActivator { log.info("skip loading of native libraries"); return; } + System.setProperty(ONNX_PREFIX + PATH_SUFFIX, "/opt/vespa-deps/lib64"); for (String libName : LIBRARY_NAMES) { - String skipProp = SKIP_PREFIX + libName + SKIP_SUFFIX; + String skipProp = ONNX_PREFIX + libName + SKIP_SUFFIX; if (SKIP_VALUE.equals(System.getProperty(skipProp))) { log.fine("already loaded native library "+libName+", skipping"); } else { @@ -51,7 +53,7 @@ public class OnnxBundleActivator implements BundleActivator { // not sure how to test that loading and unloading multiple times actually works, // but this should in theory do the necessary thing. for (String libName : LIBRARY_NAMES) { - String skipProp = SKIP_PREFIX + libName + SKIP_SUFFIX; + String skipProp = ONNX_PREFIX + libName + SKIP_SUFFIX; if (SKIP_VALUE.equals(System.getProperty(skipProp))) { log.info("will unload native library: "+libName); } |