From a389f2bd5c780a41b3e910e380fb575678f08725 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 1 Nov 2023 13:54:20 -0400 Subject: [PATCH] Correct issues with C++98 compilers --- .../test/detail/generate_resource_spec.cpp | 25 ++++++++++--------- .../test/generate_resource_spec.cmake | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/rapids-cmake/test/detail/generate_resource_spec.cpp b/rapids-cmake/test/detail/generate_resource_spec.cpp index c66a5b05..5beba53f 100644 --- a/rapids-cmake/test/detail/generate_resource_spec.cpp +++ b/rapids-cmake/test/detail/generate_resource_spec.cpp @@ -23,16 +23,17 @@ #include struct version { - int major = 1; - int minor = 0; + version() : major(1), minor(0) {} + int major; + int minor; }; struct gpu { - gpu(int i) : id{i} {}; - gpu(int i, size_t mem) : id{i}, memory{mem}, slots{100} {} - int id = 0; - size_t memory = 0; - int slots = 0; + gpu(int i) : id(i), memory(0), slots(0){}; + gpu(int i, size_t mem) : id(i), memory(mem), slots(100) {} + int id; + size_t memory; + int slots; }; // A hard-coded JSON printer that generates a ctest resource-specification file: @@ -54,19 +55,19 @@ int main() #ifdef HAVE_CUDA cudaGetDeviceCount(&nDevices); if (nDevices == 0) { - gpus.emplace_back(0); + gpus.push_back(gpu(0)); } else { for (int i = 0; i < nDevices; ++i) { cudaDeviceProp prop; cudaGetDeviceProperties(&prop, i); - gpus.emplace_back(i, prop.totalGlobalMem); + gpus.push_back(gpu(i, prop.totalGlobalMem)); } } #else - gpus.emplace_back(0); -#endif() + gpus.push_back(gpu(0)); +#endif - version v{1, 0}; + version v; std::cout << "{\n"; to_json(std::cout, v); std::cout << ",\n"; diff --git a/rapids-cmake/test/generate_resource_spec.cmake b/rapids-cmake/test/generate_resource_spec.cmake index 07186f5c..f667f5f7 100644 --- a/rapids-cmake/test/generate_resource_spec.cmake +++ b/rapids-cmake/test/generate_resource_spec.cmake @@ -67,7 +67,7 @@ function(rapids_test_generate_resource_spec DESTINATION filepath) set(error_file ${PROJECT_BINARY_DIR}/rapids-cmake/detect_gpus.stderr.log) if(NOT EXISTS "${eval_exe}") - find_package(CUDAToolkit) + find_package(CUDAToolkit QUIET) file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/rapids-cmake/") if(CUDAToolkit_FOUND)