From d5eda7d4de2c2e29969729cb04d5835d61c09097 Mon Sep 17 00:00:00 2001
From: brian <brian@brutex.de>
Date: Tue, 15 Aug 2023 12:22:17 +0200
Subject: [PATCH] Update to CUDA 12

Signed-off-by: brian <brian@brutex.de>
---
 cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt  | 2 +-
 .../src/main/java/org/nd4j/nativeblas/cuda/Nd4jCudaPresets.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt b/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt
index 981841fe4..fcf367d31 100644
--- a/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt
+++ b/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt
@@ -125,7 +125,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${ARCH_TUNE} -O3 -fp-model fast")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     # using Visual Studio C++
-    set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${ARCH_TUNE}")
+    set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${ARCH_TUNE} /Ox")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     # using GCC
     SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${ARCH_TUNE} -fmax-errors=2 -fdiagnostics-show-caret ")
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 e1cab90a6..5a363a962 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
@@ -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("cufft") ? "64_11" : lib.equals("cudart") ? "64_12" : "64_12";
+                lib += lib.startsWith("cudnn") ? "64_8" : lib.equals("cufft") ? "64_11" : lib.equals("cusolver") ? "64_11" : "64_12";
             } else {
                 continue; // no CUDA
             }