Cleanup for the framework PR

CUDADataFormats/Common/test/test_CUDAProduct.cc

@@ -30,7 +30,9 @@ TEST_CASE("Use of CUDAProduct template", "[CUDACore]") {
     auto bar = std::move(foo);
   }
 
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   constexpr int defaultDevice = 0;
   cudaCheck(cudaSetDevice(defaultDevice));

HeterogeneousCore/CUDACore/test/test_CUDAScopedContext.cc

@@ -39,7 +39,9 @@ namespace {
 }  // namespace
 
 TEST_CASE("Use of CUDAScopedContext", "[CUDACore]") {
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   constexpr int defaultDevice = 0;
   {

HeterogeneousCore/CUDATest/python/prod6CPU_cfi.py

@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
 from HeterogeneousCore.CUDATest.testCUDAProducerCPU_cfi import testCUDAProducerCPU as _testCUDAProducerCPU
-prod6CPU = _testCUDAProducerCPU.clone(src = "prod5CPU")
+prod6CPU = _testCUDAProducerCPU.clone(src = "prod5")

HeterogeneousCore/CUDATest/test/testCUDASwitch_cfg.py

@@ -6,7 +6,6 @@
 #includeAnalyzer = True
 includeAnalyzer = False
 
-from Configuration.ProcessModifiers.gpu_cff import gpu
 process = cms.Process("Test")
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.load("HeterogeneousCore.CUDAServices.CUDAService_cfi")

HeterogeneousCore/CUDATest/test/test_TestCUDAProducerGPUFirst.cc

@@ -25,6 +25,10 @@ process.moduleToTest(process.toTest)
   SECTION("base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config)); }
 
   SECTION("No event data") {
+    // Calls produce(), so don't call without a GPU
+    if (not hasCUDADevices()) {
+      return;
+    }
     edm::test::TestProcessor tester(config);
 
     REQUIRE_NOTHROW(tester.test());
@@ -59,7 +63,9 @@ process.moduleToTest(process.toTest)
 )_"};
   edm::test::TestProcessor::Config config{baseConfig};
 
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   constexpr int defaultDevice = 0;
 

HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h

@@ -1,6 +1,8 @@
 #ifndef HeterogeneousCore_CUDAUtilities_requireCUDADevices_h
 #define HeterogeneousCore_CUDAUtilities_requireCUDADevices_h
 
+bool hasCUDADevices();
+
 void requireCUDADevices();
 
 #endif  // HeterogeneousCore_CUDAUtilities_requireCUDADevices_h

HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc → HeterogeneousCore/CUDAUtilities/src/requireCUDADevices.cc

@@ -5,17 +5,24 @@
 
 #include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h"
 
-void requireCUDADevices() {
+bool hasCUDADevices() {
   int devices = 0;
   auto status = cudaGetDeviceCount(&devices);
   if (status != cudaSuccess) {
     std::cerr << "Failed to initialise the CUDA runtime, the test will be skipped."
               << "\n";
-    exit(EXIT_SUCCESS);
+    return false;
   }
   if (devices == 0) {
     std::cerr << "No CUDA devices available, the test will be skipped."
               << "\n";
+    return false;
+  }
+  return true;
+}
+
+void requireCUDADevices() {
+  if (not hasCUDADevices()) {
     exit(EXIT_SUCCESS);
   }
 }

HeterogeneousCore/CUDAUtilities/test/copyAsync_t.cpp

@@ -7,7 +7,9 @@
 #include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h"
 
 TEST_CASE("copyAsync", "[cudaMemTools]") {
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   cudaStream_t stream;
   cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking));

HeterogeneousCore/CUDAUtilities/test/device_unique_ptr_t.cpp

@@ -5,7 +5,9 @@
 #include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h"
 
 TEST_CASE("device_unique_ptr", "[cudaMemTools]") {
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   cudaStream_t stream;
   cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking));

HeterogeneousCore/CUDAUtilities/test/host_unique_ptr_t.cpp

@@ -5,7 +5,9 @@
 #include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h"
 
 TEST_CASE("host_unique_ptr", "[cudaMemTools]") {
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   cudaStream_t stream;
   cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking));

HeterogeneousCore/CUDAUtilities/test/memsetAsync_t.cpp

@@ -8,7 +8,9 @@
 #include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h"
 
 TEST_CASE("memsetAsync", "[cudaMemTools]") {
-  requireCUDADevices();
+  if (not hasCUDADevices()) {
+    return;
+  }
 
   cudaStream_t stream;
   cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking));