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.

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

Add spdlog back as a requirement for now #1780

Merged
merged 2 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading