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

Merged
merged 21 commits into from
Sep 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1a3e4b7
Update fmt (to 11.0.2) and spdlog (to 1.14.1).
jameslamb Sep 16, 2024
6bc98d2
use RMM CI artifacts
jameslamb Sep 16, 2024
d3b87bc
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 17, 2024
c9980ab
test if spdlog export is still needed
jameslamb Sep 18, 2024
b294193
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 18, 2024
13fd917
move rapids-cmake overrides [skip ci]
jameslamb Sep 18, 2024
3a3e24a
stop exporting spdlog
jameslamb Sep 18, 2024
8d1bac6
test some builds in CI
jameslamb Sep 18, 2024
2235405
workflow branch
jameslamb Sep 18, 2024
b5ab6e5
merge branch-24.10, only run builds
jameslamb Sep 18, 2024
0a71521
comment out static-configure
jameslamb Sep 18, 2024
a1fce83
run all CI
jameslamb Sep 20, 2024
f962642
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 20, 2024
9ba1063
cmakelint
jameslamb Sep 20, 2024
058b0d3
export spdlog and mark it as an INTERFACE dependency of cudf::cudf
jameslamb Sep 20, 2024
b9cdb5d
Merge branch 'branch-24.10' of github.com:rapidsai/cudf into fmt-and-…
jameslamb Sep 20, 2024
ab6d345
make spdlog::spdlog_header_only a PUBLIC dependency of cudf::cudf
jameslamb Sep 20, 2024
9568b98
Merge branch 'branch-24.10' into fmt-and-spdlog
jameslamb Sep 23, 2024
630ce51
remove testing-only changes [skip ci]
jameslamb Sep 23, 2024
c9a3395
Merge branch 'branch-24.10' of github.com:rapidsai/cudf into fmt-and-…
jameslamb Sep 23, 2024
1da86f7
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/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 @@ -31,7 +31,7 @@ dependencies:
- doxygen=1.9.1
- fastavro>=0.22.9
- flatbuffers==24.3.25
- fmt>=10.1.1,<11
- fmt>=11.0.2,<12
- fsspec>=0.6.0
- gcc_linux-64=11.*
- hypothesis
Expand Down Expand Up @@ -84,7 +84,7 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build-core>=0.10.0
- scipy
- spdlog>=1.12.0,<1.13
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-autobuild
- sphinx-copybutton
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 @@ -32,7 +32,7 @@ dependencies:
- doxygen=1.9.1
- fastavro>=0.22.9
- flatbuffers==24.3.25
- fmt>=10.1.1,<11
- fmt>=11.0.2,<12
- fsspec>=0.6.0
- gcc_linux-64=11.*
- hypothesis
Expand Down Expand Up @@ -82,7 +82,7 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build-core>=0.10.0
- scipy
- spdlog>=1.12.0,<1.13
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-autobuild
- sphinx-copybutton
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcudf/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ librdkafka_version:
- ">=2.5.0,<2.6.0a0"

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

flatbuffers_version:
- "=24.3.25"

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

nvcomp_version:
- "=4.0.1"
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ add_dependencies(cudf jitify_preprocess_run)
# Specify the target module library dependencies
target_link_libraries(
cudf
PUBLIC CCCL::CCCL rmm::rmm $<BUILD_LOCAL_INTERFACE:BS::thread_pool>
PUBLIC CCCL::CCCL rmm::rmm $<BUILD_LOCAL_INTERFACE:BS::thread_pool> spdlog::spdlog_header_only
PRIVATE $<BUILD_LOCAL_INTERFACE:nvtx3::nvtx3-cpp> cuco::cuco ZLIB::ZLIB nvcomp::nvcomp
kvikio::kvikio $<TARGET_NAME_IF_EXISTS:cuFile_interface> nanoarrow
)
Expand Down
21 changes: 6 additions & 15 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) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-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,21 +16,12 @@
function(find_and_configure_spdlog)

include(${rapids-cmake-dir}/cpm/spdlog.cmake)
rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET cudf-exports)
rapids_export_package(BUILD spdlog cudf-exports)
rapids_cpm_spdlog(
FMT_OPTION "EXTERNAL_FMT_HO"
INSTALL_EXPORT_SET cudf-exports
BUILD_EXPORT_SET cudf-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 cudf-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()
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 @@ -350,12 +350,12 @@ dependencies:
common:
- output_types: conda
packages:
- fmt>=10.1.1,<11
- fmt>=11.0.2,<12
- flatbuffers==24.3.25
- librdkafka>=2.5.0,<2.6.0a0
# Align nvcomp version with rapids-cmake
- nvcomp==4.0.1
- spdlog>=1.12.0,<1.13
- spdlog>=1.14.1,<1.15
rapids_build_skbuild:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
Loading