Skip to content

Commit

Permalink
Update fmt (to 11.0.2) and spdlog (to 1.14.1), add those libraries to…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
jameslamb authored Sep 24, 2024
1 parent 0400d7a commit 932d3b1
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies:
- dask-cudf==24.10.*,>=0.0.0a0
- dask-ml
- doxygen=1.9.1
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- graphviz
- hdbscan>=0.8.38,<0.8.39
Expand Down Expand Up @@ -69,6 +70,7 @@ dependencies:
- scipy>=1.8.0
- seaborn
- setuptools
- spdlog>=1.14.1,<1.15
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx<6
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- dask-cudf==24.10.*,>=0.0.0a0
- dask-ml
- doxygen=1.9.1
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- graphviz
- hdbscan>=0.8.38,<0.8.39
Expand Down Expand Up @@ -65,6 +66,7 @@ dependencies:
- scipy>=1.8.0
- seaborn
- setuptools
- spdlog>=1.14.1,<1.15
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx<6
Expand Down
2 changes: 2 additions & 0 deletions conda/environments/clang_tidy_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- cuda-version=11.8
- cudatoolkit
- cxx-compiler
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- libcublas-dev=11.11.3.6
- libcublas=11.11.3.6
Expand All @@ -31,6 +32,7 @@ dependencies:
- librmm==24.10.*,>=0.0.0a0
- ninja
- nvcc_linux-64=11.8
- spdlog>=1.14.1,<1.15
- sysroot_linux-64==2.17
- tomli
name: clang_tidy_cuda-118_arch-x86_64
2 changes: 2 additions & 0 deletions conda/environments/cpp_all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- cuda-version=11.8
- cudatoolkit
- cxx-compiler
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- libcublas-dev=11.11.3.6
- libcublas=11.11.3.6
Expand All @@ -29,5 +30,6 @@ dependencies:
- librmm==24.10.*,>=0.0.0a0
- ninja
- nvcc_linux-64=11.8
- spdlog>=1.14.1,<1.15
- sysroot_linux-64==2.17
name: cpp_all_cuda-118_arch-x86_64
2 changes: 2 additions & 0 deletions conda/environments/cpp_all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- cuda-profiler-api
- cuda-version=12.5
- cxx-compiler
- fmt>=11.0.2,<12
- gcc_linux-64=11.*
- libcublas-dev
- libcufft-dev
Expand All @@ -25,5 +26,6 @@ dependencies:
- libraft==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- ninja
- spdlog>=1.14.1,<1.15
- sysroot_linux-64==2.17
name: cpp_all_cuda-125_arch-x86_64
6 changes: 6 additions & 0 deletions conda/recipes/libcuml/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ c_stdlib_version:
cmake_version:
- ">=3.26.4,!=3.30.0"

fmt_version:
- ">=11.0.2,<12"

spdlog_version:
- ">=1.14.1,<1.15"

treelite_version:
- "=4.3.0"

Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/libcuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ requirements:
- libcusolver-dev
- libcusparse-dev
{% endif %}
- fmt {{ fmt_version }}
- libcumlprims ={{ minor_version }}
- libraft ={{ minor_version }}
- libraft-headers ={{ minor_version }}
- librmm ={{ minor_version }}
- spdlog {{ spdlog_version }}
- treelite {{ treelite_version }}

outputs:
Expand Down
2 changes: 2 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,12 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- fmt>=11.0.2,<12
- libcumlprims==24.10.*,>=0.0.0a0
- libraft==24.10.*,>=0.0.0a0
- libraft-headers==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- spdlog>=1.14.1,<1.15
specific:
- output_types: conda
matrices:
Expand Down

0 comments on commit 932d3b1

Please sign in to comment.