From 38235de0c0b4038468fbbe5ca703b762f3d1b717 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 16 Nov 2022 06:34:38 -0800 Subject: [PATCH 1/3] pin dask --- ci/benchmark/build.sh | 4 ++-- ci/cpu/build.sh | 2 +- ci/gpu/build.sh | 4 ++-- conda/environments/all_cuda-115_arch-x86_64.yaml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 8 ++++---- dependencies.yaml | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 0ea39a0b365..011f947beb0 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -37,10 +37,10 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" # Dask & Distributed option to install main(nightly) or `conda-forge` packages. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.9.2" +export DASK_STABLE_VERSION="2022.11.0" function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index ada69fe0923..2e12308169f 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -28,7 +28,7 @@ export CONDA_BLD_DIR="$WORKSPACE/.conda-bld" # 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=1 +export INSTALL_DASK_MAIN=0 # Switch to project root; also root of repo checkout cd "$WORKSPACE" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 500c3bdbcc5..2b3e4147d89 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -32,10 +32,10 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` unset GIT_DESCRIBE_TAG # Dask & Distributed option to install main(nightly) or `conda-forge` packages. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.9.2" +export DASK_STABLE_VERSION="2022.11.0" # ucx-py version export UCX_PY_VERSION='0.29.*' diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index a7e5f1a04a6..2e52b86b705 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -21,8 +21,8 @@ dependencies: - cxx-compiler - cython>=0.29,<0.30 - dask-cuda=22.12.* -- dask>=2022.9.2 -- distributed>=2022.9.2 +- dask==2022.11.0 +- distributed==2022.11.0 - dlpack>=0.5,<0.6.0a0 - doxygen=1.8.20 - fastavro>=0.22.9 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 989f8855533..19d9728b234 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -29,8 +29,8 @@ requirements: - python - streamz - cudf ={{ version }} - - dask>=2022.9.2 - - distributed>=2022.9.2 + - dask==2022.11.0 + - distributed==2022.11.0 - python-confluent-kafka >=1.7.0,<1.8.0a0 - cudf_kafka ={{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 1c718c0e995..8f83053eab5 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -24,14 +24,14 @@ requirements: host: - python - cudf ={{ version }} - - dask>=2022.9.2 - - distributed>=2022.9.2 + - dask==2022.11.0 + - distributed==2022.11.0 - cudatoolkit ={{ cuda_version }} run: - python - cudf ={{ version }} - - dask>=2022.9.2 - - distributed>=2022.9.2 + - dask==2022.11.0 + - distributed==2022.11.0 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/dependencies.yaml b/dependencies.yaml index b8470f02f86..3ba21139287 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -141,8 +141,8 @@ dependencies: - output_types: [conda, requirements] packages: - cachetools - - dask>=2022.9.2 - - distributed>=2022.9.2 + - dask==2022.11.0 + - distributed==2022.11.0 - fsspec>=0.6.0 - numba>=0.56.2 - numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 4fa2af89b9d..aaa3635efd7 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -9,8 +9,8 @@ install_requires = [ "cudf", - "dask>=2022.9.2", - "distributed>=2022.9.2", + "dask==2022.11.0", + "distributed==2022.11.0", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.6.0dev0", From 7adf22946d548628d275ebd3afc77cbf8fca64dc Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 16 Nov 2022 10:22:20 -0600 Subject: [PATCH 2/3] Update build.sh --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 2b3e4147d89..e33fb89ab75 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -101,7 +101,7 @@ function install_dask { conda list 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 + 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 fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From 297911f425ff08f005fada0291bcf5a9b1dc8729 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 1 Dec 2022 04:25:50 -0800 Subject: [PATCH 3/3] Pin to 2022.11.1 --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/all_cuda-115_arch-x86_64.yaml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 8 ++++---- dependencies.yaml | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 011f947beb0..e186946a3d0 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -40,7 +40,7 @@ export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.11.0" +export DASK_STABLE_VERSION="2022.11.1" function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 1d4911d71ab..13d62c7464a 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -35,7 +35,7 @@ unset GIT_DESCRIBE_TAG export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.11.0" +export DASK_STABLE_VERSION="2022.11.1" # ucx-py version export UCX_PY_VERSION='0.29.*' diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 1ee81f31854..cd900efced5 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -21,8 +21,8 @@ dependencies: - cxx-compiler - cython>=0.29,<0.30 - dask-cuda=22.12.* -- dask==2022.11.0 -- distributed==2022.11.0 +- dask==2022.11.1 +- distributed==2022.11.1 - dlpack>=0.5,<0.6.0a0 - doxygen=1.8.20 - fastavro>=0.22.9 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 19d9728b234..b5a27cdac92 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -29,8 +29,8 @@ requirements: - python - streamz - cudf ={{ version }} - - dask==2022.11.0 - - distributed==2022.11.0 + - dask==2022.11.1 + - distributed==2022.11.1 - python-confluent-kafka >=1.7.0,<1.8.0a0 - cudf_kafka ={{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 8f83053eab5..d97a8448a53 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -24,14 +24,14 @@ requirements: host: - python - cudf ={{ version }} - - dask==2022.11.0 - - distributed==2022.11.0 + - dask==2022.11.1 + - distributed==2022.11.1 - cudatoolkit ={{ cuda_version }} run: - python - cudf ={{ version }} - - dask==2022.11.0 - - distributed==2022.11.0 + - dask==2022.11.1 + - distributed==2022.11.1 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/dependencies.yaml b/dependencies.yaml index aeb680ebdb2..074ef3696c4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -141,8 +141,8 @@ dependencies: - output_types: [conda, requirements] packages: - cachetools - - dask==2022.11.0 - - distributed==2022.11.0 + - dask==2022.11.1 + - distributed==2022.11.1 - fsspec>=0.6.0 - numba>=0.56.2 - numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 83b21a0c6f7..651245c4a50 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -8,8 +8,8 @@ cuda_suffix = os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default="") install_requires = [ - "dask>=2022.9.2", - "distributed>=2022.9.2", + "dask==2022.11.1", + "distributed==2022.11.1", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.6.0dev0",