Replace cuda::device operations with native CUDA calls (#408)

Replaces the usage of cuda::device::count(), cuda::device::get(), cuda::device::set() and cuda::device::current::get() with native CUDA calls.
cms-patatrack · Oct 20, 2020 · 0bfd795 · 0bfd795
1 parent 2699bfc
commit 0bfd795
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git a/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h b/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h
@@ -2,7 +2,6 @@
 #define CUDADataFormats_TrackingRecHit_interface_TrackingRecHit2DSOAView_h
 
 #include <cuda_runtime.h>
-#include <cuda/api_wrappers.h>
 
 #include "CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h"

diff --git a/RecoLocalTracker/SiPixelClusterizer/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/BuildFile.xml
@@ -2,7 +2,6 @@
 <use   name="CalibTracker/SiPixelESProducers"/>
 <use   name="HeterogeneousCore/CUDACore"/>
 <use   name="cuda"/>
-<use   name="cuda-api-wrappers"/>
 
 <export>
     <lib name="1"/>

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
@@ -13,7 +13,6 @@
 <use   name="HeterogeneousCore/Product"/>
 <use   name="HeterogeneousCore/CUDACore"/>
 <use   name="cuda"/>
-<use   name="cuda-api-wrappers"/>
 <use   name="cub"/>
 <library   file="*.cc *.cu" name="RecoLocalTrackerSiPixelClusterizerPlugins">
   <flags   EDM_PLUGIN="1"/>

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelRawToClusterGPUKernel.h
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <cuda_runtime.h>
-#include "cuda/api_wrappers.h"
 
 #include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h"
 #include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h"

diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
@@ -35,15 +35,13 @@
 <bin file="gpuClustering_t.cu" name="gpuClustering_t">
   <use name="cuda"/>
   <use name="cub"/>
-  <use name="cuda-api-wrappers"/>
   <use name="HeterogeneousCore/CUDAUtilities"/>
   <flags CXXFLAGS="-g"/>
 </bin>
 
 <bin file="gpuClustering_t.cu" name="gpuClustering_debug">
   <use name="cuda"/>
   <use name="cub"/>
-  <use name="cuda-api-wrappers"/>
   <use name="HeterogeneousCore/CUDAUtilities"/>
   <flags CXXFLAGS="-g -DGPU_DEBUG"/>
   <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>

diff --git a/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h b/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h
@@ -10,12 +10,12 @@
 #include <vector>
 
 #ifdef __CUDACC__
-#include <cuda/api_wrappers.h>
 
 #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/launch.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h"
 #endif
 
 #include "RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h"
@@ -25,7 +25,7 @@ int main(void) {
 #ifdef __CUDACC__
   exitSansCUDADevices();
 
-  if (cuda::device::count() == 0) {
+  if (cudautils::cudaDeviceCount() == 0) {
     std::cerr << "No CUDA devices on this system"
               << "\n";
     exit(EXIT_FAILURE);
@@ -44,7 +44,6 @@ int main(void) {
   auto h_clus = std::make_unique<int[]>(numElements);
 
 #ifdef __CUDACC__
-  auto current_device = cuda::device::current::get();
   auto d_id = cudautils::make_device_unique<uint16_t[]>(numElements, nullptr);
   auto d_x = cudautils::make_device_unique<uint16_t[]>(numElements, nullptr);
   auto d_y = cudautils::make_device_unique<uint16_t[]>(numElements, nullptr);