Skip to content

Commit

Permalink
consolidate cuda_suffixed=false blocks in dependencies.yaml, fix upda…
Browse files Browse the repository at this point in the history
…te-version.sh (#1367)

Contributes to rapidsai/build-planning#31.

Follow-up to #1364.

Implements some of the suggestions made in rapidsai/cudf#16183 (after #1364 was already merged):

* removing `cuda_suffixed: "false"` blocks in `dependencies.yaml` wherever they're identical to each other and the fallback matrix
* changing `dependencies.yaml` anchors with names like `*_conda` to `*_unsuffixed`, to reflect the fact that they're not conda-specific
* checking that `update-version.sh` catches all changes to versions

## Notes for Reviewers

### How I tested this

Looked for `update-versions.sh` issues manually like this:

```shell
git fetch upstream --tags
ci/release/update-version.sh '24.10.0'
git grep -E '24\.8|24\.08|0\.39'
```

The did find a few problems (like UCX dependency versions not being updated). This fixes those issues.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1367
  • Loading branch information
jameslamb committed Jul 24, 2024
1 parent 13a5f47 commit 064e254
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
17 changes: 15 additions & 2 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,23 @@ DEPENDENCIES=(
kvikio
rapids-dask-dependency
)
for FILE in dependencies.yaml conda/environments/*.yaml; do
for DEP in "${DEPENDENCIES[@]}"; do
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
done
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" pyproject.toml
done

UCX_DEPENDENCIES=(
distributed-ucxx
ucx-py
ucxx
)
for DEP in "${UCX_DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_UCXPY_VERSION}.*,>=0.0.0a0/g" "${FILE}"
done
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_UCXPY_VERSION}.*,>=0.0.0a0\"/g" pyproject.toml
done

# CI files
Expand Down
30 changes: 8 additions & 22 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,11 @@ dependencies:
- pytest-cov
- output_types: [conda]
packages:
- &cudf_conda cudf==24.8.*,>=0.0.0a0
- &dask_cudf_conda dask-cudf==24.8.*,>=0.0.0a0
- &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0
- &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*,>=0.0.0a0
- &kvikio_conda kvikio==24.8.*,>=0.0.0a0
- &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0
- &kvikio_unsuffixed kvikio==24.8.*,>=0.0.0a0
- &ucx_py_unsuffixed ucx-py==0.39.*,>=0.0.0a0
- ucx-proc=*=gpu
- ucxx==0.39.*,>=0.0.0a0
specific:
Expand All @@ -197,30 +197,16 @@ dependencies:
- cudf-cu12==24.8.*,>=0.0.0a0
- dask-cudf-cu12==24.8.*,>=0.0.0a0
- ucx-py-cu12==0.39.*,>=0.0.0a0
- matrix:
cuda: "12.*"
cuda_suffixed: "false"
packages:
- *cudf_conda
- *dask_cudf_conda
- *ucx_py_conda
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cudf-cu11==24.8.*,>=0.0.0a0
- dask-cudf-cu11==24.8.*,>=0.0.0a0
- ucx-py-cu11==0.39.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "false"
packages:
- *cudf_conda
- *dask_cudf_conda
- *ucx_py_conda
- matrix:
packages:
- *cudf_conda
- *dask_cudf_conda
- *kvikio_conda
- *ucx_py_conda
- *cudf_unsuffixed
- *dask_cudf_unsuffixed
- *kvikio_unsuffixed
- *ucx_py_unsuffixed

0 comments on commit 064e254

Please sign in to comment.