From de8f341cc99156f405b15a2249d0f4c5105fbecf Mon Sep 17 00:00:00 2001 From: Xin Yang Date: Thu, 11 Jul 2024 10:18:20 -0700 Subject: [PATCH] Update --- .../ai/djl/huggingface/tokenizers/jni/LibUtils.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 index 4170f1bd8d39..31b5ea788122 100644 --- 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 @@ -85,6 +85,7 @@ private static void loadLibrary() { private static Path copyJniLibrary(String[] libs) { Path cacheDir = Utils.getEngineCacheDir("tokenizers"); Platform platform = Platform.detectPlatform("tokenizers"); + String os = platform.getOsPrefix(); String classifier = platform.getClassifier(); String flavor = platform.getFlavor(); String version = platform.getVersion(); @@ -95,10 +96,8 @@ private static Path copyJniLibrary(String[] libs) { return dir.toAbsolutePath(); } - boolean isCuda = flavor.contains("cu"); - - // For cuda, download jni lib files - if (isCuda) { + // For Linux cuda 12.x, download JNI library + if (flavor.startsWith("cu12") && !"win".equals(os)) { Matcher matcher = VERSION_PATTERN.matcher(version); if (!matcher.matches()) { throw new EngineException("Unexpected version: " + version); @@ -107,10 +106,10 @@ private static Path copyJniLibrary(String[] libs) { String djlVersion = matcher.group(2); downloadJniLib(dir, path, djlVersion, jniVersion, classifier, flavor); - return dir; + return dir.toAbsolutePath(); } - // For cpu, extract jni lib files from classpath + // Extract JNI library from classpath Path tmp = null; try { Files.createDirectories(cacheDir);