From d27b2aea0ba710cb0c43d743de4ffcfc222fe68d Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 5 Apr 2023 11:28:53 -0700 Subject: [PATCH 1/8] Pin dask and distributed for release --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/raft-dask/meta.yaml | 4 ++-- dependencies.yaml | 4 ++-- python/raft-dask/pyproject.toml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9b81ab7d82..97554b380e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -105,7 +105,7 @@ jobs: build_type: pull-request package-name: raft_dask # Always want to test against latest dask/distributed. - test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" - test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" + test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" + test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" test-smoketest: "python ./ci/wheel_smoke_test_raft_dask.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 876c9a6722..d204d2c16e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -51,6 +51,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} package-name: raft_dask - test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" - test-before-arm64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" + test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.3.2 git+https://github.com/dask/distributed.git@2023.3.2.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 1afebc98e6..9c1567deb9 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -19,8 +19,8 @@ dependencies: - cxx-compiler - cython>=0.29,<0.30 - dask-cuda==23.4.* -- dask>=2023.1.1 -- distributed>=2023.1.1 +- dask==2023.3.2 +- distributed==2023.3.2.1 - doxygen>=1.8.20 - gcc_linux-64=11.* - graphviz diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 59a67fe148..9d3ddfa8e5 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -46,9 +46,9 @@ requirements: run: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - cuda-python >=11.7.1,<12.0 - - dask >=2023.1.1 + - dask ==2023.3.2 - dask-cuda ={{ minor_version }} - - distributed >=2023.1.1 + - distributed ==2023.3.2.1 - joblib >=0.11 - nccl >=2.9.9 - pylibraft {{ version }} diff --git a/dependencies.yaml b/dependencies.yaml index 64fd7cd454..06c6706d39 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -265,9 +265,9 @@ dependencies: common: - output_types: [conda, pyproject] packages: - - dask>=2023.1.1 + - dask==2023.3.2 - dask-cuda==23.4.* - - distributed>=2023.1.1 + - distributed==2023.3.2.1 - joblib>=0.11 - numba>=0.49 - *numpy diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index fe490ea117..ba6cd7ccae 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -35,8 +35,8 @@ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ "dask-cuda==23.4.*", - "dask>=2023.1.1", - "distributed>=2023.1.1", + "dask==2023.3.2", + "distributed==2023.3.2.1", "joblib>=0.11", "numba>=0.49", "numpy>=1.21", From 2c2788ebcbd4ff51faa387d1038eaf2c04121d50 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 14:49:09 -0500 Subject: [PATCH 2/8] Apply suggestions from code review --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/recipes/raft-dask/meta.yaml | 1 + dependencies.yaml | 1 + python/raft-dask/pyproject.toml | 1 + 4 files changed, 4 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9c1567deb9..197eddd057 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -20,6 +20,7 @@ dependencies: - cython>=0.29,<0.30 - dask-cuda==23.4.* - dask==2023.3.2 +- dask-core==2023.3.2 - distributed==2023.3.2.1 - doxygen>=1.8.20 - gcc_linux-64=11.* diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 9d3ddfa8e5..cd08deabfa 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -47,6 +47,7 @@ requirements: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - cuda-python >=11.7.1,<12.0 - dask ==2023.3.2 + - dask-core ==2023.3.2 - dask-cuda ={{ minor_version }} - distributed ==2023.3.2.1 - joblib >=0.11 diff --git a/dependencies.yaml b/dependencies.yaml index 06c6706d39..e801784c33 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -266,6 +266,7 @@ dependencies: - output_types: [conda, pyproject] packages: - dask==2023.3.2 + - dask-core==2023.3.2 - dask-cuda==23.4.* - distributed==2023.3.2.1 - joblib>=0.11 diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index ba6cd7ccae..75f8cd07d9 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -35,6 +35,7 @@ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ "dask-cuda==23.4.*", + "dask-core==2023.3.2", "dask==2023.3.2", "distributed==2023.3.2.1", "joblib>=0.11", From 7a8ef3f40225b82a458d1780630c5fff0e3b7c20 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 14:59:26 -0500 Subject: [PATCH 3/8] Update pyproject.toml --- python/raft-dask/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 75f8cd07d9..8cee760205 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -34,8 +34,8 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ - "dask-cuda==23.4.*", "dask-core==2023.3.2", + "dask-cuda==23.4.*", "dask==2023.3.2", "distributed==2023.3.2.1", "joblib>=0.11", From a5e278e720107f9522a5838384f6303cb690505f Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 14:59:47 -0500 Subject: [PATCH 4/8] Update all_cuda-118_arch-x86_64.yaml --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 197eddd057..fd2d1d2280 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -18,9 +18,9 @@ dependencies: - cupy - cxx-compiler - cython>=0.29,<0.30 +- dask-core==2023.3.2 - dask-cuda==23.4.* - dask==2023.3.2 -- dask-core==2023.3.2 - distributed==2023.3.2.1 - doxygen>=1.8.20 - gcc_linux-64=11.* From f61c9f47e15d0e6f4fe066139a7973eb19a3f23c Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 16:38:55 -0500 Subject: [PATCH 5/8] Update dependencies.yaml --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index e801784c33..af29bf68a8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -266,7 +266,6 @@ dependencies: - output_types: [conda, pyproject] packages: - dask==2023.3.2 - - dask-core==2023.3.2 - dask-cuda==23.4.* - distributed==2023.3.2.1 - joblib>=0.11 @@ -275,6 +274,7 @@ dependencies: - ucx-py==0.31.* - output_types: conda packages: + - dask-core==2023.3.2 - ucx>=1.13.0 - ucx-proc=*=gpu - output_types: pyproject From 3e3a1c6de0746e3726641fe167f93f4c0cc86d21 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 16:39:14 -0500 Subject: [PATCH 6/8] Update pyproject.toml --- python/raft-dask/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 8cee760205..ba6cd7ccae 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -34,7 +34,6 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.8" dependencies = [ - "dask-core==2023.3.2", "dask-cuda==23.4.*", "dask==2023.3.2", "distributed==2023.3.2.1", From c8beb5be6f73f43f749b5f86e84f5a603c5c34a3 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 19:15:52 -0500 Subject: [PATCH 7/8] Update pr.yaml --- .github/workflows/pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 97554b380e..ca29b4ead3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,5 +1,6 @@ name: pr + on: push: branches: From 27ecdc21a6b9d749db5daae1ea71ee08186cf46e Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 5 Apr 2023 19:16:04 -0500 Subject: [PATCH 8/8] Update pr.yaml --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ca29b4ead3..97554b380e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,6 +1,5 @@ name: pr - on: push: branches: