From 7edbe140ea50b7c2642b06c3d04e7891fdab0a5e Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 29 Aug 2023 13:30:30 +0200 Subject: [PATCH] Reorganising build.gradle for CUDA 12 Signed-off-by: brian --- .../java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java b/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java index 24d9127e6..e6474877e 100644 --- a/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java +++ b/cavis-native/cavis-native-cuda-presets/src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java @@ -128,14 +128,16 @@ import java.util.List; "cnpy/cnpy.h" }, compiler = {"cpp11", "nowarnings"}, - library = "jni_nd4jcuda", - link = "nd4jcuda"), + library = "jnind4jcuda", + link = "nd4jcuda", + preload = "libnd4jcuda"), @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/"}), - @Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6"}) //, "nd4jcuda"}) + @Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", "libnd4jcuda"}), + @Platform(extension = {"-avx512", "-avx2"}) }) public class Nd4jCudaPresets implements LoadEnabled, InfoMapper {