From a3864513b00bb85d7066916d435915c3b8931666 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 24 Jan 2023 09:10:05 -0500 Subject: [PATCH 1/5] Use CTK 118/cp310 branch of wheel workflows --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/pr.yaml | 8 ++++---- .github/workflows/test.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0ded9a530..8f745848e0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,7 +54,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build-pylibraft: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -66,7 +66,7 @@ jobs: wheel-publish-pylibraft: needs: wheel-build-pylibraft secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -76,7 +76,7 @@ jobs: wheel-build-raft-dask: needs: wheel-publish-pylibraft secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -88,7 +88,7 @@ jobs: wheel-publish-raft-dask: needs: wheel-build-raft-dask secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c2c64d0003..004abf8bde 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -54,7 +54,7 @@ jobs: wheel-build-pylibraft: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: pull-request package-name: pylibraft @@ -63,7 +63,7 @@ jobs: wheel-tests-pylibraft: needs: wheel-build-pylibraft secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: pull-request package-name: pylibraft @@ -74,7 +74,7 @@ jobs: wheel-build-raft-dask: needs: wheel-tests-pylibraft secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: pull-request package-name: raft_dask @@ -85,7 +85,7 @@ jobs: wheel-tests-raft-dask: needs: wheel-build-raft-dask secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: pull-request package-name: raft_dask diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6eb2c16ba6..d41a660c6d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,7 +32,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests-pylibraft: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: nightly branch: ${{ inputs.branch }} @@ -44,7 +44,7 @@ jobs: test-unittest: "python -m pytest -v ./python/pylibraft/pylibraft/test" wheel-tests-raft-dask: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: nightly branch: ${{ inputs.branch }} From dfdb78e5690bf91a03bdd17966be216b015c6930 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 24 Jan 2023 12:56:48 -0500 Subject: [PATCH 2/5] Allow python 3.10 for raft-dask --- python/raft-dask/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/raft-dask/setup.cfg b/python/raft-dask/setup.cfg index b005a7ab8f..5b1e47f5d6 100644 --- a/python/raft-dask/setup.cfg +++ b/python/raft-dask/setup.cfg @@ -46,4 +46,4 @@ skip= [options] packages = find: -python_requires = >=3.7,<3.10 +python_requires = >=3.7,<=3.10 From 1ed814b27315ee2d323b1dcb1aba3a3f25fda384 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 24 Jan 2023 13:30:27 -0500 Subject: [PATCH 3/5] Remove upper constraint on python_requires --- python/raft-dask/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/raft-dask/setup.cfg b/python/raft-dask/setup.cfg index 5b1e47f5d6..2771ef1a40 100644 --- a/python/raft-dask/setup.cfg +++ b/python/raft-dask/setup.cfg @@ -46,4 +46,4 @@ skip= [options] packages = find: -python_requires = >=3.7,<=3.10 +python_requires = >=3.7 From 04754d94cfb543b2097835a265091bfdfe6c9b65 Mon Sep 17 00:00:00 2001 From: Sevag H Date: Tue, 24 Jan 2023 15:22:49 -0500 Subject: [PATCH 4/5] Update python/raft-dask/setup.cfg Co-authored-by: Bradley Dice --- python/raft-dask/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/raft-dask/setup.cfg b/python/raft-dask/setup.cfg index 2771ef1a40..3f563289c4 100644 --- a/python/raft-dask/setup.cfg +++ b/python/raft-dask/setup.cfg @@ -46,4 +46,4 @@ skip= [options] packages = find: -python_requires = >=3.7 +python_requires = >=3.8,<3.11 From 481c221f66f1ce956ddc2cc1834f9066360d9e94 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 24 Jan 2023 15:49:23 -0500 Subject: [PATCH 5/5] Add some comments to trigger new build --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 004abf8bde..61d976c605 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -68,6 +68,7 @@ jobs: build_type: pull-request package-name: pylibraft test-before-amd64: "pip install cupy-cuda11x" + # On arm also need to install cupy from the specific webpage. test-before-arm64: "pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64" test-unittest: "python -m pytest -v ./python/pylibraft/pylibraft/test" test-smoketest: "python ./ci/wheel_smoke_test_pylibraft.py" @@ -89,6 +90,7 @@ jobs: with: 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.02" 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.02" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test"