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

Update fmt (to 11.0.2) and spdlog (to 1.14.1). #2433

Merged
merged 24 commits into from
Sep 23, 2024
Merged

Update fmt (to 11.0.2) and spdlog (to 1.14.1). #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
867452b
Update fmt (to 11.0.2) and spdlog (to 1.14.1).
jameslamb Sep 16, 2024
2a6aeea
use rmm and ucxx CI artifacts
jameslamb Sep 16, 2024
b7c151e
try using librmm wheels
jameslamb Sep 16, 2024
f1b0793
try again to use rmm wheels
jameslamb Sep 17, 2024
d4ef11a
rapids-get-pr-wheel-artifact was missing RAPIDS_PY_WHEEL_NAME
jameslamb Sep 17, 2024
06fcda5
ok you do not need to provide the Python slug yourself for rapids-get…
jameslamb Sep 17, 2024
3b83970
constraints need 'file://' protocol
jameslamb Sep 17, 2024
3ba2201
try suppressing unreachable-code diagnostics from nvcc (this should b…
jameslamb Sep 17, 2024
31520f5
fix checks
jameslamb Sep 17, 2024
366f4c8
Revert "try suppressing unreachable-code diagnostics from nvcc (this …
jameslamb Sep 17, 2024
124ce29
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 18, 2024
9ef2133
copyright
jameslamb Sep 18, 2024
1a9b308
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
7869cce
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
81cf3b3
move rapids-cmake overrides [skip ci]
jameslamb Sep 18, 2024
1a89935
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 19, 2024
8f918bd
kick off a build
jameslamb Sep 19, 2024
b43c6a8
Merge branch 'fmt-and-spdlog' of github.com:jameslamb/raft into fmt-a…
jameslamb Sep 19, 2024
4dd6040
fix dependency graph
jameslamb Sep 19, 2024
67334b7
devcontainer
jameslamb Sep 19, 2024
925840e
run all CI
jameslamb Sep 20, 2024
b7ff8b3
Merge branch 'branch-24.10' of github.com:rapidsai/raft into fmt-and-…
jameslamb Sep 20, 2024
90c4496
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 23, 2024
f2d8a88
remove testing-only changes [skip ci]
jameslamb Sep 23, 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
4 changes: 2 additions & 2 deletions conda/recipes/libraft/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ cuda11_cuda_profiler_api_run_version:
- ">=11.4.240,<12"

spdlog_version:
- ">=1.12.0,<1.13"
- ">=1.14.1,<1.15"

fmt_version:
- ">=10.1.1,<11"
- ">=11.0.2,<12"
4 changes: 2 additions & 2 deletions conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nlohmann_json_version:
- ">=3.11.2"

spdlog_version:
- ">=1.12.0,<1.13"
- ">=1.14.1,<1.15"

fmt_version:
- ">=10.1.1,<11"
- ">=11.0.2,<12"
11 changes: 1 addition & 10 deletions cpp/cmake/thirdparty/get_spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2021-2023, NVIDIA CORPORATION.
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -19,15 +19,6 @@ function(find_and_configure_spdlog)
rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports)
rapids_export_package(BUILD spdlog rmm-exports)

if(spdlog_ADDED)
rapids_export(
BUILD spdlog
EXPORT_SET spdlog
GLOBAL_TARGETS spdlog spdlog_header_only
NAMESPACE spdlog::)
include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET rmm-exports)
endif()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

context for this change: rapidsai/rapids-cmake#387 (comment)

endfunction()

find_and_configure_spdlog()
Loading