diff --git a/CUDADataFormats/Common/test/test_CUDAProduct.cc b/CUDADataFormats/Common/test/test_CUDAProduct.cc index e674ca2bf694f..b81ef5d3fa39a 100644 --- a/CUDADataFormats/Common/test/test_CUDAProduct.cc +++ b/CUDADataFormats/Common/test/test_CUDAProduct.cc @@ -3,7 +3,7 @@ #include "CUDADataFormats/Common/interface/CUDAProduct.h" #include "HeterogeneousCore/CUDACore/interface/CUDAScopedContext.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/CUDAStreamCache.h" #include "HeterogeneousCore/CUDAUtilities/interface/CUDAEventCache.h" @@ -30,7 +30,7 @@ TEST_CASE("Use of CUDAProduct template", "[CUDACore]") { auto bar = std::move(foo); } - exitSansCUDADevices(); + requireCUDADevices(); constexpr int defaultDevice = 0; cudaCheck(cudaSetDevice(defaultDevice)); diff --git a/CUDADataFormats/Track/test/TrajectoryStateSOA_t.h b/CUDADataFormats/Track/test/TrajectoryStateSOA_t.h index 03c51c39acdfb..1fbe6a73da910 100644 --- a/CUDADataFormats/Track/test/TrajectoryStateSOA_t.h +++ b/CUDADataFormats/Track/test/TrajectoryStateSOA_t.h @@ -51,13 +51,13 @@ __global__ void testTSSoA(TS* pts, int n) { } #ifdef __CUDACC__ -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #endif int main() { #ifdef __CUDACC__ - exitSansCUDADevices(); + requireCUDADevices(); #endif TS ts; diff --git a/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp b/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp index 42be4bc6991e1..592f0267c2f7d 100644 --- a/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp +++ b/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp @@ -1,6 +1,6 @@ #include "CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DCUDA.h" #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" namespace testTrackingRecHit2D { @@ -10,7 +10,7 @@ namespace testTrackingRecHit2D { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); cudaStream_t stream; cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking)); diff --git a/DataFormats/CaloRecHit/test/test_calo_rechit.cu b/DataFormats/CaloRecHit/test/test_calo_rechit.cu index 301db13ba508f..a22fb77dc7d06 100644 --- a/DataFormats/CaloRecHit/test/test_calo_rechit.cu +++ b/DataFormats/CaloRecHit/test/test_calo_rechit.cu @@ -5,7 +5,7 @@ #include #include "DataFormats/CaloRecHit/interface/CaloRecHit.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void kernel_test_calo_rechit(CaloRecHit* other) { CaloRecHit rh{DetId(0), 10, 1, 0, 0}; @@ -43,7 +43,7 @@ void test_calo_rechit() { } int main(int argc, char** argv) { - exitSansCUDADevices(); + requireCUDADevices(); test_calo_rechit(); diff --git a/DataFormats/DetId/test/test_detid.cu b/DataFormats/DetId/test/test_detid.cu index 16379427851c4..a7c44ba1372a1 100644 --- a/DataFormats/DetId/test/test_detid.cu +++ b/DataFormats/DetId/test/test_detid.cu @@ -6,7 +6,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void test_gen_detid(DetId* id, uint32_t const rawid) { DetId did{rawid}; @@ -29,7 +29,7 @@ void test_detid() { } int main(int argc, char** argv) { - exitSansCUDADevices(); + requireCUDADevices(); // test det id functionality test_detid(); diff --git a/DataFormats/GeometrySurface/test/gpuFrameTransformTest.cpp b/DataFormats/GeometrySurface/test/gpuFrameTransformTest.cpp index 8c18054e0deb5..0282b4998f9e1 100644 --- a/DataFormats/GeometrySurface/test/gpuFrameTransformTest.cpp +++ b/DataFormats/GeometrySurface/test/gpuFrameTransformTest.cpp @@ -13,7 +13,7 @@ #include "DataFormats/GeometrySurface/interface/GloballyPositioned.h" #include "DataFormats/GeometrySurface/interface/SOARotation.h" #include "DataFormats/GeometrySurface/interface/TkRotation.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" void toGlobalWrapper(SOAFrame const *frame, float const *xl, @@ -26,7 +26,7 @@ void toGlobalWrapper(SOAFrame const *frame, uint32_t n); int main(void) { - exitSansCUDADevices(); + requireCUDADevices(); typedef float T; typedef TkRotation Rotation; diff --git a/DataFormats/HcalDetId/test/test_hcal_detid.cu b/DataFormats/HcalDetId/test/test_hcal_detid.cu index 1696d645ffb01..1b859e5497514 100644 --- a/DataFormats/HcalDetId/test/test_hcal_detid.cu +++ b/DataFormats/HcalDetId/test/test_hcal_detid.cu @@ -6,7 +6,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void test_gen_detid(DetId *id) { DetId did; @@ -65,7 +65,7 @@ void test_hcal_detid() { } int main(int argc, char **argv) { - exitSansCUDADevices(); + requireCUDADevices(); // test det id functionality test_detid(); diff --git a/DataFormats/HcalDigi/test/test_hcal_digi.cu b/DataFormats/HcalDigi/test/test_hcal_digi.cu index d423ab835e352..d0dd3fc874ba3 100644 --- a/DataFormats/HcalDigi/test/test_hcal_digi.cu +++ b/DataFormats/HcalDigi/test/test_hcal_digi.cu @@ -11,7 +11,7 @@ #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h" #include "DataFormats/HcalDigi/interface/QIE10DataFrame.h" #include "DataFormats/HcalDigi/interface/QIE11DataFrame.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void kernel_test_hcal_qiesample(HcalQIESample *sample, uint16_t value) { printf("kernel: testing hcal qie sampel\n"); @@ -163,7 +163,7 @@ void test_hcal_qie8_hbhedf() { } int main(int argc, char **argv) { - exitSansCUDADevices(); + requireCUDADevices(); // qie8 test_hcal_qiesample(); diff --git a/DataFormats/HcalRecHit/test/test_hcal_reco.cu b/DataFormats/HcalRecHit/test/test_hcal_reco.cu index dfd5a7aead864..70d5a4b0c3501 100644 --- a/DataFormats/HcalRecHit/test/test_hcal_reco.cu +++ b/DataFormats/HcalRecHit/test/test_hcal_reco.cu @@ -10,7 +10,7 @@ #include "DataFormats/HcalRecHit/interface/HORecHit.h" #include "DataFormats/HcalRecHit/interface/HFQIE10Info.h" #include "DataFormats/HcalRecHit/interface/HBHEChannelInfo.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" template __global__ void kernel_test_hcal_rechits(T *other) { @@ -110,7 +110,7 @@ void test_hcal_hbhechinfo() { } int main(int argc, char **argv) { - exitSansCUDADevices(); + requireCUDADevices(); test_hcal_rechits(); test_hcal_rechits(); diff --git a/DataFormats/Math/test/CholeskyInvert_t.cu b/DataFormats/Math/test/CholeskyInvert_t.cu index f2e440d6009ff..f493a7602307a 100644 --- a/DataFormats/Math/test/CholeskyInvert_t.cu +++ b/DataFormats/Math/test/CholeskyInvert_t.cu @@ -16,7 +16,7 @@ #include "DataFormats/Math/interface/choleskyInversion.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/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" @@ -197,7 +197,7 @@ void go(bool soa) { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); go<2>(false); go<4>(false); diff --git a/DataFormats/Math/test/cudaAtan2Test.cu b/DataFormats/Math/test/cudaAtan2Test.cu index 52901dd7e480e..e678c9208a9ae 100644 --- a/DataFormats/Math/test/cudaAtan2Test.cu +++ b/DataFormats/Math/test/cudaAtan2Test.cu @@ -30,7 +30,7 @@ end #include "DataFormats/Math/interface/approx_atan2.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/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" constexpr float xmin = -100.001; // avoid 0 @@ -96,7 +96,7 @@ void go() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); try { go<3>(); diff --git a/DataFormats/Math/test/cudaMathTest.cu b/DataFormats/Math/test/cudaMathTest.cu index 6d2a289877d7c..d557456e4726c 100644 --- a/DataFormats/Math/test/cudaMathTest.cu +++ b/DataFormats/Math/test/cudaMathTest.cu @@ -40,7 +40,7 @@ end #include "DataFormats/Math/interface/approx_atan2.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/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" std::mt19937 eng; @@ -181,7 +181,7 @@ void go() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); try { go(); diff --git a/HeterogeneousCore/CUDACore/test/testStreamEvent.cu b/HeterogeneousCore/CUDACore/test/testStreamEvent.cu index bd9ce4f29fba3..f819a78f698e4 100644 --- a/HeterogeneousCore/CUDACore/test/testStreamEvent.cu +++ b/HeterogeneousCore/CUDACore/test/testStreamEvent.cu @@ -13,7 +13,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" namespace { constexpr int ARRAY_SIZE = 20000000; @@ -31,7 +31,7 @@ __global__ void kernel_looping(float *point, unsigned int num) { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); constexpr bool debug = false; diff --git a/HeterogeneousCore/CUDACore/test/test_CUDAScopedContext.cc b/HeterogeneousCore/CUDACore/test/test_CUDAScopedContext.cc index 507824f8bfdb7..451538ced1b50 100644 --- a/HeterogeneousCore/CUDACore/test/test_CUDAScopedContext.cc +++ b/HeterogeneousCore/CUDACore/test/test_CUDAScopedContext.cc @@ -8,7 +8,7 @@ #include "HeterogeneousCore/CUDACore/interface/CUDAScopedContext.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/eventIsOccurred.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/CUDAStreamCache.h" #include "HeterogeneousCore/CUDAUtilities/interface/CUDAEventCache.h" #include "HeterogeneousCore/CUDAUtilities/interface/currentDevice.h" @@ -39,7 +39,7 @@ namespace { } // namespace TEST_CASE("Use of CUDAScopedContext", "[CUDACore]") { - exitSansCUDADevices(); + requireCUDADevices(); constexpr int defaultDevice = 0; { diff --git a/HeterogeneousCore/CUDATest/test/test_TestCUDAProducerGPUFirst.cc b/HeterogeneousCore/CUDATest/test/test_TestCUDAProducerGPUFirst.cc index 2b137d3483c5a..face22a8c3e2e 100644 --- a/HeterogeneousCore/CUDATest/test/test_TestCUDAProducerGPUFirst.cc +++ b/HeterogeneousCore/CUDATest/test/test_TestCUDAProducerGPUFirst.cc @@ -5,7 +5,7 @@ #include "CUDADataFormats/Common/interface/CUDAProduct.h" #include "HeterogeneousCore/CUDACore/interface/CUDAScopedContext.h" #include "HeterogeneousCore/CUDATest/interface/CUDAThing.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include @@ -59,7 +59,7 @@ process.moduleToTest(process.toTest) )_"}; edm::test::TestProcessor::Config config{baseConfig}; - exitSansCUDADevices(); + requireCUDADevices(); constexpr int defaultDevice = 0; diff --git a/HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h b/HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h deleted file mode 100644 index b990039b51e04..0000000000000 --- a/HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef HeterogeneousCore_CUDAUtilities_exitSansCUDADevices_h -#define HeterogeneousCore_CUDAUtilities_exitSansCUDADevices_h - -void exitSansCUDADevices(); - -#endif // HeterogeneousCore_CUDAUtilities_exitSansCUDADevices_h diff --git a/HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h b/HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h new file mode 100644 index 0000000000000..e1260f7cfe187 --- /dev/null +++ b/HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h @@ -0,0 +1,6 @@ +#ifndef HeterogeneousCore_CUDAUtilities_requireCUDADevices_h +#define HeterogeneousCore_CUDAUtilities_requireCUDADevices_h + +void requireCUDADevices(); + +#endif // HeterogeneousCore_CUDAUtilities_requireCUDADevices_h diff --git a/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc b/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc index a13941ab783ef..ab5cdee0fb8af 100644 --- a/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc +++ b/HeterogeneousCore/CUDAUtilities/src/exitSansCUDADevices.cc @@ -3,9 +3,9 @@ #include -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" -void exitSansCUDADevices() { +void requireCUDADevices() { int devices = 0; auto status = cudaGetDeviceCount(&devices); if (status != cudaSuccess) { diff --git a/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp b/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp index b642f9c8d76cd..d4cf710e0b9af 100644 --- a/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp @@ -5,7 +5,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" template void go() { @@ -136,7 +136,7 @@ void go() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); go(); go(); diff --git a/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cu b/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cu index dc7d065c037db..6a6eb1d63adab 100644 --- a/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cu @@ -7,7 +7,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" template @@ -152,7 +152,7 @@ void go() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); go(); go(); diff --git a/HeterogeneousCore/CUDAUtilities/test/OneHistoContainer_t.cu b/HeterogeneousCore/CUDAUtilities/test/OneHistoContainer_t.cu index 3fb47533b8651..f57a5275d1500 100644 --- a/HeterogeneousCore/CUDAUtilities/test/OneHistoContainer_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/OneHistoContainer_t.cu @@ -7,7 +7,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" @@ -137,7 +137,7 @@ void go() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); go(); go(); diff --git a/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h b/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h index 01d469d562be5..25dcc01b6244c 100644 --- a/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h +++ b/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h @@ -9,7 +9,7 @@ #ifdef __CUDACC__ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/currentDevice.h" #endif @@ -99,7 +99,7 @@ __global__ void verifyBulk(Assoc const* __restrict__ assoc, AtomicPairCounter co int main() { #ifdef __CUDACC__ - exitSansCUDADevices(); + requireCUDADevices(); auto current_device = cudautils::currentDevice(); #else // make sure cuda emulation is working diff --git a/HeterogeneousCore/CUDAUtilities/test/assert_t.cu b/HeterogeneousCore/CUDAUtilities/test/assert_t.cu index 2f993ec2bc8ca..c7f6ca5faf9da 100644 --- a/HeterogeneousCore/CUDAUtilities/test/assert_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/assert_t.cu @@ -1,10 +1,10 @@ #include "HeterogeneousCore/CUDAUtilities/interface/cuda_assert.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void testIt(int one) { assert(one == 1); } int main(int argc, char* argv[]) { - exitSansCUDADevices(); + requireCUDADevices(); testIt<<<1, 1>>>(argc); cudaDeviceSynchronize(); diff --git a/HeterogeneousCore/CUDAUtilities/test/copyAsync_t.cpp b/HeterogeneousCore/CUDAUtilities/test/copyAsync_t.cpp index 40ade07611b17..12308ea9b7e5f 100644 --- a/HeterogeneousCore/CUDAUtilities/test/copyAsync_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/copyAsync_t.cpp @@ -4,10 +4,10 @@ #include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" TEST_CASE("copyAsync", "[cudaMemTools]") { - exitSansCUDADevices(); + requireCUDADevices(); cudaStream_t stream; cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking)); diff --git a/HeterogeneousCore/CUDAUtilities/test/cudastdAlgorithm_t.cu b/HeterogeneousCore/CUDAUtilities/test/cudastdAlgorithm_t.cu index 8d154ae33a28c..06f255c0409d7 100644 --- a/HeterogeneousCore/CUDAUtilities/test/cudastdAlgorithm_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/cudastdAlgorithm_t.cu @@ -2,7 +2,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/cudastdAlgorithm.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" @@ -33,7 +33,7 @@ void wrapper() { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); wrapper(); } diff --git a/HeterogeneousCore/CUDAUtilities/test/device_unique_ptr_t.cpp b/HeterogeneousCore/CUDAUtilities/test/device_unique_ptr_t.cpp index 4543ce798d44d..5f4b576d0d302 100644 --- a/HeterogeneousCore/CUDAUtilities/test/device_unique_ptr_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/device_unique_ptr_t.cpp @@ -2,10 +2,10 @@ #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" TEST_CASE("device_unique_ptr", "[cudaMemTools]") { - exitSansCUDADevices(); + requireCUDADevices(); cudaStream_t stream; cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking)); diff --git a/HeterogeneousCore/CUDAUtilities/test/eigenSoA_t.h b/HeterogeneousCore/CUDAUtilities/test/eigenSoA_t.h index 22349dfc226c7..ae2975f3df469 100644 --- a/HeterogeneousCore/CUDAUtilities/test/eigenSoA_t.h +++ b/HeterogeneousCore/CUDAUtilities/test/eigenSoA_t.h @@ -59,13 +59,13 @@ __global__ void testBasicSoA(float* p) { #include #ifdef __CUDACC__ -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #endif int main() { #ifdef __CUDACC__ - exitSansCUDADevices(); + requireCUDADevices(); #endif float p[1024]; diff --git a/HeterogeneousCore/CUDAUtilities/test/host_noncached_unique_ptr_t.cpp b/HeterogeneousCore/CUDAUtilities/test/host_noncached_unique_ptr_t.cpp index ae9e3c9a3849d..12f7bb239023b 100644 --- a/HeterogeneousCore/CUDAUtilities/test/host_noncached_unique_ptr_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/host_noncached_unique_ptr_t.cpp @@ -1,10 +1,10 @@ #include "catch.hpp" #include "HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" TEST_CASE("host_noncached_unique_ptr", "[cudaMemTools]") { - exitSansCUDADevices(); + requireCUDADevices(); SECTION("Single element") { auto ptr1 = cudautils::make_host_noncached_unique(); diff --git a/HeterogeneousCore/CUDAUtilities/test/host_unique_ptr_t.cpp b/HeterogeneousCore/CUDAUtilities/test/host_unique_ptr_t.cpp index f085e1dfdceb7..a5e81399ab89a 100644 --- a/HeterogeneousCore/CUDAUtilities/test/host_unique_ptr_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/host_unique_ptr_t.cpp @@ -2,10 +2,10 @@ #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" TEST_CASE("host_unique_ptr", "[cudaMemTools]") { - exitSansCUDADevices(); + requireCUDADevices(); cudaStream_t stream; cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking)); diff --git a/HeterogeneousCore/CUDAUtilities/test/memsetAsync_t.cpp b/HeterogeneousCore/CUDAUtilities/test/memsetAsync_t.cpp index 5e9ab6bfa6333..49d2d7e34dad3 100644 --- a/HeterogeneousCore/CUDAUtilities/test/memsetAsync_t.cpp +++ b/HeterogeneousCore/CUDAUtilities/test/memsetAsync_t.cpp @@ -5,10 +5,10 @@ #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/memsetAsync.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" TEST_CASE("memsetAsync", "[cudaMemTools]") { - exitSansCUDADevices(); + requireCUDADevices(); cudaStream_t stream; cudaCheck(cudaStreamCreateWithFlags(&stream, cudaStreamNonBlocking)); diff --git a/HeterogeneousCore/CUDAUtilities/test/prefixScan_t.cu b/HeterogeneousCore/CUDAUtilities/test/prefixScan_t.cu index b83c03f710012..a4db0727a9802 100644 --- a/HeterogeneousCore/CUDAUtilities/test/prefixScan_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/prefixScan_t.cu @@ -4,7 +4,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" #include "HeterogeneousCore/CUDAUtilities/interface/prefixScan.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" template __global__ void testPrefixScan(uint32_t size) { @@ -72,7 +72,7 @@ __global__ void verify(uint32_t const *v, uint32_t n) { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); std::cout << "warp level" << std::endl; // std::cout << "warp 32" << std::endl; diff --git a/HeterogeneousCore/CUDAUtilities/test/radixSort_t.cu b/HeterogeneousCore/CUDAUtilities/test/radixSort_t.cu index 45cb3b8cf5e32..f031bce33a9b8 100644 --- a/HeterogeneousCore/CUDAUtilities/test/radixSort_t.cu +++ b/HeterogeneousCore/CUDAUtilities/test/radixSort_t.cu @@ -10,7 +10,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #include "HeterogeneousCore/CUDAUtilities/interface/radixSort.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" @@ -169,7 +169,7 @@ void go(bool useShared) { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); bool useShared = false; diff --git a/HeterogeneousCore/CUDAUtilities/test/test_GPUSimpleVector.cu b/HeterogeneousCore/CUDAUtilities/test/test_GPUSimpleVector.cu index 23d2801f26fce..e6e1a94a1377e 100644 --- a/HeterogeneousCore/CUDAUtilities/test/test_GPUSimpleVector.cu +++ b/HeterogeneousCore/CUDAUtilities/test/test_GPUSimpleVector.cu @@ -8,7 +8,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/GPUSimpleVector.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" __global__ void vector_pushback(GPU::SimpleVector *foo) { auto index = threadIdx.x + blockIdx.x * blockDim.x; @@ -23,7 +23,7 @@ __global__ void vector_emplace_back(GPU::SimpleVector *foo) { } int main() { - exitSansCUDADevices(); + requireCUDADevices(); auto maxN = 10000; GPU::SimpleVector *obj_ptr = nullptr; diff --git a/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h b/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h index c808bc780353c..b22e7a35a6ac7 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h +++ b/RecoLocalTracker/SiPixelClusterizer/test/gpuClustering_t.h @@ -13,7 +13,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaDeviceCount.h" #endif @@ -23,7 +23,7 @@ int main(void) { #ifdef __CUDACC__ - exitSansCUDADevices(); + requireCUDADevices(); if (cudautils::cudaDeviceCount() == 0) { std::cerr << "No CUDA devices on this system" diff --git a/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPU.cu b/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPU.cu index 7b02a23c41dca..e1606ab54c9c6 100644 --- a/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPU.cu +++ b/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPU.cu @@ -4,7 +4,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #ifdef USE_BL #include "RecoPixelVertexing/PixelTrackFitting/interface/BrokenLine.h" @@ -329,7 +329,7 @@ void testFit() { } int main(int argc, char* argv[]) { - exitSansCUDADevices(); + requireCUDADevices(); testFit<4>(); testFit<3>(); diff --git a/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPUNoFit.cu b/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPUNoFit.cu index e16ac3dbbcbc3..7ef3f572603b0 100644 --- a/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPUNoFit.cu +++ b/RecoPixelVertexing/PixelTrackFitting/test/testEigenGPUNoFit.cu @@ -4,7 +4,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "test_common.h" using namespace Eigen; @@ -215,7 +215,7 @@ void testEigenvalues() { } int main(int argc, char *argv[]) { - exitSansCUDADevices(); + requireCUDADevices(); testEigenvalues(); testInverse3x3(); diff --git a/RecoPixelVertexing/PixelVertexFinding/test/VertexFinder_t.h b/RecoPixelVertexing/PixelVertexFinding/test/VertexFinder_t.h index 977858d0bf08d..9b55ba59daab2 100644 --- a/RecoPixelVertexing/PixelVertexFinding/test/VertexFinder_t.h +++ b/RecoPixelVertexing/PixelVertexFinding/test/VertexFinder_t.h @@ -5,7 +5,7 @@ #include #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" -#include "HeterogeneousCore/CUDAUtilities/interface/exitSansCUDADevices.h" +#include "HeterogeneousCore/CUDAUtilities/interface/requireCUDADevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/launch.h" #ifdef USE_DBSCAN #include "RecoPixelVertexing/PixelVertexFinding/src/gpuClusterTracksDBSCAN.h" @@ -92,7 +92,7 @@ __global__ void print(ZVertices const* pdata, WorkSpace const* pws) { int main() { #ifdef __CUDACC__ - exitSansCUDADevices(); + requireCUDADevices(); auto onGPU_d = cudautils::make_device_unique(1, nullptr); auto ws_d = cudautils::make_device_unique(1, nullptr);