-
Notifications
You must be signed in to change notification settings - Fork 45
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.
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
WIP: Bump fmt
(to 10.2.1) and spdlog
(to 1.13), remove patches
#592
Conversation
if(${proj}_SOURCE_DIR) | ||
list(APPEND projects-to-verify ${proj}) | ||
endif() | ||
endforeach() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I chose not to add validation here that projects-to-verify
is non-empty. That already happens in the verify/
scripts.
e.g.
string(REPLACE " " ";" projects-to-verify "${projects-to-verify}") | |
if(NOT projects-to-verify) | |
message(FATAL_ERROR "Failed to pass anything in projects-to-verify") | |
endif() |
Modifies pinning tests from #530: * to only test projects that were downloaded by CPM (e.g. ignoring the `fmt` that might already exist in the build environment) * to echo out `pinned_versions.json` and `versions.json` in logs from failed tests, to make debugging faster ## Notes for Reviewers #592 proposes some testing changes that aren't specific to the goals of that PR. Since that PR might be stuck for a bit (rapidsai/build-planning#56 (comment)), this proposes pulling those out into a separate PR: * so that other changes in this project benefit from them * to shrink the diff of #592 and therefore the risk of merge conflicts ### How I tested this Pushed a commit with the new test error message content changes but keeping `fmt` in the failing tests, to confirm that the expected tests failed. <details><summary>got the expected outputs (click me)</summary> ```text The following tests FAILED: 698 - cpm_generate_pins-nested-makefile (Failed) 700 - cpm_generate_pins-nested-ninja (Failed) 702 - cpm_generate_pins-nested-ninja_multi-config (Failed) 722 - cpm_generate_pins-simple-makefile (Failed) 724 - cpm_generate_pins-simple-ninja (Failed) 726 - cpm_generate_pins-simple-ninja_multi-config (Failed) ``` And they failed in the expected way more informative logs! ```text CMake Error at CMakeLists.txt:51 (message): pinned fmt tag (10.2.1) should differ compared to baseline 10.2.1 pinned_versions.json: { "always_download" : true, "git_shallow" : false, "git_tag" : "${version}", "git_url" : "https://github.com/fmtlib/fmt.git", "version" : "10.2.1" } versions.json: { "git_tag" : "${version}", "git_url" : "https://github.com/fmtlib/fmt.git", "version" : "10.2.1" } ``` ([build link](https://github.com/rapidsai/rapids-cmake/actions/runs/8837613213/job/24267079292?pr=592)) </details> # Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Robert Maynard (https://github.com/robertmaynard) - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: #599
This work is paused, in favor of pursuing a better long-term solution in the future. Closing this PR for now. Subscribe to rapidsai/build-planning#54 and rapidsai/build-planning#56 for updates. |
Description
Contributes to:
fmt
andspdlog
across RAPIDS build-planning#56Makes the following direct changes to
cpm/versions.json
fmt (10.1.1 -> 10.2.1)
, removes patchesspdlog (1.12.0 -> 1.13.0)
, removes patchesWhich led to the following supporting changes:
fmt
that already exists in the build environment)pinned_versions.json
andversions.json
in logs from failed tests, to make debugging fasterNotes for Reviewers
Just opening this to test. Will fill this out more when it's ready for review.
Related:
How I tested this
Pushed a commit with the new test error message content changes but keeping
fmt
in the failing tests, to confirm that the expected tests failed.got the expected outputs (click me)
And they failed in the expected way more informative logs!
(build link)
Opened PRs on a few repos, pointed at this
rapids-cmake
branch using the approach described in therapids-cmake
docs (link).I also modified each of those PRs so that their conda builds and tests consumed CI artifacts from the other PRs. Following this example: rapidsai/cuml#5640.
rmm
(WIP: update fmt (>=10.2.1) and spdlog (>=1.13) rmm#1544)cudf
(WIP: update fmt (>=10.2.1) and spdlog (>=1.13) cudf#15603)devcontainers
build failing, because it couldn't find the conda packages fromrmm
's CIraft
(WIP: update fmt (>=10.2.1) and spdlog (>=1.13) raft#2279)cuml
(WIP: update fmt (>=10.2.1) and spdlog (>=1.13) cuml#5870)Checklist
cmake-format.json
is up to date with these changes.include_guard(GLOBAL)
)