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

[REVIEW] Update cuda-python dependency to 11.7.1 #12030

Merged
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f817d96
update changelog
raydouglass Oct 12, 2022
de1597e
Update cuda-python dependency to 11.7.1
shwina Oct 25, 2022
7a7df07
Update channel order.
bdice Oct 25, 2022
0be098c
Reorder channels.
bdice Oct 25, 2022
2209efe
Update README.md
shwina Oct 27, 2022
83a7a44
Update README.md
shwina Oct 27, 2022
b5c1a27
Update meta.yaml
galipremsagar Oct 27, 2022
8cfbdac
Update meta.yaml
galipremsagar Oct 27, 2022
efd0439
Update meta.yaml
galipremsagar Oct 27, 2022
da16d4b
Update meta.yaml
galipremsagar Oct 27, 2022
1e99b43
Update conda/recipes/libcudf/meta.yaml
galipremsagar Oct 27, 2022
028cb00
Update conda/recipes/libcudf/meta.yaml
galipremsagar Oct 27, 2022
586c30f
Update build.sh
galipremsagar Oct 27, 2022
3e2b05a
Update ci/cpu/build.sh
galipremsagar Oct 27, 2022
0e5c8f6
Update meta.yaml
galipremsagar Oct 28, 2022
73cb2bf
Update meta.yaml
galipremsagar Oct 28, 2022
6e526fc
DEBUG: Remove rapidsai channel
jjacobelli Oct 28, 2022
64ba373
DEBUG: Fix sed command..
jjacobelli Oct 28, 2022
3fdb3ac
merge
galipremsagar Oct 31, 2022
442ecba
Apply suggestions from code review
galipremsagar Oct 31, 2022
d80c2b4
Update ci/cpu/build.sh
galipremsagar Oct 31, 2022
e7640af
Merge remote-tracking branch 'upstream/branch-22.12' into 22.12_cuda-…
galipremsagar Oct 31, 2022
df2d2bb
revert changelog merge
galipremsagar Oct 31, 2022
6d91b85
Merge branch '22.12_cuda-python_11.7.1' of https://github.com/galipre…
galipremsagar Oct 31, 2022
b8105cb
cleanup
galipremsagar Oct 31, 2022
b4083f4
Update CHANGELOG.md
galipremsagar Oct 31, 2022
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
263 changes: 262 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

29 changes: 9 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,21 @@ Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapids

cuDF can be installed with conda ([miniconda](https://conda.io/miniconda.html), or the full [Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:

For `cudf version == 22.06` :
```bash
# for CUDA 11.0
conda install -c rapidsai -c nvidia -c numba -c conda-forge \
cudf=22.06 python=3.9 cudatoolkit=11.0

# or, for CUDA 11.2
conda install -c rapidsai -c nvidia -c numba -c conda-forge \
cudf=22.06 python=3.9 cudatoolkit=11.2

# for CUDA 11.5
conda install -c rapidsai -c conda-forge -c nvidia \
cudf=22.10 python=3.9 cudatoolkit=11.5
# for CUDA 11.2
conda install -c rapidsai -c conda-forge -c nvidia \
cudf=22.10 python=3.9 cudatoolkit=11.2
```

For the nightly version of `cudf` :
```bash
# for CUDA 11.0
conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
cudf python=3.9 cudatoolkit=11.0

# or, for CUDA 11.2
conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
cudf python=3.9 cudatoolkit=11.2
```
We also provide [nightly Conda packages](https://anaconda.org/rapidsai-nightly) built from the HEAD
of our latest development branch.

Note: cuDF is supported only on Linux, and with Python versions 3.8 and later.

See the [Get RAPIDS version picker](https://rapids.ai/start.html) for more OS and version info.
See the [Get RAPIDS version picker](https://rapids.ai/start.html) for more OS and version info.

## Build/Install from Source
See build [instructions](CONTRIBUTING.md#setting-up-your-build-environment).
Expand Down
5 changes: 5 additions & 0 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ gpuci_logger "Activate conda env"
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids

gpuci_mamba_retry install rapidsai-nightly::rmm==22.10.00a221026 rapidsai-nightly::librmm==22.10.00a221026

galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
# Remove `rapidsai-nightly` & `dask/label/dev` channel if we are building main branch
if [ "$SOURCE_BRANCH" = "main" ]; then
conda config --system --remove channels rapidsai-nightly
Expand Down Expand Up @@ -84,6 +86,9 @@ else
CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/.conda-bld/"
fi

# TODO: remove
#sed -i '/rapidsai$/d' /opt/conda/.condarc

if [ "$BUILD_LIBCUDF" == '1' ]; then
gpuci_logger "Build conda pkg for libcudf"
gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcudf $CONDA_BUILD_ARGS
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
name: cudf_dev
channels:
- rapidsai
- nvidia
- rapidsai-nightly
- dask/label/dev
- conda-forge
- nvidia
dependencies:
- c-compiler
- cxx-compiler
Expand Down Expand Up @@ -38,7 +38,7 @@ dependencies:
- ipython
- pandoc<=2.0.0
- cudatoolkit=11.5
- cuda-python>=11.5,<11.7.1
- cuda-python>=11.7.1,<12.0
- pip
- doxygen=1.8.20
- typing_extensions
Expand Down
4 changes: 3 additions & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ requirements:
- numba >=0.56.2
- dlpack>=0.5,<0.6.0a0
- pyarrow =9
- protobuf>=3.20.1,<3.21.0a0
- libcudf ={{ version }}
- rmm ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
Expand All @@ -53,6 +54,7 @@ requirements:
- numba >=0.56.2
- numpy
- {{ pin_compatible('pyarrow', max_pin='x.x.x') }}
- protobuf>=3.20.1,<3.21.0a0
- libcudf {{ version }}
- fastavro >=0.22.0
- {{ pin_compatible('rmm', max_pin='x.x') }}
Expand All @@ -62,7 +64,7 @@ requirements:
- packaging
- cachetools
- cubinlinker # [linux64] # CUDA enhanced compatibility.
- cuda-python >=11.5,<11.7.1
- cuda-python >=11.7.1,<12.0
test: # [linux64]
requires: # [linux64]
- cudatoolkit {{ cuda_version }}.* # [linux64]
Expand Down
3 changes: 3 additions & 0 deletions conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ requirements:
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} {{ cuda_version }}
- sysroot_{{ target_platform }} {{ sysroot_version }}
- libprotobuf>=3.20.1,<3.21.0a0
host:
- librmm {{ minor_version }}.*
- cudatoolkit {{ cuda_version }}.*
- arrow-cpp {{ arrow_cpp_version }}
- libprotobuf>=3.20.1,<3.21.0a0
- dlpack {{ dlpack_version }}
- librdkafka {{ librdkafka_version }}

Expand All @@ -57,6 +59,7 @@ outputs:
- cudatoolkit {{ cuda_spec }}
- librmm {{ minor_version }}.*
- arrow-cpp {{ arrow_cpp_version }}
- libprotobuf>=3.20.1,<3.21.0a0
- dlpack {{ dlpack_version }}
test:
commands:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/strings_udf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ requirements:
- numba >=0.54
- libcudf ={{ version }}
- cudf ={{ version }}
- cudatoolkit ={{ cuda_version }}
- cudatoolkit {{ cuda_version }}.*
run:
- python
- typing_extensions
Expand Down