commit 82bd1798b8bdc5c24ac381c6a90402fd25dc7e48 · pyrox.dev/nixpkgs

+2 -3

pkgs/by-name/dc/dcgm/package.nix

···

       10
        
         mpi,

     

       11
        
         mpiCheckPhaseHook,

     

       12
        
         ninja,

     

       13
       -
         cudaPackages_11,

     

       14
        
         cudaPackages_12,

     

       15
        
         boost186,

     

       16
        
         fmt_10,

     
···

       27
        
         yaml-cpp,

     

       28
        
       }:

     

       29
        
       let

     

       30
       -
         # DCGM depends on 2 different versions of CUDA at the same time.

     

       31
        
         # The runtime closure, thankfully, is quite small as it does not

     

       32
        
         # include the CUDA libraries.

     

       33
        
         cudaPackageSets = [

     

       34
       -
           cudaPackages_11

     

       35
        
           cudaPackages_12

     

       36
        
         ];

     

       37
        
       

     
···

       86
        
         };

     

       87
        
       

     

       88
        
         patches = [

     

       0
        
       
     

       89
        
           ./dynamic-libs.patch

     

       90
        
           (replaceVars ./fix-paths.patch {

     

       91
        
             inherit coreutils;

···

       10
        
         mpi,

     

       11
        
         mpiCheckPhaseHook,

     

       12
        
         ninja,

     

       0
        
       
     

       13
        
         cudaPackages_12,

     

       14
        
         boost186,

     

       15
        
         fmt_10,

     
···

       26
        
         yaml-cpp,

     

       27
        
       }:

     

       28
        
       let

     

       29
       +
         # DCGM can depend on multiple versions of CUDA at the same time.

     

       30
        
         # The runtime closure, thankfully, is quite small as it does not

     

       31
        
         # include the CUDA libraries.

     

       32
        
         cudaPackageSets = [

     

       0
        
       
     

       33
        
           cudaPackages_12

     

       34
        
         ];

     

       35
        
       

     
···

       84
        
         };

     

       85
        
       

     

       86
        
         patches = [

     

       87
       +
           ./remove-cuda-11.patch

     

       88
        
           ./dynamic-libs.patch

     

       89
        
           (replaceVars ./fix-paths.patch {

     

       90
        
             inherit coreutils;

+289

pkgs/by-name/dc/dcgm/remove-cuda-11.patch

···

       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       +
       index 11317ae20f..7a6b1d5b75 100755

     

       3
       +
       --- a/CMakeLists.txt

     

       4
       +
       +++ b/CMakeLists.txt

     

       5
       +
       @@ -269,10 +269,8 @@

     

       6
       +
            add_library(testing_dcgm_cublas_stubs STATIC)

     

       7
       +
        endif()

     

       8
       +
        

     

       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)

     

       16
       +
       @@ -327,9 +325,7 @@

     

       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)

     

       26
       +
       @@ -342,7 +338,6 @@

     

       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)

     

       37
       +
        

     

       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)

     

       53
       +
        

     

       54
       +
        add_library(dcgm SHARED)

     

       55
       +
       -add_library(dcgm_cublas_proxy11 SHARED)

     

       56
       +
        add_library(dcgm_cublas_proxy12 SHARED)

     

       57
       +
        add_library(pluginCommon SHARED)

     

       58
       +
        

     

       59
       +
       @@ -395,20 +382,13 @@

     

       60
       +
        add_library(DCGM::dcgm ALIAS dcgm)

     

       61
       +
        

     

       62
       +
        set_target_properties(

     

       63
       +
       -    ContextCreate_11

     

       64
       +
            ContextCreate_12

     

       65
       +
       -    Diagnostic_11

     

       66
       +
            Diagnostic_12

     

       67
       +
       -    Memory_11

     

       68
       +
            Memory_12

     

       69
       +
       -    Memtest_11

     

       70
       +
            Memtest_12

     

       71
       +
            NVBandwidth_12

     

       72
       +
       -    Pcie_11

     

       73
       +
            Pcie_12

     

       74
       +
       -    TargetedPower_11

     

       75
       +
            TargetedPower_12

     

       76
       +
       -    TargetedStress_11

     

       77
       +
            TargetedStress_12

     

       78
       +
            dcgm

     

       79
       +
            dcgmmoduleconfig

     

       80
       +
       @@ -419,7 +399,6 @@

     

       81
       +
            dcgmmodulenvswitch

     

       82
       +
            dcgmmodulepolicy

     

       83
       +
            dcgmmodulesysmon

     

       84
       +
       -    dcgm_cublas_proxy11

     

       85
       +
            dcgm_cublas_proxy12

     

       86
       +
            pluginCommon

     

       87
       +
            PROPERTIES

     

       88
       +
       @@ -433,7 +412,6 @@

     

       89
       +
            RUNTIME_OUTPUT_DIRECTORY nvvs)

     

       90
       +
        

     

       91
       +
        set_target_properties(

     

       92
       +
       -    BwChecker_11

     

       93
       +
            BwChecker_12

     

       94
       +
            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)

     

       98
       +
        

     

       99
       +
        set_target_properties(

     

       100
       +
       -    ContextCreate_11

     

       101
       +
            ContextCreate_12

     

       102
       +
       -    Diagnostic_11

     

       103
       +
            Diagnostic_12

     

       104
       +
       -    Memory_11

     

       105
       +
            Memory_12

     

       106
       +
       -    Memtest_11

     

       107
       +
            Memtest_12

     

       108
       +
            NVBandwidth_12

     

       109
       +
       -    Pcie_11

     

       110
       +
            Pcie_12

     

       111
       +
       -    TargetedPower_11

     

       112
       +
            TargetedPower_12

     

       113
       +
       -    TargetedStress_11

     

       114
       +
            TargetedStress_12

     

       115
       +
            nvml_injection

     

       116
       +
            nvmli_public

     

       117
       +
            nvvs_without_main_objects

     

       118
       +
            nvvs_plugins_common_objects

     

       119
       +
            pluginCommon

     

       120
       +
       -    pluginCudaCommon_11

     

       121
       +
            pluginCudaCommon_12

     

       122
       +
            PROPERTIES

     

       123
       +
                C_VISIBILITY_PRESET default

     

       124
       +
       @@ -594,18 +564,6 @@

     

       125
       +
                COMPONENT Core)

     

       126
       +
        

     

       127
       +
        install(

     

       128
       +
       -    TARGETS

     

       129
       +
       -        dcgm_cublas_proxy11

     

       130
       +
       -        dcgmproftester11

     

       131
       +
       -    LIBRARY

     

       132
       +
       -        DESTINATION "${CMAKE_INSTALL_LIBDIR}"

     

       133
       +
       -        COMPONENT Cuda11

     

       134
       +
       -        NAMELINK_SKIP

     

       135
       +
       -    RUNTIME

     

       136
       +
       -        DESTINATION "${CMAKE_INSTALL_BINDIR}"

     

       137
       +
       -        COMPONENT Cuda11)

     

       138
       +
       -

     

       139
       +
       -install(

     

       140
       +
            TARGETS pluginCommon

     

       141
       +
            LIBRARY

     

       142
       +
                DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"

     

       143
       +
       @@ -618,29 +576,6 @@

     

       144
       +
            LIBRARY

     

       145
       +
                DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"

     

       146
       +
                COMPONENT Core)

     

       147
       +
       -

     

       148
       +
       -install(

     

       149
       +
       -    TARGETS

     

       150
       +
       -        BwChecker_11

     

       151
       +
       -        ContextCreate_11

     

       152
       +
       -        Diagnostic_11

     

       153
       +
       -        Memory_11

     

       154
       +
       -        Memtest_11

     

       155
       +
       -        Pcie_11

     

       156
       +
       -        TargetedPower_11

     

       157
       +
       -        TargetedStress_11

     

       158
       +
       -    LIBRARY

     

       159
       +
       -        DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"

     

       160
       +
       -        PERMISSIONS

     

       161
       +
       -            OWNER_READ OWNER_WRITE OWNER_EXECUTE

     

       162
       +
       -            GROUP_READ GROUP_EXECUTE

     

       163
       +
       -            WORLD_READ WORLD_EXECUTE

     

       164
       +
       -        COMPONENT Cuda11

     

       165
       +
       -        NAMELINK_SKIP

     

       166
       +
       -    RUNTIME

     

       167
       +
       -        DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"

     

       168
       +
       -        COMPONENT Cuda11)

     

       169
       +
       -

     

       170
       +
        install(

     

       171
       +
            TARGETS

     

       172
       +
                dcgm_cublas_proxy12

     

       173
       +
       @@ -686,7 +621,6 @@

     

       174
       +
        install(

     

       175
       +
            TARGETS

     

       176
       +
                dcgm

     

       177
       +
       -        dcgm_cublas_proxy11

     

       178
       +
                dcgm_cublas_proxy12

     

       179
       +
                dcgmi

     

       180
       +
                dcgmmoduleconfig

     

       181
       +
       @@ -697,7 +631,6 @@

     

       182
       +
                dcgmmodulenvswitch

     

       183
       +
                dcgmmodulepolicy

     

       184
       +
                dcgmmodulesysmon

     

       185
       +
       -        dcgmproftester11

     

       186
       +
                dcgmproftester12

     

       187
       +
                nv-hostengine

     

       188
       +
                nvml_injection

     

       189
       +
       @@ -725,28 +658,6 @@

     

       190
       +
        

     

       191
       +
        install(

     

       192
       +
            TARGETS

     

       193
       +
       -        BwChecker_11

     

       194
       +
       -        ContextCreate_11

     

       195
       +
       -        Diagnostic_11

     

       196
       +
       -        Memory_11

     

       197
       +
       -        Memtest_11

     

       198
       +
       -        Pcie_11

     

       199
       +
       -        TargetedPower_11

     

       200
       +
       -        TargetedStress_11

     

       201
       +
       -    LIBRARY

     

       202
       +
       -        DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"

     

       203
       +
       -        PERMISSIONS

     

       204
       +
       -            OWNER_READ OWNER_WRITE OWNER_EXECUTE

     

       205
       +
       -            GROUP_READ GROUP_EXECUTE

     

       206
       +
       -            WORLD_READ WORLD_EXECUTE

     

       207
       +
       -        COMPONENT Tests

     

       208
       +
       -        NAMELINK_SKIP

     

       209
       +
       -    RUNTIME

     

       210
       +
       -        DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"

     

       211
       +
       -        COMPONENT Tests)

     

       212
       +
       -

     

       213
       +
       -install(

     

       214
       +
       -    TARGETS

     

       215
       +
                BwChecker_12

     

       216
       +
                ContextCreate_12

     

       217
       +
                Diagnostic_12

     

       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

     

       222
       +
       @@ -94,10 +94,6 @@

     

       223
       +
        

     

       224
       +
        endmacro()

     

       225
       +
        

     

       226
       +
       -if (NOT DEFINED CUDA11_INCLUDE_DIR)

     

       227
       +
       -    load_cuda(11)

     

       228
       +
       -endif()

     

       229
       +
       -

     

       230
       +
        if (NOT DEFINED CUDA12_INCLUDE_DIR)

     

       231
       +
            load_cuda(12)

     

       232
       +
        endif()

     

       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

     

       237
       +
       @@ -40,7 +40,6 @@

     

       238
       +
                CudaLib.h)

     

       239
       +
        endmacro()

     

       240
       +
        

     

       241
       +
       -define_dcgm_cuda_lib(11)

     

       242
       +
        define_dcgm_cuda_lib(12)

     

       243
       +
        

     

       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

     

       249
       +
       @@ -35,5 +35,4 @@

     

       250
       +
                DcgmDgemm.cpp)

     

       251
       +
        endmacro()

     

       252
       +
        

     

       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

     

       259
       +
       @@ -38,5 +38,4 @@

     

       260
       +
                rt)

     

       261
       +
        endmacro()

     

       262
       +
        

     

       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

     

       269
       +
       @@ -62,7 +62,6 @@

     

       270
       +
                    ${COMMON_SRCS})

     

       271
       +
        endmacro()

     

       272
       +
        

     

       273
       +
       -define_dcgmproftester(11)

     

       274
       +
        define_dcgmproftester(12)

     

       275
       +
        

     

       276
       +
        install(

     

       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

     

       281
       +
       @@ -71,7 +71,7 @@

     

       282
       +
            target_link_libraries(nvvs_plugins INTERFACE "${PLUGIN_NAME}_${CUDA_VER}")

     

       283
       +
        endmacro()

     

       284
       +
        

     

       285
       +
       -set(SUPPORTED_CUDA_VERSIONS 11 12)

     

       286
       +
       +set(SUPPORTED_CUDA_VERSIONS 12)

     

       287
       +
        

     

       288
       +
        add_subdirectory(common)

     

       289
       +
        add_subdirectory(contextcreate)