From d3535a1c879c1bd6761227c332406ae905dba58c Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 29 Sep 2022 08:57:47 -0700 Subject: [PATCH 1/2] pin and for release --- ci/gpu/build.sh | 4 ++-- conda/environments/raft_dev_cuda11.0.yml | 4 ++-- conda/environments/raft_dev_cuda11.2.yml | 4 ++-- conda/environments/raft_dev_cuda11.4.yml | 4 ++-- conda/environments/raft_dev_cuda11.5.yml | 4 ++-- conda/recipes/raft-dask/meta.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 6e4b612600..9072bbb3fb 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -83,8 +83,8 @@ fi # Install the master version of dask, distributed, and dask-ml gpuci_logger "Install the master version of dask and distributed" set -x -pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps -pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps +pip install "git+https://github.com/dask/distributed.git@2022.9.1" --upgrade --no-deps +pip install "git+https://github.com/dask/dask.git@2022.9.1" --upgrade --no-deps set +x gpuci_logger "Check GPU usage" diff --git a/conda/environments/raft_dev_cuda11.0.yml b/conda/environments/raft_dev_cuda11.0.yml index 1e55b2ba7f..764198e826 100644 --- a/conda/environments/raft_dev_cuda11.0.yml +++ b/conda/environments/raft_dev_cuda11.0.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main + - git+https://github.com/dask/dask.git@2022.9.1 + - git+https://github.com/dask/distributed.git@2022.9.1 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index 7eed99fb4d..fbf086b4a0 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main + - git+https://github.com/dask/dask.git@2022.9.1 + - git+https://github.com/dask/distributed.git@2022.9.1 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index 8756059055..cabe47602b 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main + - git+https://github.com/dask/dask.git@2022.9.1 + - git+https://github.com/dask/distributed.git@2022.9.1 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index a28e97b6e7..b5ade0de71 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -28,8 +28,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main + - git+https://github.com/dask/dask.git@2022.9.1 + - git+https://github.com/dask/distributed.git@2022.9.1 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 89ddb6e722..6c694047d5 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -51,8 +51,8 @@ requirements: - ucx >={{ ucx_version }} - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - - dask>=2022.7.1 - - distributed>=2022.7.1 + - dask==2022.9.1 + - distributed==2022.9.1 - cuda-python >=11.5,<11.7.1 - joblib >=0.11 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} From 14343ecb861646349a1f29cf22024ca681e7da49 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 30 Sep 2022 17:15:09 -0500 Subject: [PATCH 2/2] Apply suggestions from code review --- ci/gpu/build.sh | 4 ++-- conda/environments/raft_dev_cuda11.0.yml | 4 ++-- conda/environments/raft_dev_cuda11.2.yml | 4 ++-- conda/environments/raft_dev_cuda11.4.yml | 4 ++-- conda/environments/raft_dev_cuda11.5.yml | 4 ++-- conda/recipes/raft-dask/meta.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 9072bbb3fb..9db2a02ecb 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -83,8 +83,8 @@ fi # Install the master version of dask, distributed, and dask-ml gpuci_logger "Install the master version of dask and distributed" set -x -pip install "git+https://github.com/dask/distributed.git@2022.9.1" --upgrade --no-deps -pip install "git+https://github.com/dask/dask.git@2022.9.1" --upgrade --no-deps +pip install "git+https://github.com/dask/distributed.git@2022.9.2" --upgrade --no-deps +pip install "git+https://github.com/dask/dask.git@2022.9.2" --upgrade --no-deps set +x gpuci_logger "Check GPU usage" diff --git a/conda/environments/raft_dev_cuda11.0.yml b/conda/environments/raft_dev_cuda11.0.yml index 764198e826..408a508321 100644 --- a/conda/environments/raft_dev_cuda11.0.yml +++ b/conda/environments/raft_dev_cuda11.0.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.9.1 - - git+https://github.com/dask/distributed.git@2022.9.1 + - git+https://github.com/dask/dask.git@2022.9.2 + - git+https://github.com/dask/distributed.git@2022.9.2 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index fbf086b4a0..4b9d49dfa7 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.9.1 - - git+https://github.com/dask/distributed.git@2022.9.1 + - git+https://github.com/dask/dask.git@2022.9.2 + - git+https://github.com/dask/distributed.git@2022.9.2 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index cabe47602b..0d33cad368 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.9.1 - - git+https://github.com/dask/distributed.git@2022.9.1 + - git+https://github.com/dask/dask.git@2022.9.2 + - git+https://github.com/dask/distributed.git@2022.9.2 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index b5ade0de71..6e05be6d9b 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -28,8 +28,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.9.1 - - git+https://github.com/dask/distributed.git@2022.9.1 + - git+https://github.com/dask/dask.git@2022.9.2 + - git+https://github.com/dask/distributed.git@2022.9.2 # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 6c694047d5..4e10294db7 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -51,8 +51,8 @@ requirements: - ucx >={{ ucx_version }} - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - - dask==2022.9.1 - - distributed==2022.9.1 + - dask==2022.9.2 + - distributed==2022.9.2 - cuda-python >=11.5,<11.7.1 - joblib >=0.11 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}