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

Reduce cpm tests network usage #683

Merged
merged 3 commits into from
Aug 22, 2024
Merged

Reduce cpm tests network usage #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
491f191
cpm_generate_pins-nested fetch deps more efficiently
robertmaynard Aug 21, 2024
f854076
Use faster to clone repos in cpm_find-patch-command
robertmaynard Aug 21, 2024
e154523
Remove NO_CPM_CACHE from tests that can safely re-use the cache
robertmaynard Aug 21, 2024
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
8 changes: 4 additions & 4 deletions testing/cpm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ add_cmake_config_test( cpm_find-restore-cpm-vars )
add_cmake_config_test( cpm_find-version-explicit-install.cmake )

add_cmake_build_test( cpm_generate_pins-format-patches NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-nested NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-nested )
add_cmake_build_test( cpm_generate_pins-no-src-dir )
add_cmake_build_test( cpm_generate_pins-override NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-pure-cpm )
add_cmake_build_test( cpm_generate_pins-simple NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-simple-via-variable NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-var-and-arg NO_CPM_CACHE)
add_cmake_build_test( cpm_generate_pins-simple )
add_cmake_build_test( cpm_generate_pins-simple-via-variable )
add_cmake_build_test( cpm_generate_pins-var-and-arg )

add_cmake_config_test( cpm_init-bad-default-path.cmake SHOULD_FAIL "rapids_cpm_init can't load")
add_cmake_config_test( cpm_init-bad-default-cmake-var.cmake SHOULD_FAIL "rapids_cpm_init can't load")
Expand Down
26 changes: 13 additions & 13 deletions testing/cpm/cpm_find-patch-command/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ cmake_minimum_required(VERSION 3.26.4)
project(rapids-cpm_find-patch-command-project LANGUAGES CXX)

include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
rapids_cpm_package_details(CCCL version repository tag shallow exclude)
rapids_cpm_package_details(fmt version repository tag shallow exclude)

set(deps_dir "${CMAKE_CURRENT_BINARY_DIR}/_cccl_dep")
set(deps_dir "${CMAKE_CURRENT_BINARY_DIR}/_fmt_dep")
if(NOT EXISTS "${deps_dir}")
file(MAKE_DIRECTORY "${deps_dir}")
find_package(Git)
Expand All @@ -28,37 +28,37 @@ if(NOT EXISTS "${deps_dir}")
WORKING_DIRECTORY "${deps_dir}")
endif()

set(cccl_dir "${deps_dir}/cccl")
list(APPEND CMAKE_PREFIX_PATH "${cccl_dir}")
set(fmt_dir "${deps_dir}/fmt")
list(APPEND CMAKE_PREFIX_PATH "${fmt_dir}")

include(${rapids-cmake-dir}/cpm/init.cmake)
rapids_cpm_init()

include(${rapids-cmake-dir}/cpm/package_override.cmake)
rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/override.json)

include(${rapids-cmake-dir}/cpm/cccl.cmake)
rapids_cpm_cccl()
include(${rapids-cmake-dir}/cpm/fmt.cmake)
rapids_cpm_fmt()

if(NOT "${CCCL_ADDED}")
if(NOT "${fmt_ADDED}")
message(FATAL_ERROR "The found repo was used rather than downloading and patching a new version")
endif()

# Verify that the two files that we inserted into the CCCL source tree exist
# Which proves the patches in the override are properly applied
if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_1.txt")
message(FATAL_ERROR "failed to apply CCCL first patch")
if(NOT EXISTS "${fmt_SOURCE_DIR}/git_file_1.txt")
message(FATAL_ERROR "failed to apply fmt first patch")
endif()

if(NOT EXISTS "${CCCL_SOURCE_DIR}/git_file_2.txt")
message(FATAL_ERROR "failed to apply CCCL second patch")
if(NOT EXISTS "${fmt_SOURCE_DIR}/git_file_2.txt")
message(FATAL_ERROR "failed to apply fmt second patch")
endif()

execute_process(
COMMAND ${GIT_EXECUTABLE} diff --quiet ${tag}
RESULT_VARIABLE REPO_IS_PATCHED
WORKING_DIRECTORY "${CCCL_SOURCE_DIR}")
WORKING_DIRECTORY "${fmt_SOURCE_DIR}")

if(NOT ${REPO_IS_PATCHED})
message(FATAL_ERROR "The repo was downloaded to ${CCCL_SOURCE_DIR} but not patched.")
message(FATAL_ERROR "The repo was downloaded to ${fmt_SOURCE_DIR} but not patched.")
endif()
2 changes: 1 addition & 1 deletion testing/cpm/cpm_find-patch-command/override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": {
"CCCL": {
"fmt": {
"patches": [
{
"file": "${current_json_dir}/patches/0001-move-git-sha1.patch",
Expand Down
6 changes: 2 additions & 4 deletions testing/cpm/cpm_generate_pins-nested/b/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ project(rapids-test-b LANGUAGES CXX)
include(${rapids-cmake-dir}/cpm/init.cmake)
rapids_cpm_init()

include(${rapids-cmake-dir}/cpm/cccl.cmake)
include(${rapids-cmake-dir}/cpm/cuco.cmake)
include(${rapids-cmake-dir}/cpm/nvcomp.cmake)

rapids_cpm_cccl()
rapids_cpm_cuco()
rapids_cpm_nvcomp()
rapids_cpm_cuco(DOWNLOAD_ONLY ON)
rapids_cpm_nvcomp(DOWNLOAD_ONLY ON)