Skip to content

Commit 932d3b1

Browse files
authored
Update fmt (to 11.0.2) and spdlog (to 1.14.1), add those libraries to libcuml conda host dependencies (#6071)
Contributes to rapidsai/build-planning#56 * updates `fmt` and `spdlog` to newer versions, to match the rest of RAPIDS * adds `fmt` and `spdlog` to `host:` dependencies for `libcuml` conda packages (see #6071 (comment)) 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. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) URL: #6071
1 parent 0400d7a commit 932d3b1

8 files changed

+20
-0
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies:
2020
- dask-cudf==24.10.*,>=0.0.0a0
2121
- dask-ml
2222
- doxygen=1.9.1
23+
- fmt>=11.0.2,<12
2324
- gcc_linux-64=11.*
2425
- graphviz
2526
- hdbscan>=0.8.38,<0.8.39
@@ -69,6 +70,7 @@ dependencies:
6970
- scipy>=1.8.0
7071
- seaborn
7172
- setuptools
73+
- spdlog>=1.14.1,<1.15
7274
- sphinx-copybutton
7375
- sphinx-markdown-tables
7476
- sphinx<6

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

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- dask-cudf==24.10.*,>=0.0.0a0
2323
- dask-ml
2424
- doxygen=1.9.1
25+
- fmt>=11.0.2,<12
2526
- gcc_linux-64=11.*
2627
- graphviz
2728
- hdbscan>=0.8.38,<0.8.39
@@ -65,6 +66,7 @@ dependencies:
6566
- scipy>=1.8.0
6667
- seaborn
6768
- setuptools
69+
- spdlog>=1.14.1,<1.15
6870
- sphinx-copybutton
6971
- sphinx-markdown-tables
7072
- sphinx<6

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- cuda-version=11.8
1515
- cudatoolkit
1616
- cxx-compiler
17+
- fmt>=11.0.2,<12
1718
- gcc_linux-64=11.*
1819
- libcublas-dev=11.11.3.6
1920
- libcublas=11.11.3.6
@@ -31,6 +32,7 @@ dependencies:
3132
- librmm==24.10.*,>=0.0.0a0
3233
- ninja
3334
- nvcc_linux-64=11.8
35+
- spdlog>=1.14.1,<1.15
3436
- sysroot_linux-64==2.17
3537
- tomli
3638
name: clang_tidy_cuda-118_arch-x86_64

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

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
- cuda-version=11.8
1313
- cudatoolkit
1414
- cxx-compiler
15+
- fmt>=11.0.2,<12
1516
- gcc_linux-64=11.*
1617
- libcublas-dev=11.11.3.6
1718
- libcublas=11.11.3.6
@@ -29,5 +30,6 @@ dependencies:
2930
- librmm==24.10.*,>=0.0.0a0
3031
- ninja
3132
- nvcc_linux-64=11.8
33+
- spdlog>=1.14.1,<1.15
3234
- sysroot_linux-64==2.17
3335
name: cpp_all_cuda-118_arch-x86_64

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- cuda-profiler-api
1515
- cuda-version=12.5
1616
- cxx-compiler
17+
- fmt>=11.0.2,<12
1718
- gcc_linux-64=11.*
1819
- libcublas-dev
1920
- libcufft-dev
@@ -25,5 +26,6 @@ dependencies:
2526
- libraft==24.10.*,>=0.0.0a0
2627
- librmm==24.10.*,>=0.0.0a0
2728
- ninja
29+
- spdlog>=1.14.1,<1.15
2830
- sysroot_linux-64==2.17
2931
name: cpp_all_cuda-125_arch-x86_64

conda/recipes/libcuml/conda_build_config.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ c_stdlib_version:
1919
cmake_version:
2020
- ">=3.26.4,!=3.30.0"
2121

22+
fmt_version:
23+
- ">=11.0.2,<12"
24+
25+
spdlog_version:
26+
- ">=1.14.1,<1.15"
27+
2228
treelite_version:
2329
- "=4.3.0"
2430

conda/recipes/libcuml/meta.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ requirements:
6868
- libcusolver-dev
6969
- libcusparse-dev
7070
{% endif %}
71+
- fmt {{ fmt_version }}
7172
- libcumlprims ={{ minor_version }}
7273
- libraft ={{ minor_version }}
7374
- libraft-headers ={{ minor_version }}
7475
- librmm ={{ minor_version }}
76+
- spdlog {{ spdlog_version }}
7577
- treelite {{ treelite_version }}
7678

7779
outputs:

dependencies.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,12 @@ dependencies:
140140
packages:
141141
- c-compiler
142142
- cxx-compiler
143+
- fmt>=11.0.2,<12
143144
- libcumlprims==24.10.*,>=0.0.0a0
144145
- libraft==24.10.*,>=0.0.0a0
145146
- libraft-headers==24.10.*,>=0.0.0a0
146147
- librmm==24.10.*,>=0.0.0a0
148+
- spdlog>=1.14.1,<1.15
147149
specific:
148150
- output_types: conda
149151
matrices:

0 commit comments

Comments
 (0)