Skip to content

Commit

Permalink
Fix tests broken by rapids-logger changes (#775)
Browse files Browse the repository at this point in the history
#765 required an admin merge on this repository to break a circular dependency between this repository and rmm because rapids-cmake provides a centralized `rapids_cpm_rmm` function. Unfortunately, because of how certain tests in this repo were set up, they could not be tested against a fork (like #765 did) without manually copying over branches to the fork, so that was not done. Now that the rmm PR is merged, we can see that there are a few issues to be ironed out with the tests here. In particular, since rmm no longer clones fmt, the pin testing needs to be updated to not look for it.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #775
  • Loading branch information
vyasr authored Feb 11, 2025
1 parent 4082b35 commit 9220596
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions testing/cpm/cpm_generate_pins-nested/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2024, NVIDIA CORPORATION.
# Copyright (c) 2024-2025, 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 @@ -25,4 +25,4 @@ include(${rapids-cmake-dir}/cpm/init.cmake)
rapids_cpm_init(GENERATE_PINNED_VERSIONS)

include("${rapids-cmake-testing-dir}/cpm/verify_generated_pins.cmake")
verify_generated_pins(verify_pins PROJECTS rmm fmt spdlog)
verify_generated_pins(verify_pins PROJECTS rmm spdlog)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2024, NVIDIA CORPORATION.
# Copyright (c) 2024-2025, 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 Down Expand Up @@ -27,5 +27,5 @@ rapids_cpm_rmm()

include("${rapids-cmake-testing-dir}/cpm/verify_generated_pins.cmake")
verify_generated_pins(verify_pins
PROJECTS rmm fmt spdlog
PROJECTS rmm spdlog
PIN_FILE "${RAPIDS_CMAKE_CPM_PINNED_VERSIONS_FILE}")
6 changes: 3 additions & 3 deletions testing/cpm/cpm_generate_pins-var-and-arg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2024, NVIDIA CORPORATION.
# Copyright (c) 2024-2025, 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 @@ -26,9 +26,9 @@ rapids_cpm_rmm()

include("${rapids-cmake-testing-dir}/cpm/verify_generated_pins.cmake")
verify_generated_pins(verify_pins_A
PROJECTS rmm fmt spdlog
PROJECTS rmm spdlog
PIN_FILE "${RAPIDS_CMAKE_CPM_PINNED_VERSIONS_FILE}")

verify_generated_pins(verify_pins_B
PROJECTS rmm fmt spdlog
PROJECTS rmm spdlog
PIN_FILE "${CMAKE_BINARY_DIR}/rapids-cmake/pinned_versions.json")

0 comments on commit 9220596

Please sign in to comment.