diff --git a/.github/workflows/wheels-cuda.yaml b/.github/workflows/wheels-cuda.yaml index 258ce0d..650e154 100644 --- a/.github/workflows/wheels-cuda.yaml +++ b/.github/workflows/wheels-cuda.yaml @@ -2,6 +2,11 @@ name: Wheels CUDA on: workflow_dispatch: + inputs: + release_tag: + description: Release tag to upload wheel assets to + required: false + type: string push: tags: - "v*.*.*" @@ -247,7 +252,7 @@ jobs: set -euxo pipefail mkdir -p wheelhouse export LD_LIBRARY_PATH="${CUDA_LIBRARY_PATHS}:${LD_LIBRARY_PATH:-}" - auditwheel repair \ + python -m auditwheel repair \ --exclude libcuda.so \ --exclude libcuda.so.1 \ --exclude libcudart.so.11.0 \ @@ -263,13 +268,13 @@ jobs: dist/*.whl rm dist/*.whl cp wheelhouse/*.whl dist/ - auditwheel show dist/*.whl + python -m auditwheel show dist/*.whl - uses: softprops/action-gh-release@v3 - if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') with: files: dist/* # Set tag_name to -cu. - tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }} + tag_name: ${{ github.event_name == 'workflow_dispatch' && inputs.release_tag || github.ref_name }}-cu${{ env.CUDA_VERSION }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/wheels-rocm.yaml b/.github/workflows/wheels-rocm.yaml index 4d626e1..cd550fa 100644 --- a/.github/workflows/wheels-rocm.yaml +++ b/.github/workflows/wheels-rocm.yaml @@ -3,6 +3,10 @@ name: Wheels ROCm on: workflow_dispatch: inputs: + release_tag: + description: Release tag to upload wheel assets to + required: false + type: string amdgpu_targets: description: AMDGPU targets to compile into the Linux ROCm wheel required: false @@ -81,7 +85,7 @@ jobs: export ROCM_PATH="${ROCM_PATH:-/opt/rocm}" export LD_LIBRARY_PATH="$ROCM_PATH/lib:$ROCM_PATH/lib64:${LD_LIBRARY_PATH:-}" mkdir -p wheelhouse - auditwheel repair \ + python -m auditwheel repair \ --exclude libamdhip64.so \ --exclude libamdhip64.so.6 \ --exclude libamdhip64.so.7 \ @@ -103,7 +107,7 @@ jobs: dist/*.whl rm dist/*.whl cp wheelhouse/*.whl dist/ - auditwheel show dist/*.whl + python -m auditwheel show dist/*.whl - uses: actions/upload-artifact@v7 with: @@ -111,11 +115,11 @@ jobs: path: dist/*.whl - uses: softprops/action-gh-release@v3 - if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') with: files: dist/* # Set tag_name to -rocm. - tag_name: ${{ github.ref_name }}-rocm${{ env.ROCM_VERSION }} + tag_name: ${{ github.event_name == 'workflow_dispatch' && inputs.release_tag || github.ref_name }}-rocm${{ env.ROCM_VERSION }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -248,10 +252,10 @@ jobs: path: dist/*.whl - uses: softprops/action-gh-release@v3 - if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') with: files: dist/* # Set tag_name to -hip-radeon. - tag_name: ${{ github.ref_name }}-hip-${{ matrix.name }} + tag_name: ${{ github.event_name == 'workflow_dispatch' && inputs.release_tag || github.ref_name }}-hip-${{ matrix.name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d664a..7ad6c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- fix(ci): repair accelerator wheel workflow dispatch publishing + ## [0.0.41] - fix(build): reduce duplicate Linux wheel library files by @abetlen in #141