Skip to content

Commit 8b12cf4

Browse files
authored
Update fmt (to 11.0.2) and spdlog (to 1.14.1). (#16806)
## Description Replaces #15603 Contributes to: * rapidsai/build-planning#54 * rapidsai/build-planning#56 * rapidsai/rapids-cmake#387 Now that most of `conda-forge` has been updated to `fmt >=11.0.1,<12` and `spdlog>=1.14.1,<1.15` (rapidsai/build-planning#56 (comment)), we're attempting to upgrade RAPIDS to similar versions of those libraries. This improves the likelihood that RAPIDS will be installable alongside newer versions of its dependencies and complementary packages on conda-forge. ## Notes for Reviewers This PR is testing changes made in rapidsai/rapids-cmake#689. It shouldn't be merged until those `rapids-cmake` changes are merged and any testing-specific details have been removed.
1 parent 389208c commit 8b12cf4

File tree

6 files changed

+15
-24
lines changed

6 files changed

+15
-24
lines changed

conda/environments/all_cuda-118_arch-x86_64.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
- doxygen=1.9.1
3232
- fastavro>=0.22.9
3333
- flatbuffers==24.3.25
34-
- fmt>=10.1.1,<11
34+
- fmt>=11.0.2,<12
3535
- fsspec>=0.6.0
3636
- gcc_linux-64=11.*
3737
- hypothesis
@@ -84,7 +84,7 @@ dependencies:
8484
- s3fs>=2022.3.0
8585
- scikit-build-core>=0.10.0
8686
- scipy
87-
- spdlog>=1.12.0,<1.13
87+
- spdlog>=1.14.1,<1.15
8888
- sphinx
8989
- sphinx-autobuild
9090
- sphinx-copybutton

conda/environments/all_cuda-125_arch-x86_64.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- doxygen=1.9.1
3333
- fastavro>=0.22.9
3434
- flatbuffers==24.3.25
35-
- fmt>=10.1.1,<11
35+
- fmt>=11.0.2,<12
3636
- fsspec>=0.6.0
3737
- gcc_linux-64=11.*
3838
- hypothesis
@@ -82,7 +82,7 @@ dependencies:
8282
- s3fs>=2022.3.0
8383
- scikit-build-core>=0.10.0
8484
- scipy
85-
- spdlog>=1.12.0,<1.13
85+
- spdlog>=1.14.1,<1.15
8686
- sphinx
8787
- sphinx-autobuild
8888
- sphinx-copybutton

conda/recipes/libcudf/conda_build_config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ librdkafka_version:
2626
- ">=2.5.0,<2.6.0a0"
2727

2828
fmt_version:
29-
- ">=10.1.1,<11"
29+
- ">=11.0.2,<12"
3030

3131
flatbuffers_version:
3232
- "=24.3.25"
3333

3434
spdlog_version:
35-
- ">=1.12.0,<1.13"
35+
- ">=1.14.1,<1.15"
3636

3737
nvcomp_version:
3838
- "=4.0.1"

cpp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ add_dependencies(cudf jitify_preprocess_run)
798798
# Specify the target module library dependencies
799799
target_link_libraries(
800800
cudf
801-
PUBLIC CCCL::CCCL rmm::rmm $<BUILD_LOCAL_INTERFACE:BS::thread_pool>
801+
PUBLIC CCCL::CCCL rmm::rmm $<BUILD_LOCAL_INTERFACE:BS::thread_pool> spdlog::spdlog_header_only
802802
PRIVATE $<BUILD_LOCAL_INTERFACE:nvtx3::nvtx3-cpp> cuco::cuco ZLIB::ZLIB nvcomp::nvcomp
803803
kvikio::kvikio $<TARGET_NAME_IF_EXISTS:cuFile_interface> nanoarrow
804804
)

cpp/cmake/thirdparty/get_spdlog.cmake

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =============================================================================
2-
# Copyright (c) 2023, NVIDIA CORPORATION.
2+
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# in compliance with the License. You may obtain a copy of the License at
@@ -16,21 +16,12 @@
1616
function(find_and_configure_spdlog)
1717

1818
include(${rapids-cmake-dir}/cpm/spdlog.cmake)
19-
rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET cudf-exports)
20-
rapids_export_package(BUILD spdlog cudf-exports)
19+
rapids_cpm_spdlog(
20+
FMT_OPTION "EXTERNAL_FMT_HO"
21+
INSTALL_EXPORT_SET cudf-exports
22+
BUILD_EXPORT_SET cudf-exports
23+
)
2124

22-
if(spdlog_ADDED)
23-
rapids_export(
24-
BUILD spdlog
25-
EXPORT_SET spdlog
26-
GLOBAL_TARGETS spdlog spdlog_header_only
27-
NAMESPACE spdlog::
28-
)
29-
include("${rapids-cmake-dir}/export/find_package_root.cmake")
30-
rapids_export_find_package_root(
31-
BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET cudf-exports
32-
)
33-
endif()
3425
endfunction()
3526

3627
find_and_configure_spdlog()

dependencies.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,12 @@ dependencies:
350350
common:
351351
- output_types: conda
352352
packages:
353-
- fmt>=10.1.1,<11
353+
- fmt>=11.0.2,<12
354354
- flatbuffers==24.3.25
355355
- librdkafka>=2.5.0,<2.6.0a0
356356
# Align nvcomp version with rapids-cmake
357357
- nvcomp==4.0.1
358-
- spdlog>=1.12.0,<1.13
358+
- spdlog>=1.14.1,<1.15
359359
rapids_build_skbuild:
360360
common:
361361
- output_types: [conda, requirements, pyproject]

0 commit comments

Comments
 (0)