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

Branch 23.06 merge 23.04 #13131

Merged
merged 2 commits into from
Apr 12, 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
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 @@ -36,6 +36,8 @@ dependencies:
- hypothesis
- ipython
- libarrow==11.0.0.*
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- librdkafka>=1.9.0,<1.10.0a0
- librmm==23.6.*
- mimesis>=4.1.0
Expand Down
6 changes: 6 additions & 0 deletions conda/recipes/libcudf/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ dlpack_version:
librdkafka_version:
- ">=1.9.0,<1.10.0a0"

libcurand_host_version:
- "=10.3.0.86"

libcurand_run_version:
- ">=10.2.5.43,<10.3.1"

fmt_version:
- ">=9.1.0,<10"

Expand Down
4 changes: 3 additions & 1 deletion conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ requirements:
- cuda-nvrtc ={{ cuda_version }}
- cuda-nvrtc-dev ={{ cuda_version }}
- cuda-nvtx ={{ cuda_version }}
- libcurand-dev
- libcurand {{ libcurand_host_version }}
- libcurand-dev {{ libcurand_host_version }}
- libarrow {{ libarrow_version }}
- dlpack {{ dlpack_version }}
- librdkafka {{ librdkafka_version }}
Expand Down Expand Up @@ -386,6 +387,7 @@ outputs:
- {{ pin_subpackage('libcudf', exact=True) }}
- {{ pin_subpackage('libcudf_kafka', exact=True) }}
- cudatoolkit {{ cuda_spec }}
- libcurand {{ libcurand_run_version }}
about:
home: https://rapids.ai/
license: Apache-2.0
Expand Down
29 changes: 21 additions & 8 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,21 +263,34 @@ dependencies:
- output_types: conda
matrices:
- matrix:
cuda: "11.2"
packages:
- cudatoolkit=11.2
- matrix:
cuda: "11.4"
cuda: "11.8"
packages:
- cudatoolkit=11.4
- cudatoolkit=11.8
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- matrix:
cuda: "11.5"
packages:
- cudatoolkit=11.5
# Can't hard pin the version since 11.x is missing many
# packages for specific versions
- libcurand-dev>=10.2.6.48,<=10.2.7.107
- libcurand>=10.2.6.48,<=10.2.7.107
- matrix:
cuda: "11.8"
cuda: "11.4"
packages:
- cudatoolkit=11.8
- cudatoolkit=11.4
- &libcurand_dev114 libcurand-dev>=10.2.5.43,<=10.2.5.120
- &libcurand114 libcurand>=10.2.5.43,<=10.2.5.120
- matrix:
cuda: "11.2"
packages:
- cudatoolkit=11.2
# The NVIDIA channel doesn't publish pkgs older than 11.4 for
# these libs, so 11.2 uses 11.4 packages (the oldest
# available).
- *libcurand_dev114
- *libcurand114
develop:
common:
- output_types: [conda, requirements]
Expand Down