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

consolidate cuda_suffixed=false blocks in dependencies.yaml, fix update-version.sh #1367

Merged
merged 3 commits into from
Jul 24, 2024
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
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
Loading