From cd79266d55ee84da86ec3b409822d86506227aff Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 08:52:34 -0700 Subject: [PATCH 1/8] pin dask and distributed for release --- ci/gpu/build.sh | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 36816e3a2..c02c13b24 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -35,10 +35,10 @@ export NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=1 # Install dask and distributed from main branch. Usually needed during # development time and disabled before a new dask-cuda release. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.7.1" +export DASK_STABLE_VERSION="2022.9.1" ################################################################################ # SETUP - Check environment diff --git a/requirements.txt b/requirements.txt index 1d5c6d0ad..f72b3c826 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -dask>=2022.7.1 -distributed>=2022.7.1 +dask==2022.9.1 +distributed==2022.9.1 pynvml>=11.0.0 numpy>=1.16.0 numba>=0.54 From 4f75696ef1c832f935ac4602c7c0e77fc78d6e14 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 09:37:45 -0700 Subject: [PATCH 2/8] fix --- ci/cpu/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index d2450cfe8..c62bf92ae 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -43,9 +43,10 @@ gpuci_logger "Activate conda env" . /opt/conda/etc/profile.d/conda.sh conda activate rapids -# Remove rapidsai-nightly channel if we are building main branch +# 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 + conda config --system --remove channels dask/label/dev fi gpuci_logger "Check compiler versions" @@ -61,8 +62,8 @@ conda list --show-channel-urls # FIX Added to deal with Anancoda SSL verification issues during conda builds conda config --set ssl_verify False -pip install git+https://github.com/dask/dask.git@main -pip install git+https://github.com/dask/distributed.git@main +pip install git+https://github.com/dask/dask.git@2022.9.1 +pip install git+https://github.com/dask/distributed.git@2022.9.1 ################################################################################ # BUILD - Package builds From 41ab17ddae3507e82319f7ee31dd3e7a1f04f432 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 09:45:59 -0700 Subject: [PATCH 3/8] fix --- ci/cpu/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index c62bf92ae..496d24beb 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -19,6 +19,10 @@ export CUDA_REL=${CUDA_VERSION%.*} export GPUCI_CONDA_RETRY_MAX=1 export GPUCI_CONDA_RETRY_SLEEP=30 +# Whethere to keep `dask/label/dev` channel in the env. If INSTALL_DASK_MAIN=0, +# `dask/label/dev` channel is removed. +export INSTALL_DASK_MAIN=0 + # Switch to project root; also root of repo checkout cd "$WORKSPACE" From c8588adac93c5d60ca2bcdf368199f926b790ff5 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 09:53:23 -0700 Subject: [PATCH 4/8] fix --- ci/cpu/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 496d24beb..a136a2d55 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -53,6 +53,11 @@ if [ "$SOURCE_BRANCH" = "main" ]; then conda config --system --remove channels dask/label/dev fi +# Remove `dask/label/dev` channel if INSTALL_DASK_MAIN=0 +if [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then + conda config --system --remove channels dask/label/dev +fi + gpuci_logger "Check compiler versions" python --version $CC --version From 2a4487259c02c1c9284d3151952de3de8776aec3 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 10:05:12 -0700 Subject: [PATCH 5/8] fix --- ci/gpu/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index c02c13b24..a8a43c325 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -77,6 +77,7 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then else gpuci_logger "gpuci_mamba_retry install conda-forge::dask==${DASK_STABLE_VERSION} conda-forge::distributed==${DASK_STABLE_VERSION} conda-forge::dask-core==${DASK_STABLE_VERSION} --force-reinstall" gpuci_mamba_retry install conda-forge::dask==${DASK_STABLE_VERSION} conda-forge::distributed==${DASK_STABLE_VERSION} conda-forge::dask-core==${DASK_STABLE_VERSION} --force-reinstall + conda config --system --remove channels dask/label/dev fi From 14cc910fb94254449906ebd3cd533d9e514bf858 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 29 Sep 2022 13:31:56 -0500 Subject: [PATCH 6/8] Update ci/cpu/build.sh --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index a136a2d55..0b468465c 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -19,7 +19,7 @@ export CUDA_REL=${CUDA_VERSION%.*} export GPUCI_CONDA_RETRY_MAX=1 export GPUCI_CONDA_RETRY_SLEEP=30 -# Whethere to keep `dask/label/dev` channel in the env. If INSTALL_DASK_MAIN=0, +# Whether to keep `dask/label/dev` channel in the env. If INSTALL_DASK_MAIN=0, # `dask/label/dev` channel is removed. export INSTALL_DASK_MAIN=0 From be970917a7058adbe594ea3a1bcb19296a1fe996 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 30 Sep 2022 17:13:36 -0500 Subject: [PATCH 7/8] Apply suggestions from code review --- ci/cpu/build.sh | 4 ++-- ci/gpu/build.sh | 2 +- requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 0b468465c..04414ab0c 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -71,8 +71,8 @@ conda list --show-channel-urls # FIX Added to deal with Anancoda SSL verification issues during conda builds conda config --set ssl_verify False -pip install git+https://github.com/dask/dask.git@2022.9.1 -pip install git+https://github.com/dask/distributed.git@2022.9.1 +pip install git+https://github.com/dask/dask.git@2022.9.2 +pip install git+https://github.com/dask/distributed.git@2022.9.2 ################################################################################ # BUILD - Package builds diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index a8a43c325..6db58ec0d 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -38,7 +38,7 @@ export NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=1 export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.9.1" +export DASK_STABLE_VERSION="2022.9.2" ################################################################################ # SETUP - Check environment diff --git a/requirements.txt b/requirements.txt index f72b3c826..3d673a955 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -dask==2022.9.1 -distributed==2022.9.1 +dask==2022.9.2 +distributed==2022.9.2 pynvml>=11.0.0 numpy>=1.16.0 numba>=0.54 From ac1b938419500223bd91c160df98bd0f0c30de58 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 3 Oct 2022 11:23:43 -0500 Subject: [PATCH 8/8] Apply suggestions from code review --- ci/cpu/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 04414ab0c..e468b1cb1 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -51,10 +51,8 @@ conda activate rapids if [ "$SOURCE_BRANCH" = "main" ]; then conda config --system --remove channels rapidsai-nightly conda config --system --remove channels dask/label/dev -fi - +elif [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then # Remove `dask/label/dev` channel if INSTALL_DASK_MAIN=0 -if [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then conda config --system --remove channels dask/label/dev fi