diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 34fcbb6e104..ffa48797fe3 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.7.1" +export DASK_STABLE_VERSION="2022.9.2" function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 87d378f4d65..560de6db187 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -26,6 +26,10 @@ export GPUCI_CONDA_RETRY_SLEEP=30 export CMAKE_GENERATOR="Ninja" 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=0 + # Switch to project root; also root of repo checkout cd "$WORKSPACE" @@ -49,6 +53,9 @@ conda activate rapids if [ "$SOURCE_BRANCH" = "main" ]; then conda config --system --remove channels rapidsai-nightly conda config --system --remove channels dask/label/dev +elif [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then + # Remove `dask/label/dev` channel if INSTALL_DASK_MAIN=0 + conda config --system --remove channels dask/label/dev fi gpuci_logger "Check compiler versions" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7f3ac81b5c6..b6a27c31614 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.7.1" +export DASK_STABLE_VERSION="2022.9.2" # ucx-py version export UCX_PY_VERSION='0.28.*' @@ -78,6 +78,12 @@ gpuci_logger "Activate conda env" . /opt/conda/etc/profile.d/conda.sh conda activate rapids +# Remove `dask/label/dev` channel if INSTALL_DASK_MAIN=0 +if [ "$SOURCE_BRANCH" != "main" ] && [[ "${INSTALL_DASK_MAIN}" == 0 ]]; then + conda config --system --remove channels dask/label/dev + 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 + gpuci_logger "Check conda environment" conda info conda config --show-sources diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index cff3e8670a7..37f11fe3920 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -49,8 +49,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2022.7.1 - - distributed>=2022.7.1 + - dask==2022.9.2 + - distributed==2022.9.2 - streamz - arrow-cpp=9 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 36fbcb5197d..596e5fde940 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -29,8 +29,8 @@ requirements: - python - streamz - cudf ={{ version }} - - dask>=2022.7.1 - - distributed>=2022.7.1 + - dask==2022.9.2 + - distributed==2022.9.2 - 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 98b69ba9e5d..2d95151018b 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.7.1 - - distributed>=2022.7.1 + - dask==2022.9.2 + - distributed==2022.9.2 - cudatoolkit ={{ cuda_version }} run: - python - cudf ={{ version }} - - dask>=2022.7.1 - - distributed>=2022.7.1 + - dask==2022.9.2 + - distributed==2022.9.2 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/python/cudf/cudf/tests/test_orc.py b/python/cudf/cudf/tests/test_orc.py index e45a1bd9c2f..422c2588eb0 100644 --- a/python/cudf/cudf/tests/test_orc.py +++ b/python/cudf/cudf/tests/test_orc.py @@ -736,6 +736,7 @@ def test_orc_write_statistics(tmpdir, datadir, nrows, stats_freq): @pytest.mark.parametrize("stats_freq", ["STRIPE", "ROWGROUP"]) @pytest.mark.parametrize("nrows", [2, 100, 6000000]) def test_orc_chunked_write_statistics(tmpdir, datadir, nrows, stats_freq): + np.random.seed(0) supported_stat_types = supported_numpy_dtypes + ["str"] # Can't write random bool columns until issue #6763 is fixed if nrows == 6000000: diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 107fd5e7d33..54b8f69c6d9 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -9,8 +9,8 @@ install_requires = [ "cudf", - "dask>=2022.7.1", - "distributed>=2022.7.1", + "dask==2022.9.2", + "distributed==2022.9.2", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.6.0dev0",