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

WIP: update fmt (>=10.2.1) and spdlog (>=1.13) #1544

Closed
wants to merge 2 commits into from
Closed

WIP: update fmt (>=10.2.1) and spdlog (>=1.13) #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b9abd
update fmt (>=10.2.1) and spdlog (>=1.13)
jameslamb Apr 25, 2024
5ccffa1
empty commit to re-trigger CI
jameslamb Apr 25, 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
17 changes: 4 additions & 13 deletions cmake/thirdparty/get_spdlog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
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
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>=10.2.1,<11
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -34,7 +34,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- doxygen=1.9.1
- fmt>=10.1.1,<11
- fmt>=10.2.1,<11
- gcc_linux-64=11.*
- gcovr>=5.0
- graphviz
Expand All @@ -32,7 +32,7 @@ dependencies:
- pytest-cov
- python>=3.9,<3.12
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- 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"

fmt_version:
- ">=10.1.1,<11"
- ">=10.2.1,<11"

spdlog_version:
- ">=1.12.0,<1.13"
- ">=1.13.0,<1.14"

sysroot_version:
- "2.17"
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 @@ -75,9 +75,9 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- fmt>=10.1.1,<11
- fmt>=10.2.1,<11
- scikit-build-core>=0.7.0
- spdlog>=1.12.0,<1.13
- spdlog>=1.13.0,<1.14
- output_types: [requirements, pyproject]
packages:
- scikit-build-core[pyproject]>=0.7.0
Expand Down
5 changes: 5 additions & 0 deletions rapids_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ else()
endif()

if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake")
include(FetchContent)
FetchContent_Declare(
rapids-cmake
GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git
GIT_TAG fmt-version)
file(
DOWNLOAD
"https://github.com/raw/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake"
Expand Down
Loading