diff --git a/cmake-format-rapids-cmake.json b/cmake-format-rapids-cmake.json index 7402ca07..ad18bbbd 100644 --- a/cmake-format-rapids-cmake.json +++ b/cmake-format-rapids-cmake.json @@ -88,6 +88,15 @@ } }, + "rapids_cpm_cuco": { + "pargs": { + "nargs": 0 + }, + "kwargs": { + "BUILD_EXPORT_SET": 1, + "INSTALL_EXPORT_SET": 1 + } + }, "rapids_cpm_gbench": { "pargs": { "nargs": 0 diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index fef377ab..6f922af2 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -1,16 +1,27 @@ { "packages" : { - "GTest" : { - "version" : "1.10.0", - "git_url" : "https://github.com/google/googletest.git", - "git_tag" : "release-${version}" + "cuco" : { + "version" : "0.0.1", + "git_shallow" : false, + "git_url" : "https://github.com/NVIDIA/cuCollections.git", + "git_tag" : "31e1d5df6869ef6cb60f36a614b30a244cf3bd78" }, "GBench" : { "version" : "1.5.3", "git_url" : "https://github.com/google/benchmark.git", "git_tag" : "v1.5.3" }, + "GTest" : { + "version" : "1.10.0", + "git_url" : "https://github.com/google/googletest.git", + "git_tag" : "release-${version}" + }, + "libcudacxx" : { + "version" : "1.9.1", + "git_url" : "https://github.com/NVIDIA/libcudacxx.git", + "git_tag" : "branch/${version}" + }, "nvbench" : { "version" : "0.0", "git_shallow" : false, @@ -52,17 +63,6 @@ "fixed_in" : "2.0" } ] - }, - "libcudacxx" : { - "version" : "1.9.1", - "git_url" : "https://github.com/NVIDIA/libcudacxx.git", - "git_tag" : "branch/${version}" - }, - "cuco" : { - "version" : "0.0.1", - "git_shallow" : false, - "git_url" : "https://github.com/NVIDIA/cuCollections.git", - "git_tag" : "31e1d5df6869ef6cb60f36a614b30a244cf3bd78" } } } diff --git a/testing/cpm/CMakeLists.txt b/testing/cpm/CMakeLists.txt index e6dfeeda..4a45d413 100644 --- a/testing/cpm/CMakeLists.txt +++ b/testing/cpm/CMakeLists.txt @@ -42,6 +42,9 @@ add_cmake_config_test( cpm_generate_patch_command-invalid.cmake ) add_cmake_config_test( cpm_generate_patch_command-override.cmake ) add_cmake_config_test( cpm_generate_patch_command-current_json_dir.cmake ) +add_cmake_config_test( cpm_cuco-simple.cmake ) +add_cmake_config_test( cpm_cuco-export.cmake ) +add_cmake_config_test( cpm_cuco-libcudacxx-no-install-export.cmake ) add_cmake_config_test( cpm_gbench-export.cmake ) add_cmake_config_test( cpm_gbench-simple.cmake ) @@ -71,7 +74,3 @@ add_cmake_config_test( cpm_spdlog-simple.cmake ) add_cmake_config_test( cpm_thrust-export.cmake ) add_cmake_config_test( cpm_thrust-simple.cmake ) - -add_cmake_config_test( cpm_cuco-simple.cmake ) -add_cmake_config_test( cpm_cuco-export.cmake ) -add_cmake_config_test( cpm_cuco-libcudacxx-no-install-export.cmake ) diff --git a/testing/cpm/cpm_gbench-simple.cmake b/testing/cpm/cpm_gbench-simple.cmake index ece1b952..6b875d9a 100644 --- a/testing/cpm/cpm_gbench-simple.cmake +++ b/testing/cpm/cpm_gbench-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ rapids_cpm_init() if(TARGET benchmark::benchmark) - message(FATAL_ERROR "Expected benchmark::benchmark expected to not exist") + message(FATAL_ERROR "Expected benchmark::benchmark not to exist") endif() rapids_cpm_gbench() diff --git a/testing/cpm/cpm_gtest-simple.cmake b/testing/cpm/cpm_gtest-simple.cmake index 87c42600..6af009d3 100644 --- a/testing/cpm/cpm_gtest-simple.cmake +++ b/testing/cpm/cpm_gtest-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ rapids_cpm_init() if(TARGET GTest::gtest) - message(FATAL_ERROR "Expected GTest::gtest expected to not exist") + message(FATAL_ERROR "Expected GTest::gtest not to exist") endif() rapids_cpm_gtest() diff --git a/testing/cpm/cpm_libcudacxx-simple.cmake b/testing/cpm/cpm_libcudacxx-simple.cmake index 0b0385f3..e9df2edf 100644 --- a/testing/cpm/cpm_libcudacxx-simple.cmake +++ b/testing/cpm/cpm_libcudacxx-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/libcudacxx.cmake) rapids_cpm_init() if(TARGET libcudacxx::libcudacxx) - message(FATAL_ERROR "Expected libcudacxx::libcudacxx expected to not exist") + message(FATAL_ERROR "Expected libcudacxx::libcudacxx not to exist") endif() rapids_cpm_libcudacxx() diff --git a/testing/cpm/cpm_nvbench-simple.cmake b/testing/cpm/cpm_nvbench-simple.cmake index 73d92867..2b9d18c6 100644 --- a/testing/cpm/cpm_nvbench-simple.cmake +++ b/testing/cpm/cpm_nvbench-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/nvbench.cmake) rapids_cpm_init() if(TARGET nvbench::nvbench) - message(FATAL_ERROR "Expected nvbench::nvbench expected to not exist") + message(FATAL_ERROR "Expected nvbench::nvbench not to exist") endif() rapids_cpm_nvbench() diff --git a/testing/cpm/cpm_nvcomp-invalid-arch.cmake b/testing/cpm/cpm_nvcomp-invalid-arch.cmake index afabf27a..7a30da9a 100644 --- a/testing/cpm/cpm_nvcomp-invalid-arch.cmake +++ b/testing/cpm/cpm_nvcomp-invalid-arch.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/nvcomp.cmake) rapids_cpm_init() if(TARGET nvcomp::nvcomp) - message(FATAL_ERROR "Expected nvcomp::nvcomp expected to not exist") + message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") endif() set(CMAKE_SYSTEM_PROCESSOR "i686") # Don't do this outside of tests diff --git a/testing/cpm/cpm_nvcomp-override-clears-proprietary_binary.cmake b/testing/cpm/cpm_nvcomp-override-clears-proprietary_binary.cmake index ee1699fa..c17abdcc 100644 --- a/testing/cpm/cpm_nvcomp-override-clears-proprietary_binary.cmake +++ b/testing/cpm/cpm_nvcomp-override-clears-proprietary_binary.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ include(${rapids-cmake-dir}/cpm/package_override.cmake) rapids_cpm_init() if(TARGET nvcomp::nvcomp) - message(FATAL_ERROR "Expected nvcomp::nvcomp expected to not exist") + message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") endif() # Need to write out an nvcomp override file diff --git a/testing/cpm/cpm_nvcomp-proprietary-off.cmake b/testing/cpm/cpm_nvcomp-proprietary-off.cmake index 173614a8..df3f4990 100644 --- a/testing/cpm/cpm_nvcomp-proprietary-off.cmake +++ b/testing/cpm/cpm_nvcomp-proprietary-off.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/nvcomp.cmake) rapids_cpm_init() if(TARGET nvcomp::nvcomp) - message(FATAL_ERROR "Expected nvcomp::nvcomp expected to not exist") + message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") endif() rapids_cpm_nvcomp(USE_PROPRIETARY_BINARY OFF) diff --git a/testing/cpm/cpm_nvcomp-proprietary-on.cmake b/testing/cpm/cpm_nvcomp-proprietary-on.cmake index 897705a0..b4dd5a7d 100644 --- a/testing/cpm/cpm_nvcomp-proprietary-on.cmake +++ b/testing/cpm/cpm_nvcomp-proprietary-on.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/nvcomp.cmake) rapids_cpm_init() if(TARGET nvcomp::nvcomp) - message(FATAL_ERROR "Expected nvcomp::nvcomp expected to not exist") + message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") endif() rapids_cpm_nvcomp(USE_PROPRIETARY_BINARY ON) diff --git a/testing/cpm/cpm_nvcomp-simple.cmake b/testing/cpm/cpm_nvcomp-simple.cmake index 2a6a0d8b..88ada02d 100644 --- a/testing/cpm/cpm_nvcomp-simple.cmake +++ b/testing/cpm/cpm_nvcomp-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/nvcomp.cmake) rapids_cpm_init() if(TARGET nvcomp::nvcomp) - message(FATAL_ERROR "Expected nvcomp::nvcomp expected to not exist") + message(FATAL_ERROR "Expected nvcomp::nvcomp not to exist") endif() rapids_cpm_nvcomp() diff --git a/testing/cpm/cpm_rmm-simple.cmake b/testing/cpm/cpm_rmm-simple.cmake index 1fa7633a..cbca83a8 100644 --- a/testing/cpm/cpm_rmm-simple.cmake +++ b/testing/cpm/cpm_rmm-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/rmm.cmake) rapids_cpm_init() if(TARGET rmm::rmm) - message(FATAL_ERROR "Expected rmm::rmm expected to not exist") + message(FATAL_ERROR "Expected rmm::rmm not to exist") endif() rapids_cpm_rmm() diff --git a/testing/cpm/cpm_spdlog-simple.cmake b/testing/cpm/cpm_spdlog-simple.cmake index 8170dce2..9ab5716d 100644 --- a/testing/cpm/cpm_spdlog-simple.cmake +++ b/testing/cpm/cpm_spdlog-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/spdlog.cmake) rapids_cpm_init() if(TARGET spdlog::spdlog_header_only) - message(FATAL_ERROR "Expected spdlog::spdlog_header_only expected to not exist") + message(FATAL_ERROR "Expected spdlog::spdlog_header_only not to exist") endif() rapids_cpm_spdlog() diff --git a/testing/cpm/cpm_thrust-simple.cmake b/testing/cpm/cpm_thrust-simple.cmake index f8d38884..a9a6f56d 100644 --- a/testing/cpm/cpm_thrust-simple.cmake +++ b/testing/cpm/cpm_thrust-simple.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ include(${rapids-cmake-dir}/cpm/thrust.cmake) rapids_cpm_init() if(TARGET test::Thrust) - message(FATAL_ERROR "Expected test::Thrust expected to not exist") + message(FATAL_ERROR "Expected test::Thrust not to exist") endif() rapids_cpm_thrust(NAMESPACE test)