[ci] Fixes pytorch jni build for 1.13.1 (#3184)

deepjavalibrary · May 13, 2024 · 7d2036d · 7d2036d
1 parent 2d9c84b
commit 7d2036d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/engines/pytorch/pytorch-native/build.sh b/engines/pytorch/pytorch-native/build.sh
@@ -34,7 +34,7 @@ if [[ ! -d "libtorch" ]]; then
       curl -s https://download.pytorch.org/libtorch/${FLAVOR}/libtorch${CXX11ABI}-shared-with-deps-${VERSION}%2B${FLAVOR}.zip | jar xv >/dev/null
     fi
   elif [[ $PLATFORM == 'darwin' ]]; then
-    if [[ "$VERSION" =~ ^(2.2.)* ]]; then
+    if [[ "$VERSION" =~ ^(2.[2-9].*)$ ]]; then
       if [[ $ARCH == 'aarch64' ]]; then
         curl -s https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-${VERSION}.zip | jar xv >/dev/null
       else
@@ -53,6 +53,10 @@ if [[ ! -d "libtorch" ]]; then
   fi
 fi
 
+if [[ "$VERSION" == "1.13.1" ]]; then
+  PT_VERSION=V1_13_X
+fi
+
 if [[ "$FLAVOR" = cu* ]]; then
   USE_CUDA=1
 fi

diff --git a/engines/pytorch/pytorch-native/src/main/native/djl_pytorch_utils.h b/engines/pytorch/pytorch-native/src/main/native/djl_pytorch_utils.h
@@ -20,7 +20,11 @@
 #include <torch/script.h>
 
 #include <iostream>
+#ifdef V1_13_X
+#include <c10/util/variant.h>
+#else
 #include <variant>
+#endif
 
 #include "djl_pytorch_jni_log.h"
 
@@ -30,10 +34,16 @@ namespace utils {
 
 #if !defined(__ANDROID__)
 // for image interpolation
+#ifdef V1_13_X
+typedef torch::variant<torch::enumtype::kNearest, torch::enumtype::kLinear, torch::enumtype::kBilinear,
+    torch::enumtype::kBicubic, torch::enumtype::kTrilinear, torch::enumtype::kArea, torch::enumtype::kNearestExact>
+    mode_t;
+#else
 typedef std::variant<torch::enumtype::kNearest, torch::enumtype::kLinear, torch::enumtype::kBilinear,
     torch::enumtype::kBicubic, torch::enumtype::kTrilinear, torch::enumtype::kArea, torch::enumtype::kNearestExact>
     mode_t;
 #endif
+#endif
 
 inline jint GetDTypeFromScalarType(const torch::ScalarType& type) {
   if (torch::kFloat32 == type) {