···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
index 11317ae20f..7a6b1d5b75 100755
6
+
add_library(testing_dcgm_cublas_stubs STATIC)
9
+
-add_executable(BwChecker_11)
10
+
add_executable(BwChecker_12)
11
+
add_executable(dcgmi)
12
+
-add_executable(dcgmproftester11)
13
+
add_executable(dcgmproftester12)
14
+
add_executable(nv-hostengine)
15
+
add_executable(nvvs)
17
+
add_library(childprocess STATIC)
18
+
add_library(common_watch_objects STATIC)
19
+
add_library(dcgm_common STATIC)
20
+
-add_library(dcgm_cuda_worker11 STATIC)
21
+
add_library(dcgm_cuda_worker12 STATIC)
22
+
-add_library(dcgm_cuda_lib11 STATIC)
23
+
add_library(dcgm_cuda_lib12 STATIC)
24
+
add_library(dcgm_entity_types STATIC)
25
+
add_library(dcgm_logging STATIC)
27
+
add_library(nvvs_without_main_objects OBJECT)
28
+
add_library(nvvs_main_objects OBJECT)
29
+
add_library(nvvs_plugins_common_objects OBJECT)
30
+
-add_library(pluginCudaCommon_11 STATIC)
31
+
add_library(pluginCudaCommon_12 STATIC)
32
+
add_library(remoteconn STATIC)
33
+
add_library(sdk_nvml_essentials_objects STATIC)
34
+
@@ -368,24 +363,16 @@
35
+
add_library(dcgmmodulepolicy SHARED)
36
+
add_library(dcgmmodulesysmon SHARED)
38
+
-add_library(ContextCreate_11 SHARED)
39
+
add_library(ContextCreate_12 SHARED)
40
+
-add_library(Diagnostic_11 SHARED)
41
+
add_library(Diagnostic_12 SHARED)
42
+
-add_library(Memory_11 SHARED)
43
+
add_library(Memory_12 SHARED)
44
+
-add_library(Memtest_11 SHARED)
45
+
add_library(Memtest_12 SHARED)
46
+
add_library(NVBandwidth_12 SHARED)
47
+
-add_library(Pcie_11 SHARED)
48
+
add_library(Pcie_12 SHARED)
49
+
-add_library(TargetedPower_11 SHARED)
50
+
add_library(TargetedPower_12 SHARED)
51
+
-add_library(TargetedStress_11 SHARED)
52
+
add_library(TargetedStress_12 SHARED)
54
+
add_library(dcgm SHARED)
55
+
-add_library(dcgm_cublas_proxy11 SHARED)
56
+
add_library(dcgm_cublas_proxy12 SHARED)
57
+
add_library(pluginCommon SHARED)
59
+
@@ -395,20 +382,13 @@
60
+
add_library(DCGM::dcgm ALIAS dcgm)
62
+
set_target_properties(
84
+
- dcgm_cublas_proxy11
89
+
RUNTIME_OUTPUT_DIRECTORY nvvs)
91
+
set_target_properties(
95
+
INSTALL_RPATH "${DCGM_RPATH}:$ORIGIN/../../../${DCGM_TESTS_ARCH}")
96
+
@@ -441,27 +419,19 @@
97
+
set_target_properties(dcgmi PROPERTIES RUNTIME_OUTPUT_DIRECTORY dcgmi)
99
+
set_target_properties(
113
+
- TargetedStress_11
117
+
nvvs_without_main_objects
118
+
nvvs_plugins_common_objects
120
+
- pluginCudaCommon_11
121
+
pluginCudaCommon_12
123
+
C_VISIBILITY_PRESET default
124
+
@@ -594,18 +564,6 @@
129
+
- dcgm_cublas_proxy11
132
+
- DESTINATION "${CMAKE_INSTALL_LIBDIR}"
136
+
- DESTINATION "${CMAKE_INSTALL_BINDIR}"
137
+
- COMPONENT Cuda11)
140
+
TARGETS pluginCommon
142
+
DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"
143
+
@@ -618,29 +576,6 @@
145
+
DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"
157
+
- TargetedStress_11
159
+
- DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"
161
+
- OWNER_READ OWNER_WRITE OWNER_EXECUTE
162
+
- GROUP_READ GROUP_EXECUTE
163
+
- WORLD_READ WORLD_EXECUTE
167
+
- DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"
168
+
- COMPONENT Cuda11)
172
+
dcgm_cublas_proxy12
173
+
@@ -686,7 +621,6 @@
177
+
- dcgm_cublas_proxy11
178
+
dcgm_cublas_proxy12
181
+
@@ -697,7 +631,6 @@
189
+
@@ -725,28 +658,6 @@
200
+
- TargetedStress_11
202
+
- DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"
204
+
- OWNER_READ OWNER_WRITE OWNER_EXECUTE
205
+
- GROUP_READ GROUP_EXECUTE
206
+
- WORLD_READ WORLD_EXECUTE
210
+
- DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"
218
+
diff --git a/cmake/FindCuda.cmake b/cmake/FindCuda.cmake
219
+
index 3c1769597a..cf3e54d332 100644
220
+
--- a/cmake/FindCuda.cmake
221
+
+++ b/cmake/FindCuda.cmake
226
+
-if (NOT DEFINED CUDA11_INCLUDE_DIR)
230
+
if (NOT DEFINED CUDA12_INCLUDE_DIR)
233
+
diff --git a/common/CudaLib/CMakeLists.txt b/common/CudaLib/CMakeLists.txt
234
+
index 0b2b0e0217..ea6fd17d8d 100644
235
+
--- a/common/CudaLib/CMakeLists.txt
236
+
+++ b/common/CudaLib/CMakeLists.txt
241
+
-define_dcgm_cuda_lib(11)
242
+
define_dcgm_cuda_lib(12)
244
+
target_include_directories(cuda_lib_base_interface INTERFACE
245
+
diff --git a/common/CudaWorker/CMakeLists.txt b/common/CudaWorker/CMakeLists.txt
246
+
index 958ace542f..f2c6ae748e 100644
247
+
--- a/common/CudaWorker/CMakeLists.txt
248
+
+++ b/common/CudaWorker/CMakeLists.txt
253
+
-define_dcgm_cuda_worker(11)
254
+
define_dcgm_cuda_worker(12)
255
+
diff --git a/cublas_proxy/CMakeLists.txt b/cublas_proxy/CMakeLists.txt
256
+
index 90dff9e0d2..fe6dd40861 100755
257
+
--- a/cublas_proxy/CMakeLists.txt
258
+
+++ b/cublas_proxy/CMakeLists.txt
263
+
-add_subdirectory(Cuda11)
264
+
add_subdirectory(Cuda12)
265
+
diff --git a/dcgmproftester/CMakeLists.txt b/dcgmproftester/CMakeLists.txt
266
+
index 9d18940bf1..97aa78321f 100755
267
+
--- a/dcgmproftester/CMakeLists.txt
268
+
+++ b/dcgmproftester/CMakeLists.txt
273
+
-define_dcgmproftester(11)
274
+
define_dcgmproftester(12)
277
+
diff --git a/nvvs/plugin_src/CMakeLists.txt b/nvvs/plugin_src/CMakeLists.txt
278
+
index 21d0131c4a..5a3d371c29 100644
279
+
--- a/nvvs/plugin_src/CMakeLists.txt
280
+
+++ b/nvvs/plugin_src/CMakeLists.txt
282
+
target_link_libraries(nvvs_plugins INTERFACE "${PLUGIN_NAME}_${CUDA_VER}")
285
+
-set(SUPPORTED_CUDA_VERSIONS 11 12)
286
+
+set(SUPPORTED_CUDA_VERSIONS 12)
288
+
add_subdirectory(common)
289
+
add_subdirectory(contextcreate)
pyrox.dev