Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up and sort CPM packages. #366

Merged
merged 1 commit into from
Feb 8, 2023
Merged

Clean up and sort CPM packages. #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cmake-format-rapids-cmake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions rapids-cmake/cpm/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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"
}
}
}
7 changes: 3 additions & 4 deletions testing/cpm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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 )
4 changes: 2 additions & 2 deletions testing/cpm/cpm_gbench-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_gtest-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_libcudacxx-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvbench-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvcomp-invalid-arch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvcomp-override-clears-proprietary_binary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvcomp-proprietary-off.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvcomp-proprietary-on.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_nvcomp-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_rmm-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_spdlog-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions testing/cpm/cpm_thrust-simple.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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)
Expand Down