Remove openmp preloads. Remove pytorch FindOpenMP for all platforms.

bytedeco · Jun 22, 2024 · f059d37 · f059d37
1 parent 3165a76
commit f059d37
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 25 deletions.
diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh
@@ -204,15 +204,14 @@ sedinplace 's/char(\(.*\))/\1/g' torch/csrc/jit/serialization/pickler.h
 # some windows header defines a macro named "interface"
 sedinplace 's/const std::string& interface)/const std::string\& interface_name)/g' torch/csrc/distributed/c10d/ProcessGroupGloo.hpp
 
-if [[ $PLATFORM == windows* ]]; then
-    # Remove pytorch adaptations of FindOpenMP.cmake that, without iomp and with
-    # new versions of VS 2019 including -openmp:experimental and libomp, causes
-    # final binary to be linked to both libomp and vcomp and produce incorrect results.
-    # Wait for eventual upstream fix, or for cmake 2.30 that allows to choose between -openmp and -openmp:experimental
-    # and see if choosing experimental works.
-    rm cmake/Modules/FindOpenMP.cmake
-    sedinplace 's/include(${CMAKE_CURRENT_LIST_DIR}\/Modules\/FindOpenMP.cmake)/find_package(OpenMP)/g' cmake/Dependencies.cmake
-fi
+# Remove pytorch adaptations of FindOpenMP.cmake that.
+# On Windows without iomp and with new versions of VS 2019, including -openmp:experimental and libomp, causes
+# final binary to be linked to both libomp and vcomp and produce incorrect results.
+# Wait for eventual upstream fix, or for cmake 2.30 that allows to choose between -openmp and -openmp:experimental
+# and see if choosing experimental works. See Issue #1503.
+# On Linux, pytorch FindOpenMP.cmake picks llvm libomp over libgomp. See Issue #1504.
+rm cmake/Modules/FindOpenMP.cmake
+sedinplace 's/include(${CMAKE_CURRENT_LIST_DIR}\/Modules\/FindOpenMP.cmake)/find_package(OpenMP)/g' cmake/Dependencies.cmake
 
 #USE_FBGEMM=0 USE_KINETO=0 USE_GLOO=0 USE_MKLDNN=0 \
 "$PYTHON_BIN_PATH" setup.py build

diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/ProcessGroupGloo.java b/pytorch/src/gen/java/org/bytedeco/pytorch/ProcessGroupGloo.java
@@ -241,9 +241,9 @@ public Options(
 
   // Create new device instance for specific interface.
   public static native @SharedPtr @ByVal org.bytedeco.pytorch.gloo.Device createDeviceForInterface(
-        @StdString BytePointer _interface);
+        @StdString BytePointer interface_name);
   public static native @SharedPtr @ByVal org.bytedeco.pytorch.gloo.Device createDeviceForInterface(
-        @StdString String _interface);
+        @StdString String interface_name);
 
   // Create new device instance for specific hostname or address.
   public static native @SharedPtr @ByVal org.bytedeco.pytorch.gloo.Device createDeviceForHostname(

diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java
@@ -77508,11 +77508,11 @@ scalar_t sf(scalar_t x, scalar_t y)
 public static final int TORCH_VERSION_MINOR = 3;
 
 /** Indicates the patch version of LibTorch. */
-public static final int TORCH_VERSION_PATCH = 0;
+public static final int TORCH_VERSION_PATCH = 1;
 
 /** Indicates the version of LibTorch. */
 public static final String TORCH_VERSION = 
-  "2.3.0";
+  "2.3.1";
 
 
 // Parsed from torch/csrc/api/include/torch/xpu.h

diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java
@@ -85,13 +85,10 @@
 
             },
             exclude = {"openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h"},
-            link = {"c10", "torch_cpu", "torch"},
-            preload = {"gomp@.1", "iomp5", "omp", "tbb@.2", "asmjit", "fbgemm", "uv"}
+            preload = { "asmjit", "fbgemm" }
         ),
         @Platform(
             value = {"linux", "macosx", "windows"},
-            link = { "c10", "c10_cuda", "torch_cpu", "torch_cuda", "torch" },
-            preload = {"gomp@.1", "iomp5", "omp", "tbb@.2", "asmjit", "fbgemm", "uv", "cupti@.12"},
             includepath = {"/usr/local/cuda/include", "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3/include/"},
             preloadpath = {
                 "/usr/local/cuda-12.3/lib64/",
@@ -103,9 +100,32 @@
                 "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3/extras/CUPTI/lib64/",
                 "C:/Program Files/NVIDIA Corporation/NvToolsExt/bin/x64/",
             },
-
+            linkpath = {
+                "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3/lib/x64/",
+                "/usr/local/cuda-12.3/lib64/",
+                "/usr/local/cuda/lib64/",
+                "/usr/lib64/"
+            },
             extension = "-gpu"
         ),
+        @Platform(
+            value = {"linux", "macosx"},
+            link = { "c10", "torch", "torch_cpu" }
+        ),
+        @Platform(
+            value = "windows",
+            link = { "c10", "torch", "torch_cpu", "uv" }
+        ),
+        @Platform(
+            value = "linux",
+            extension = "-gpu",
+            link = { "c10", "torch", "torch_cpu", "c10_cuda", "torch_cuda", "cudart", "cusparse", "cudnn" } // cupti@.12 needed ?
+        ),
+        @Platform(
+            value = "windows",
+            extension = "-gpu",
+            link = { "c10", "torch", "torch_cpu", "uv", "c10_cuda", "torch_cuda", "cudart", "cusparse", "cudnn" }
+        )
     },
     target = "org.bytedeco.pytorch",
     global = "org.bytedeco.pytorch.global.torch"

diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch_cuda.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch_cuda.java
@@ -47,13 +47,6 @@
                 // For inclusion in JNI only, not parsed
                 "ATen/cuda/CUDAGeneratorImpl.h",
             },
-            link = { "cudart", "cusparse", "cudnn" },
-            linkpath = {
-                "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3/lib/x64/",
-                "/usr/local/cuda-12.3/lib64/",
-                "/usr/local/cuda/lib64/",
-                "/usr/lib64/"
-            },
             library = "jnitorch"
         ),
     },