Move supportedCudaDevices to CUDAUtilities and rename to supportedCUD…

…ADevices Check for available supported devices also in exitSansCUDADevices.
cms-patatrack · Mar 14, 2019 · fff1f68 · fff1f68
1 parent 68089fb
commit fff1f68
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/HeterogeneousCore/CUDAServices/bin/BuildFile.xml b/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
@@ -4,5 +4,5 @@
 
 <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp">
   <use name="cuda"/>
-  <use name="HeterogeneousCore/CUDAServices"/>
+  <use name="HeterogeneousCore/CUDAUtilities"/>
 </bin>
diff --git a/HeterogeneousCore/CUDAServices/bin/cudaIsEnabled.cpp b/HeterogeneousCore/CUDAServices/bin/cudaIsEnabled.cpp
@@ -1,5 +1,5 @@
-#include "HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h"
 
 int main() {
-  return supportedCudaDevices().empty() ? EXIT_FAILURE : EXIT_SUCCESS;
+  return supportedCUDADevices().empty() ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h b/HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h
diff --git a/HeterogeneousCore/CUDAServices/src/CUDAService.cc b/HeterogeneousCore/CUDAServices/src/CUDAService.cc
@@ -11,8 +11,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 #include "HeterogeneousCore/CUDAServices/interface/CUDAService.h"
-#include "HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h"
 
 #include "CachingDeviceAllocator.h"
 #include "CachingHostAllocator.h"
@@ -122,7 +122,7 @@ CUDAService::CUDAService(edm::ParameterSet const& config, edm::ActivityRegistry&
     return;
   }
 
-  auto supportedDevices = supportedCudaDevices();
+  auto supportedDevices = supportedCUDADevices();
   numberOfDevices_ = supportedDevices.size();
   if (numberOfDevices_ == 0) {
     edm::LogWarning("CUDAService") << "Failed to initialize the CUDA runtime.\n" << "Disabling the CUDAService.";

diff --git a/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp b/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp
@@ -14,7 +14,7 @@
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "HeterogeneousCore/CUDAServices/interface/CUDAService.h"
-#include "HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h"
 
 namespace {
   CUDAService makeCUDAService(edm::ParameterSet ps, edm::ActivityRegistry& ar) {
@@ -30,7 +30,7 @@ TEST_CASE("Tests of CUDAService", "[CUDAService]") {
 
   // Test setup: check if a simple CUDA runtime API call fails:
   // if so, skip the test with the CUDAService enabled
-  int deviceCount = supportedCudaDevices().size();
+  int deviceCount = supportedCUDADevices().size();
 
   if (deviceCount == 0) {
     WARN("No supported CUDA devices available. Running only tests not requiring devices.");

diff --git a/HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h b/HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h
@@ -0,0 +1,8 @@
+#ifndef HeterogeneousCore_CUDAUtilities_interface_supportedCUDADevices_h
+#define HeterogeneousCore_CUDAUtilities_interface_supportedCUDADevices_h
+
+#include <map>
+
+std::map<int, std::pair<int, int>> supportedCUDADevices(bool reset = true);
+
+#endif // HeterogeneousCore_CUDAUtilities_interface_supportedCUDADevices_h
diff --git a/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc b/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc
@@ -4,6 +4,7 @@
 #include <cuda_runtime.h>
 
 #include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h"
 
 void exitSansCUDADevices() {
   int devices = 0;
@@ -16,4 +17,9 @@ void exitSansCUDADevices() {
     std::cerr << "No CUDA devices available, the test will be skipped." << "\n";
     exit(EXIT_SUCCESS);
   }
+  int supported = supportedCUDADevices().size();
+  if (supported == 0) {
+    std::cerr << "No supported CUDA devices available, the test will be skipped." << "\n";
+    exit(EXIT_SUCCESS);
+  }
 }
diff --git a/.../CUDAServices/src/supportedCudaDevices.cu → ...CUDAUtilities/src/supportedCUDADevices.cu b/.../CUDAServices/src/supportedCudaDevices.cu → ...CUDAUtilities/src/supportedCUDADevices.cu
@@ -2,15 +2,15 @@
 
 #include <cuda_runtime.h>
 
-#include "HeterogeneousCore/CUDAServices/interface/supportedCudaDevices.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
+#include "HeterogeneousCore/CUDAUtilities/interface/supportedCUDADevices.h"
 
 __global__
 void isSupported(bool * result) {
   * result = true;
 }
 
-std::map<int, std::pair<int, int>> supportedCudaDevices(bool reset) {
+std::map<int, std::pair<int, int>> supportedCUDADevices(bool reset) {
   std::map<int, std::pair<int, int>> capabilities;
 
   int devices = 0;