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

Use libkvikio conda packages in libcudf, add explicit libcufile dependency. #13231

Merged
merged 6 commits into from
May 9, 2023
Merged

Use libkvikio conda packages in libcudf, add explicit libcufile dependency. #13231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5205308
Use libkvikio conda packages in libcudf.
bdice Apr 26, 2023
e61f082
Add libkvikio in dependencies.yaml.
bdice Apr 26, 2023
e71b48a
Add explicit libcufile dependency.
bdice Apr 26, 2023
254b0ba
Add kvikio to update-version.sh.
bdice May 1, 2023
74bda55
Merge branch 'branch-23.06' into use-kvikio-conda-package
vuule May 1, 2023
890884a
Merge branch 'branch-23.06' into use-kvikio-conda-package
bdice May 8, 2023
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
5 changes: 3 additions & 2 deletions ci/release/update-version.sh
View file
Open in desktop
Copy link
Contributor Author

@bdice bdice May 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @ajschmidt8 -- you requested some changes on cuspatial and ucxx for recent changes to the update-version.sh script. I started to make those changes here but decided it's too large of a scope for this PR. Also, cudf's update script is significant more complex than ucxx/cuspatial and I didn't want to set the wrong example (since so many packages look to cudf for guidance). If you want this to be updated in the near term, I would appreciate your help!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.

There are a lot of process changes I want to make around these scripts in the future.

Realistically I probably won't start that initiative until 23.08 or even 23.10.

Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/dask_cudf/so

# bump rmm & dask-cuda
for FILE in conda/environments/*.yaml dependencies.yaml; do
sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/cudf==${CURRENT_SHORT_TAG_PEP440}/cudf==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/cudf_kafka==${CURRENT_SHORT_TAG_PEP440}/cudf_kafka==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/dask-cuda==${CURRENT_SHORT_TAG_PEP440}/dask-cuda==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/kvikio==${CURRENT_SHORT_TAG_PEP440}/kvikio==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
sed_runner "s/rmm==${CURRENT_SHORT_TAG_PEP440}/rmm==${NEXT_SHORT_TAG_PEP440}/g" ${FILE};
done

# Doxyfile update
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ dependencies:
- libarrow==11.0.0.*
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- libkvikio==23.6.*
- librdkafka>=1.9.0,<1.10.0a0
- librmm==23.6.*
- mimesis>=4.1.0
Expand Down
10 changes: 10 additions & 0 deletions conda/recipes/libcudf/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ dlpack_version:
librdkafka_version:
- ">=1.9.0,<1.10.0a0"

# The CTK libraries below are missing from the conda-forge::cudatoolkit
# package. The "*_host_*" version specifiers correspond to `11.8` packages and the
# "*_run_*" version specifiers correspond to `11.x` packages.

libcufile_host_version:
- "1.4.0.31"

libcufile_run_version:
- ">=1.0.0.82,<=1.4.0.31"

libcurand_host_version:
- "=10.3.0.86"

Expand Down
6 changes: 6 additions & 0 deletions conda/recipes/libcudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ requirements:
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
- cuda-nvrtc ={{ cuda_version }}
- cuda-nvrtc-dev ={{ cuda_version }}
- cuda-nvtx ={{ cuda_version }}
- libcufile {{ libcufile_host_version }} # [linux64]
- libcufile-dev {{ libcufile_host_version }} # [linux64]
- libcurand {{ libcurand_host_version }}
- libcurand-dev {{ libcurand_host_version }}
- libarrow {{ libarrow_version }}
Expand Down Expand Up @@ -73,7 +76,10 @@ outputs:
run:
- cudatoolkit {{ cuda_spec }}
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
- libarrow {{ libarrow_version }}
- libcufile {{ libcufile_run_version }} # [linux64]
- libcufile-dev {{ libcufile_run_version }} # [linux64]
- dlpack {{ dlpack_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
Expand Down
1 change: 1 addition & 0 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ dependencies:
- output_types: [conda, requirements]
packages:
- librmm==23.6.*
- libkvikio==23.6.*
- output_types: conda
packages:
- fmt>=9.1.0,<10
Expand Down