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

Jump to bottom

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

Merged
merged 20 commits into from
Sep 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f067b45
Update fmt (to 11.0.2) and spdlog (to 1.14.1).
jameslamb Sep 11, 2024
d7cafc1
simplify get_spdlog
jameslamb Sep 11, 2024
f028364
copyright
jameslamb Sep 11, 2024
b159ad9
Apply suggestions from code review
jameslamb Sep 11, 2024
4127d9c
Apply suggestions from code review
bdice Sep 11, 2024
73530d5
test with changes from https://github.com/rapidsai/rapids-cmake/pull/…
jameslamb Sep 17, 2024
14ba307
Update cmake/thirdparty/get_spdlog.cmake
jameslamb Sep 18, 2024
6e53d22
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
15956bf
move rapids-cmake overrides [skip ci]
jameslamb Sep 18, 2024
e216a55
try reverting get_spdlog export changes [skip ci]
jameslamb Sep 18, 2024
3d62108
more fiddling with export sets [skip ci]
jameslamb Sep 18, 2024
12eaa62
more exporting [skip ci]
jameslamb Sep 18, 2024
c4d94e4
more export set fiddling [skip ci]
jameslamb Sep 18, 2024
4feacb7
more [skip ci]
jameslamb Sep 18, 2024
6e52f7e
exports [skip ci]
jameslamb Sep 18, 2024
7f4662c
Merge branch 'branch-24.10' of github.com:rapidsai/rmm into fmt-and-s…
jameslamb Sep 18, 2024
1ec9789
run a build
jameslamb Sep 18, 2024
f8fd212
restore tests
jameslamb Sep 19, 2024
a175083
branch references
jameslamb Sep 19, 2024
4135b68
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
18 changes: 5 additions & 13 deletions 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 @@ -16,19 +16,11 @@
function(find_and_configure_spdlog)

include(${rapids-cmake-dir}/cpm/spdlog.cmake)
rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports)
rapids_export_package(BUILD spdlog rmm-exports)
rapids_cpm_spdlog(
FMT_OPTION "EXTERNAL_FMT_HO"
INSTALL_EXPORT_SET rmm-exports
BUILD_EXPORT_SET 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 these get_spdlog.cmake changes: rapidsai/rapids-cmake#387 (comment)

endfunction()

find_and_configure_spdlog()
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=10.1.1,<11
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -35,7 +35,7 @@ dependencies:
- python>=3.10,<3.13
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.10.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=10.1.1,<11
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -34,7 +34,7 @@ dependencies:
- python>=3.10,<3.13
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.10.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/librmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ cmake_version:
- ">=3.26.4,!=3.30.0"

fmt_version:
- ">=10.1.1,<11"
- ">=11.0.2,<12"

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

c_stdlib:
- sysroot
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- fmt>=10.1.1,<11
- spdlog>=1.12.0,<1.13
- fmt>=11.0.2,<12
- spdlog>=1.14.1,<1.15
specific:
- output_types: conda
matrices:
Expand Down
2 changes: 2 additions & 0 deletions rapids_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ else()
"Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}")
endif()

set(rapids-cmake-repo jameslamb/rapids-cmake)
set(rapids-cmake-branch fmt-and-spdlog)
jameslamb marked this conversation as resolved.
Show resolved Hide resolved
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake")
file(
DOWNLOAD
Expand Down
Loading