Skip to content

Commit

Permalink
Update ucx-py version on release using rvc (#4411)
Browse files Browse the repository at this point in the history
Update `ucx-py` version on release using `rvc`

Authors:
  - Jordan Jacobelli (https://github.com/Ethyling)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #4411
  • Loading branch information
jjacobelli authored Dec 15, 2021
1 parent 9046f85 commit 307196d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 7 deletions.
3 changes: 2 additions & 1 deletion ci/checks/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ cd "$WORKSPACE"

export GIT_DESCRIBE_TAG=`git describe --tags`
export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
conda install "ucx-py=0.24.*" "ucx-proc=*=gpu"
export UCX_PY_VERSION='0.24.*'
conda install "ucx-py=${UCX_PY_VERSION}" "ucx-proc=*=gpu"

# Run flake8 and get results/return code
FLAKE=`flake8 --config=python/setup.cfg`
Expand Down
3 changes: 3 additions & 0 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ if [ "${IS_STABLE_BUILD}" != "true" ] ; then
export VERSION_SUFFIX=`date +%y%m%d`
fi

# ucx-py version
export UCX_PY_VERSION='0.24.*'

################################################################################
# SETUP - Check environment
################################################################################
Expand Down
5 changes: 4 additions & 1 deletion ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ cd $WORKSPACE
export GIT_DESCRIBE_TAG=`git describe --tags`
export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`

# ucx-py version
export UCX_PY_VERSION='0.24.*'

################################################################################
# SETUP - Check environment
################################################################################
Expand All @@ -53,7 +56,7 @@ gpuci_mamba_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
"libcumlprims=${MINOR_VERSION}" \
"dask-cudf=${MINOR_VERSION}" \
"dask-cuda=${MINOR_VERSION}" \
"ucx-py=0.24.*" \
"ucx-py=${UCX_PY_VERSION}" \
"ucx-proc=*=gpu" \
"xgboost=1.5.0dev.rapidsai${MINOR_VERSION}" \
"rapids-build-env=${MINOR_VERSION}.*" \
Expand Down
9 changes: 8 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}).*"

echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"

Expand All @@ -46,4 +47,10 @@ for FILE in conda/environments/*.yml; do
sed_runner "s/rapids-build-env=${CURRENT_SHORT_TAG}/rapids-build-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-notebook-env=${CURRENT_SHORT_TAG}/rapids-notebook-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE};
done
sed_runner "s/ucx-py=.*/ucx-py=${NEXT_UCX_PY_VERSION}/g" ${FILE};
done

# Update ucx-py version
sed_runner "s/export UCX_PY_VERSION=.*/export UCX_PY_VERSION='${NEXT_UCX_PY_VERSION}'/g" ci/checks/style.sh
sed_runner "s/export UCX_PY_VERSION=.*/export UCX_PY_VERSION='${NEXT_UCX_PY_VERSION}'/g" ci/cpu/build.sh
sed_runner "s/export UCX_PY_VERSION=.*/export UCX_PY_VERSION='${NEXT_UCX_PY_VERSION}'/g" ci/gpu/build.sh
5 changes: 3 additions & 2 deletions conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set py_version=environ.get('CONDA_PY', 36) %}
{% set ucx_py_version=environ.get('UCX_PY_VERSION') %}

package:
name: cuml
Expand Down Expand Up @@ -34,7 +35,7 @@ requirements:
- libcuml={{ version }}
- libcumlprims {{ minor_version }}
- cudatoolkit {{ cuda_version }}.*
- ucx-py 0.24
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
run:
- python x.x
Expand All @@ -45,7 +46,7 @@ requirements:
- cupy>=7.8.0,<10.0.0a0
- treelite=2.1.0
- nccl>=2.9.9
- ucx-py 0.24
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- dask>=2021.11.1,<=2021.11.2
- distributed>=2021.11.1,<=2021.11.2
Expand Down
5 changes: 3 additions & 2 deletions conda/recipes/libcuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set cuda_version='.'.join(environ.get('CUDA', '9.2').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set ucx_py_version=environ.get('UCX_PY_VERSION') %}
package:
name: libcuml
version: {{ version }}
Expand Down Expand Up @@ -38,7 +39,7 @@ requirements:
- nccl>=2.9.9
- cudf {{ minor_version }}
- cudatoolkit {{ cuda_version }}.*
- ucx-py 0.24
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- libcumlprims {{ minor_version }}
- lapack
Expand All @@ -51,7 +52,7 @@ requirements:
- libcumlprims {{ minor_version }}
- cudf {{ minor_version }}
- nccl>=2.9.9
- ucx-py 0.24
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- treelite=2.1.0
Expand Down

0 comments on commit 307196d

Please sign in to comment.