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.

Sign up for GitHub

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

Support CUDA 12.2 #14712

Merged
merged 29 commits into from
Feb 10, 2024
Merged

Support CUDA 12.2 #14712

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f77cfd0
use CUDA 12.2 for building and testing wheels
jameslamb Jan 5, 2024
7840481
empty commit to re-trigger CI
jameslamb Jan 5, 2024
13a5375
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
43693e8
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
819c043
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 8, 2024
881fb7e
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 11, 2024
6fe4742
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 11, 2024
9407755
add conda, update dependencies.yaml
jameslamb Jan 11, 2024
d4bd19e
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cudf into test-…
jameslamb Jan 11, 2024
27f5b66
Merge branch 'branch-24.02' into test-cuda-12.2
jameslamb Jan 12, 2024
e079803
Merge remote-tracking branch 'upstream/branch-24.02' into test-cuda-12.2
bdice Jan 16, 2024
ee88e9e
Merge branch 'branch-24.02' into test-cuda-12.2
bdice Jan 17, 2024
a470d54
Use libcufile-dev on CUDA 12.2+ for aarch64.
bdice Jan 17, 2024
20ab985
Merge branch 'test-cuda-12.2' of github.com:jameslamb/cudf into test-…
bdice Jan 17, 2024
302efe0
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 22, 2024
6775b50
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 23, 2024
bb0e262
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 23, 2024
d3d9cb0
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 24, 2024
a802dcf
Merge branch 'branch-24.04' into test-cuda-12.2
jameslamb Jan 25, 2024
30b44aa
Ignore run-exports from CUDA 12 compiler.
bdice Feb 6, 2024
9b289e4
Refactor cuda_spec.
bdice Feb 6, 2024
7e4bde7
Loosen run-exports from -dev libraries.
bdice Feb 6, 2024
e044e30
Merge remote-tracking branch 'upstream/branch-24.04' into test-cuda-12.2
bdice Feb 6, 2024
8090e50
Add back cuda-cudart-dev.
bdice Feb 7, 2024
0a0bcd0
Merge branch 'branch-24.04' into test-cuda-12.2
bdice Feb 9, 2024
8ef962b
Merge branch 'branch-24.04' into test-cuda-12.2
jakirkham Feb 9, 2024
0ce5101
Remove libcufile on aarch64.
bdice Feb 9, 2024
3f42dc2
Use 12.2.2 for publishing dask-cudf wheels.
bdice Feb 9, 2024
22edbcf
Use 12.2.2 instead of 12.0.1 for single-CUDA-version jobs in pr.yaml …
bdice Feb 9, 2024
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
6 changes: 5 additions & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- libcufile-dev # [linux64]
bdice marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}

requirements:
Expand Down Expand Up @@ -67,7 +70,6 @@ requirements:
{% if cuda_major == "11" %}
- cudatoolkit
{% else %}
- cuda-cudart-dev
- cuda-nvrtc
- libcufile-dev # [linux64]
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
Expand All @@ -92,6 +94,8 @@ requirements:
- cubinlinker # CUDA enhanced compatibility.
- cuda-python >=11.7.1,<12.0a0
{% else %}
- cuda-cudart
- libcufile # [linux64]
bdice marked this conversation as resolved.
Show resolved Hide resolved
# Needed by Numba for CUDA support
- cuda-nvcc-impl
# TODO: Add nvjitlink here
Expand Down
10 changes: 6 additions & 4 deletions conda/recipes/cudf_kafka/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
# Copyright (c) 2020-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
Expand Down Expand Up @@ -36,6 +36,8 @@ build:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}

requirements:
Expand All @@ -59,14 +61,14 @@ requirements:
- libcudf_kafka ={{ version }}
- scikit-build-core >=0.7.0
- setuptools
{% if cuda_major == "12" %}
- cuda-cudart-dev
{% endif %}
run:
- python
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- libcudf_kafka ={{ version }}
- cudf ={{ version }}
{% if cuda_major != "11" %}
- cuda-cudart
{% endif %}

test:
requires:
Expand Down
26 changes: 21 additions & 5 deletions conda/recipes/libcudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Copyright (c) 2018-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
{% set cuda_major = cuda_version.split('.')[0] %}
{% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0
{% set date_string = environ['RAPIDS_DATE_STRING'] %}

package:
Expand Down Expand Up @@ -87,21 +86,24 @@ outputs:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
requirements:
build:
- cmake {{ cmake_version }}
host:
- cuda-version ={{ cuda_version }}
- libarrow {{ libarrow_version }}
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
- libcufile {{ cuda11_libcufile_run_version }} # [linux64]
{% else %}
- cuda-nvrtc
- libcufile # [linux64]
{% endif %}
- cuda-version {{ cuda_spec }}
- nvcomp {{ nvcomp_version }}
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
Expand All @@ -127,6 +129,8 @@ outputs:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
{% endif %}
requirements:
build:
Expand Down Expand Up @@ -155,6 +159,9 @@ outputs:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- cuda-nvtx-dev
{% endif %}
requirements:
build:
Expand All @@ -179,6 +186,10 @@ outputs:
- cuda-version ={{ cuda_version }}
run:
- {{ pin_subpackage('libcudf', exact=True) }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major != "11" %}
- cuda-nvtx
{% endif %}
about:
home: https://rapids.ai/
license: Apache-2.0
Expand All @@ -194,14 +205,17 @@ outputs:
ignore_run_exports_from:
{% if cuda_major == "11" %}
- {{ compiler('cuda11') }}
{% else %}
- {{ compiler('cuda') }}
- libcurand-dev
{% endif %}
requirements:
build:
- cmake {{ cmake_version }}
host:
- {{ pin_subpackage('libcudf', exact=True) }}
- {{ pin_subpackage('libcudf_kafka', exact=True) }}
- cuda-version {{ cuda_spec }}
- cuda-version ={{ cuda_version }}
{% if cuda_major == "11" %}
- libcurand {{ cuda11_libcurand_run_version }}
{% else %}
Expand All @@ -211,11 +225,13 @@ outputs:
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- {{ pin_subpackage('libcudf', exact=True) }}
- {{ pin_subpackage('libcudf_kafka', exact=True) }}
- cuda-version {{ cuda_spec }}
{% if cuda_major == "11" %}
- libcurand {{ cuda11_libcurand_run_version }}
{% else %}
- libcurand
{% endif %}
- benchmark {{ gbench_version }}
- gtest {{ gtest_version }}
Expand Down
Loading