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.

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). #1678

Merged
merged 20 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
19 changes: 5 additions & 14 deletions cmake/thirdparty/get_spdlog.cmake
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,10 @@
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)

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)

rapids_cpm_spdlog(
FMT_OPTION "EXTERNAL_FMT_HO"
INSTALL_EXPORT_SET rmm-exports
BUILD_EXPORT_SET rmm-exports)
endfunction()

find_and_configure_spdlog()
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
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,<15
bdice marked this conversation as resolved.
Show resolved Hide resolved
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
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,<15
bdice marked this conversation as resolved.
Show resolved Hide resolved
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/librmm/conda_build_config.yaml
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,<15"
jameslamb marked this conversation as resolved.
Show resolved Hide resolved

c_stdlib:
- sysroot
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
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,<15
jameslamb marked this conversation as resolved.
Show resolved Hide resolved
specific:
- output_types: conda
matrices:
Expand Down
2 changes: 2 additions & 0 deletions rapids_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ else()
endif()

if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake")
set(rapids-cmake-repo jameslamb/rapids-cmake)
set(rapids-cmake-branch fmt-and-spdlog)
file(
DOWNLOAD
"https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake"
Expand Down
Loading