Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into fea/streams
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice authored Jan 9, 2025
2 parents f80d832 + c1ccdad commit 4ec6b90
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies:
- python>=3.10,<3.13
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.10.0
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies:
- python>=3.10,<3.13
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- scikit-build-core >=0.10.0
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-copybutton
- sphinx-markdown-tables
Expand Down
11 changes: 3 additions & 8 deletions conda/recipes/librmm/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
# Copyright (c) 2018-2025, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
Expand Down Expand Up @@ -26,13 +26,8 @@ requirements:
- {{ stdlib("c") }}
host:
- cuda-version ={{ cuda_version }}
# We need fmt here for now because the conda spdlog package is hard-coded
# to use fmt as a compiled library, not header-only, so we must ensure that
# the library is present for now so that if a downstream library tries to
# build against rmm and some other package in its build environment uses
# fmt (or spdlog) that the default rmm build is consistent with such
# environments.
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}

build:
script_env:
Expand Down Expand Up @@ -77,8 +72,8 @@ outputs:
{% if cuda_major == "11" %}
- cudatoolkit
{% endif %}
# See comment about fmt in the build section above.
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}
test:
commands:
- test -d "${PREFIX}/include/rmm"
Expand Down
1 change: 1 addition & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ dependencies:
- c-compiler
- cxx-compiler
- fmt>=11.0.2,<12
- spdlog>=1.14.1,<1.15
specific:
- output_types: conda
matrices:
Expand Down

0 comments on commit 4ec6b90

Please sign in to comment.