Skip to content

Commit 7a127c6

Browse files
authored
Build wheels using new single image workflow (#3525)
Up until now wheel builds have been using a two-pass, Docker-in-Docker approach that involves having one container run cibuildwheel, which in turn launches a manylinux container in which the build occurs. This approach is cumbersome to work with and makes it difficult to create local builds that match CI exactly. This PR updates to using the new single-image workflow in rapidsai/shared-workflows#71 that uses a new set of Docker images built just for RAPIDS and eschews cibuildwheel in favor of launching `pip wheel` directly. This approach should be far easier to make maintain and make work locally. It also removes our dependence on modifying upstream pypa manylinux images, which is fairly difficult to maintain. Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Ray Douglass (https://github.com/raydouglass) - Rick Ratzel (https://github.com/rlratzel) URL: #3525
1 parent 328dd26 commit 7a127c6

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run_script: "ci/build_docs.sh"
6666
wheel-build-pylibcugraph:
6767
secrets: inherit
68-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
68+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@manylinux_v2
6969
with:
7070
build_type: ${{ inputs.build_type || 'branch' }}
7171
branch: ${{ inputs.branch }}
@@ -85,7 +85,7 @@ jobs:
8585
wheel-publish-pylibcugraph:
8686
needs: wheel-build-pylibcugraph
8787
secrets: inherit
88-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
88+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@manylinux_v2
8989
with:
9090
build_type: ${{ inputs.build_type || 'branch' }}
9191
branch: ${{ inputs.branch }}
@@ -95,7 +95,7 @@ jobs:
9595
wheel-build-cugraph:
9696
needs: wheel-publish-pylibcugraph
9797
secrets: inherit
98-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
98+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@manylinux_v2
9999
with:
100100
build_type: ${{ inputs.build_type || 'branch' }}
101101
branch: ${{ inputs.branch }}
@@ -115,7 +115,7 @@ jobs:
115115
wheel-publish-cugraph:
116116
needs: wheel-build-cugraph
117117
secrets: inherit
118-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
118+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@manylinux_v2
119119
with:
120120
build_type: ${{ inputs.build_type || 'branch' }}
121121
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ jobs:
7878
wheel-build-pylibcugraph:
7979
needs: checks
8080
secrets: inherit
81-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
81+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@manylinux_v2
8282
with:
8383
build_type: pull-request
8484
package-name: pylibcugraph
8585
package-dir: python/pylibcugraph
8686
extra-repo: rapidsai/cugraph-ops
8787
extra-repo-sha: branch-23.06
8888
extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
89-
skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/"
89+
skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=${GITHUB_WORKSPACE}/python/pylibcugraph/cugraph-ops/"
9090
wheel-tests-pylibcugraph:
9191
needs: wheel-build-pylibcugraph
9292
secrets: inherit
93-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
93+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@manylinux_v2
9494
with:
9595
build_type: pull-request
9696
package-name: pylibcugraph
@@ -101,20 +101,20 @@ jobs:
101101
wheel-build-cugraph:
102102
needs: wheel-tests-pylibcugraph
103103
secrets: inherit
104-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
104+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@manylinux_v2
105105
with:
106106
build_type: pull-request
107107
package-name: cugraph
108108
package-dir: python/cugraph
109109
extra-repo: rapidsai/cugraph-ops
110110
extra-repo-sha: branch-23.06
111111
extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
112-
before-wheel: "RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-wheelhouse"
113-
skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/"
112+
before-wheel: "RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph && python -m pip install --no-deps ./local-pylibcugraph/pylibcugraph*.whl"
113+
skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=${GITHUB_WORKSPACE}/python/cugraph/cugraph-ops/"
114114
wheel-tests-cugraph:
115115
needs: wheel-build-cugraph
116116
secrets: inherit
117-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
117+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@manylinux_v2
118118
with:
119119
build_type: pull-request
120120
package-name: cugraph

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
sha: ${{ inputs.sha }}
3333
wheel-tests-pylibcugraph:
3434
secrets: inherit
35-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
35+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@manylinux_v2
3636
with:
3737
build_type: nightly
3838
branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
4444
test-unittest: "RAPIDS_DATASET_ROOT_DIR=./datasets pytest ./python/pylibcugraph/pylibcugraph/tests"
4545
wheel-tests-cugraph:
4646
secrets: inherit
47-
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
47+
uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@manylinux_v2
4848
with:
4949
build_type: nightly
5050
branch: ${{ inputs.branch }}

0 commit comments

Comments
 (0)