Avoid duplicated loading native library (#3020)

deepjavalibrary · Apr 26, 2024 · 813e2d8 · 813e2d8
1 parent fc7f58c
commit 813e2d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/engines/llama/src/main/java/ai/djl/llama/jni/LibUtils.java b/engines/llama/src/main/java/ai/djl/llama/jni/LibUtils.java
@@ -55,8 +55,9 @@ public static void loadLibrary() {
             String nativeHelper = System.getProperty("ai.djl.llama.native_helper");
             if (nativeHelper != null && !nativeHelper.isEmpty()) {
                 ClassLoaderUtils.nativeLoad(nativeHelper, path);
+            } else {
+                System.load(path); // NOPMD
             }
-            System.load(path); // NOPMD
         }
     }
 

diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java
@@ -361,8 +361,9 @@ private static void loadNativeLibrary(String path) {
         String nativeHelper = System.getProperty("ai.djl.pytorch.native_helper");
         if (nativeHelper != null && !nativeHelper.isEmpty()) {
             ClassLoaderUtils.nativeLoad(nativeHelper, path);
+        } else {
+            System.load(path); // NOPMD
         }
-        System.load(path); // NOPMD
     }
 
     private static LibTorch downloadPyTorch(Platform platform) {

diff --git a/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java b/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java
@@ -72,8 +72,9 @@ private static void loadLibrary() {
             String nativeHelper = System.getProperty("ai.djl.huggingface.native_helper");
             if (nativeHelper != null && !nativeHelper.isEmpty()) {
                 ClassLoaderUtils.nativeLoad(nativeHelper, path);
+            } else {
+                System.load(path); // NOPMD
             }
-            System.load(path); // NOPMD
         }
     }