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

Use cuda-version to constrain cudatoolkit. #1296

Merged
merged 1 commit into from
Jun 26, 2023
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
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,7 @@ RMM can be installed with Conda ([miniconda](https://conda.io/miniconda.html), o
[Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:

```bash
# for CUDA 11.5
conda install -c rapidsai -c conda-forge -c nvidia \
rmm cudatoolkit=11.5
# for CUDA 11.2
conda install -c rapidsai -c conda-forge -c nvidia \
rmm cudatoolkit=11.2
conda install -c rapidsai -c conda-forge -c nvidia rmm cuda-version=11.8
```

We also provide [nightly Conda packages](https://anaconda.org/rapidsai-nightly) built from the HEAD
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ channels:
dependencies:
- cmake>=3.26.4
- cuda-python>=11.7.1,<12.0a0
- cudatoolkit=11.8
- cuda-version=11.8
- cudatoolkit
- cython>=0.29,<0.30
- fmt>=9.1.0,<10
- gcovr>=5.0
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/librmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ outputs:
- cmake {{ cmake_version }}
run:
{% if cuda_major == "11" %}
- cudatoolkit {{ cuda_spec }}
- cudatoolkit
{% endif %}
- cuda-version {{ cuda_spec }}
- fmt {{ fmt_version }}
Expand Down Expand Up @@ -132,13 +132,13 @@ outputs:
host:
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cudatoolkit ={{ cuda_version }}
- cudatoolkit
{% else %}
- cuda-cudart-dev
{% endif %}
run:
{% if cuda_major == "11" %}
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- cudatoolkit
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- {{ pin_subpackage('librmm', exact=True) }}
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/rmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ requirements:
host:
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- cudatoolkit ={{ cuda_version }}
- cudatoolkit
- cuda-python ==11.7.1
{% else %}
- cuda-cudart-dev
Expand All @@ -66,7 +66,7 @@ requirements:
- tomli # [py<311]
run:
{% if cuda_major == "11" %}
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- cudatoolkit
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- numba >=0.57
Expand Down
15 changes: 10 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,23 +114,28 @@ dependencies:
- matrix:
cuda: "11.2"
packages:
- cudatoolkit=11.2
- cuda-version=11.2
- cudatoolkit
- matrix:
cuda: "11.4"
packages:
- cudatoolkit=11.4
- cuda-version=11.4
- cudatoolkit
- matrix:
cuda: "11.5"
packages:
- cudatoolkit=11.5
- cuda-version=11.5
- cudatoolkit
- matrix:
cuda: "11.6"
packages:
- cudatoolkit=11.6
- cuda-version=11.6
- cudatoolkit
- matrix:
cuda: "11.8"
packages:
- cudatoolkit=11.8
- cuda-version=11.8
- cudatoolkit
- matrix:
cuda: "12.0"
packages:
Expand Down