Merge branch 'develop' into gint-new-2

Author: dzzz2001

CMakeLists.txt

@@ -351,7 +351,11 @@ if(USE_CUDA)
   # ${ABACUS_BIN_NAME} is added before CUDA is enabled
   set_property(TARGET ${ABACUS_BIN_NAME}
                PROPERTY CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES})
-  target_link_libraries(${ABACUS_BIN_NAME} cudart nvToolsExt)
+  if (CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.9)
+    target_link_libraries(${ABACUS_BIN_NAME} cudart)
+  else ()
+    target_link_libraries(${ABACUS_BIN_NAME} cudart nvToolsExt)
+  endif ()
   include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
   if(USE_CUDA)
     add_compile_definitions(__CUDA)

source/source_hsolver/kernels/cuda/diag_cusolver.cuh

@@ -1,8 +1,14 @@
 #ifndef DIAG_CUSOLVER_CUH
 #define DIAG_CUSOLVER_CUH
-
+#include <cuda.h>
 #include <complex>
+
+#if CUDA_VERSION < 12090
 #include "nvToolsExt.h"
+#else
+#include "nvtx3/nvToolsExt.h"
+#endif
+
 #include <cuda_runtime.h>
 #include <cusolverDn.h>