Merge pull request #49 from clulab/kwalcock/aarch64

Support for aarch64 Linux
clulab · Oct 3, 2023 · 7790df1 · 7790df1
2 parents 7542fe9 + 416d1b2
commit 7790df1
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 212 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,4 @@
++ **0.5.0** - Support Linux on aarch64
 + **0.5.0** - Isolate dependencies on models to the apps subproject
 + **0.4.0** - Account for maxTokens
 + **0.3.0** - Include some tokenizers as resources and only fall back to network if necessary

diff --git a/common/src/main/scala/org/clulab/scala_transformers/common/LibraryLoader.scala b/common/src/main/scala/org/clulab/scala_transformers/common/LibraryLoader.scala
@@ -33,6 +33,8 @@ object LibraryLoader {
     else text
 
   def isMac: Boolean = System.getProperty("os.name").startsWith("Mac ")
+
+  def isWin: Boolean = System.getProperty("os.name").startsWith("Win")
 
   def isApple: Boolean = System.getProperty("os.arch") == "aarch64"
 
@@ -41,7 +43,7 @@ object LibraryLoader {
     // The Mac reports a libname ending with .dylib, but Java needs .jnilib instead.
     val jniName = replaceSuffix(libName, ".dylib", ".jnilib");
     val resourceName =
-        if (!isMac) jniName
+        if (isWin) jniName
         else if (isApple) "apple-" + jniName
         else "intel-" + jniName
 

diff --git a/tokenizer/src/main/resources/apple-librust_tokenizer.so b/tokenizer/src/main/resources/apple-librust_tokenizer.so
diff --git a/...r/src/main/resources/librust_tokenizer.so → ...main/resources/intel-librust_tokenizer.so b/...r/src/main/resources/librust_tokenizer.so → ...main/resources/intel-librust_tokenizer.so
diff --git a/tokenizer/src/main/resources/rust_tokenizer.dll b/tokenizer/src/main/resources/rust_tokenizer.dll