Skip to content

Commit a1e960d

Browse files
Moving wheel builds to specified location and uploading build artifacts to Github (#2617)
This work is towards moving build artifacts from `downloads.rapids.ai` to Github Artifact Store (see rapidsai/ops#2982) As part of these changes, all wheel builds need to be in a specified temporary directory indicated by the environment variable `RAPIDS_WHEEL_BLD_OUTPUT_DIR` set on the `ci-wheel` Docker image used for building wheels. This lets us upload all wheel artifacts seamlessly to Github Artifacts. Authors: - Jaya Venkatesh (https://github.com/VenkateshJaya) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: #2617
1 parent 52eaab5 commit a1e960d

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

.github/workflows/build.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ jobs:
7777
script: ci/build_wheel_libraft.sh
7878
# build for every combination of arch and CUDA version, but only for the latest Python
7979
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
80+
package-type: cpp
81+
wheel-name: libraft
8082
wheel-publish-libraft:
8183
needs: wheel-build-libraft
8284
secrets: inherit
@@ -98,6 +100,8 @@ jobs:
98100
sha: ${{ inputs.sha }}
99101
date: ${{ inputs.date }}
100102
script: ci/build_wheel_pylibraft.sh
103+
package-type: python
104+
wheel-name: pylibraft
101105
wheel-publish-pylibraft:
102106
needs: wheel-build-pylibraft
103107
secrets: inherit
@@ -119,6 +123,8 @@ jobs:
119123
sha: ${{ inputs.sha }}
120124
date: ${{ inputs.date }}
121125
script: ci/build_wheel_raft_dask.sh
126+
package-type: python
127+
wheel-name: raft_dask
122128
wheel-publish-raft-dask:
123129
needs: wheel-build-raft-dask
124130
secrets: inherit

.github/workflows/pr.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,17 @@ jobs:
144144
script: ci/build_wheel_libraft.sh
145145
# build for every combination of arch and CUDA version, but only for the latest Python
146146
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
147+
package-type: cpp
148+
wheel-name: libraft
147149
wheel-build-pylibraft:
148150
needs: [checks, wheel-build-libraft]
149151
secrets: inherit
150152
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
151153
with:
152154
build_type: pull-request
153155
script: ci/build_wheel_pylibraft.sh
156+
package-type: python
157+
wheel-name: pylibraft
154158
wheel-tests-pylibraft:
155159
needs: [wheel-build-pylibraft, changed-files]
156160
secrets: inherit
@@ -166,6 +170,8 @@ jobs:
166170
with:
167171
build_type: pull-request
168172
script: "ci/build_wheel_raft_dask.sh"
173+
package-type: python
174+
wheel-name: raft_dask
169175
wheel-tests-raft-dask:
170176
needs: [wheel-build-raft-dask, changed-files]
171177
secrets: inherit

ci/build_wheel.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ rapids-pip-retry wheel \
5151

5252
sccache --show-adv-stats
5353

54-
mkdir -p final_dist
55-
python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/*
54+
# repair wheels and write to the location that artifact-uploading code expects to find them
55+
python -m auditwheel repair -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" "${EXCLUDE_ARGS[@]}" dist/*
5656

57-
RAPIDS_PY_WHEEL_NAME="${underscore_package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" final_dist
57+
RAPIDS_PY_WHEEL_NAME="${underscore_package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

ci/build_wheel_libraft.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ rapids-pip-retry install \
2727
export PIP_NO_BUILD_ISOLATION=0
2828

2929
ci/build_wheel.sh libraft ${package_dir} cpp
30-
ci/validate_wheel.sh ${package_dir} final_dist
30+
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

ci/build_wheel_pylibraft.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libraft_dist/libraft
1717
export PIP_CONSTRAINT="/tmp/constraints.txt"
1818

1919
ci/build_wheel.sh pylibraft ${package_dir} python
20-
ci/validate_wheel.sh ${package_dir} final_dist
20+
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

ci/build_wheel_raft_dask.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libraft_dist/libraft
1717
export PIP_CONSTRAINT="/tmp/constraints.txt"
1818

1919
ci/build_wheel.sh raft-dask ${package_dir} python
20-
ci/validate_wheel.sh ${package_dir} final_dist
20+
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

0 commit comments

Comments
 (0)