From 460ff4720d8954c87007b23a3eac6191a44fc6d0 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 14 Aug 2023 12:41:04 +0200 Subject: [PATCH] Update Helper for CUDA 12 Signed-off-by: brian --- .../main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cavis-native/cavis-native-lib/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java b/cavis-native/cavis-native-lib/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java index eeecf849e..e1cab90a6 100644 --- a/cavis-native/cavis-native-lib/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java +++ b/cavis-native/cavis-native-lib/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java @@ -126,7 +126,7 @@ import java.util.List; }, compiler = {"cpp11", "nowarnings"}, library = "jnind4jcuda", link = "nd4jcuda", preload = "nd4jcuda"), - @Platform(value = "linux", preload = "gomp@.1", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/"}), + @Platform(value = "linux", preload = "gomp@.1", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/", "/usr/local/cuda/lib64"}), @Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}), @Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}), @Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/", "/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), @@ -150,7 +150,7 @@ public class Nd4jCudaPresets implements LoadEnabled, InfoMapper { if (platform.startsWith("linux")) { lib += lib.startsWith("cudnn") ? "@.8" : lib.equals("curand") ? "@.10" : lib.equals("cudart") ? "@.11.0" : "@.11"; } else if (platform.startsWith("windows")) { - lib += lib.startsWith("cudnn") ? "64_8" : lib.equals("curand") ? "64_10" : lib.equals("cudart") ? "64_110" : "64_11"; + lib += lib.startsWith("cudnn") ? "64_8" : lib.equals("cufft") ? "64_11" : lib.equals("cudart") ? "64_12" : "64_12"; } else { continue; // no CUDA }