diff --git a/ci/test_python.sh b/ci/test_python.sh index 5183dc37a49..851cbd7e61a 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -65,10 +65,7 @@ popd rapids-logger "pytest cugraph" pushd python/cugraph/cugraph -DASK_WORKER_DEVICES="0" \ -DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="1000s" \ -DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="1000s" \ -DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT=20 \ +DASK_WORKER_DEVICES="0" pytest \ -v \ --benchmark-disable \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index d6ec67cd9e9..3ac3549f143 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -21,9 +21,5 @@ arch=$(uname -m) if [[ "${arch}" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then python ./ci/wheel_smoke_test_${package_name}.py else - RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets \ - DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="1000s" \ - DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="1000s" \ - DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT=20 \ - python -m pytest ./python/${package_name}/${python_package_name}/tests + RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets python -m pytest ./python/${package_name}/${python_package_name}/tests fi diff --git a/ci/test_wheel_cugraph.sh b/ci/test_wheel_cugraph.sh index ac18459128a..f9e2aa6d8da 100755 --- a/ci/test_wheel_cugraph.sh +++ b/ci/test_wheel_cugraph.sh @@ -9,6 +9,6 @@ RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-whe python -m pip install --no-deps ./local-pylibcugraph-dep/pylibcugraph*.whl # Always install latest dask for testing -python -m pip install git+https://github.com/dask/dask.git@2023.9.2 git+https://github.com/dask/distributed.git@2023.9.2 +python -m pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main ./ci/test_wheel.sh cugraph python/cugraph diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 42a218fcf66..b7472ebedda 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -20,7 +20,7 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.7.1 - dask-cuda==23.12.* - dask-cudf==23.12.* - dask>=2023.7.1 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 0a1774b769f..4eacc01076a 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -20,7 +20,7 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.7.1 - dask-cuda==23.12.* - dask-cudf==23.12.* - dask>=2023.7.1 diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 1dc5a75c41b..2d7ed2f4cda 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -26,7 +26,7 @@ requirements: - python - scikit-build >=0.13.1 run: - - distributed ==2023.9.2 + - distributed >=2023.7.1 - numba >=0.57 - numpy >=1.21 - python diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index 2daf0438351..f3229c27364 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -59,7 +59,7 @@ outputs: - cupy >=12.0.0 - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - - distributed ==2023.9.2 + - distributed >=2023.7.1 - numba >=0.57 - numpy >=1.21 - python diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index f9bf54a2ef4..ad5965ad20c 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -76,9 +76,9 @@ requirements: - cupy >=12.0.0 - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - - dask ==2023.9.2 - - dask-core ==2023.9.2 - - distributed ==2023.9.2 + - dask >=2023.7.1 + - dask-core >=2023.7.1 + - distributed >=2023.7.1 - fsspec>=0.6.0 - libcugraph ={{ version }} - pylibcugraph ={{ version }} diff --git a/dependencies.yaml b/dependencies.yaml index 7b63f6dc536..2257d2ebf78 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -385,7 +385,7 @@ dependencies: - output_types: conda packages: - aiohttp - - &dask-core_conda dask-core==2023.9.2 + - &dask-core_conda dask-core>=2023.7.1 - fsspec>=0.6.0 - libcudf==23.12.* - requests