From cf44ca56912737af5d704abb2f1ffe79708c0b2f Mon Sep 17 00:00:00 2001 From: dhuang Date: Mon, 25 Mar 2024 12:02:25 -0400 Subject: [PATCH 1/3] rebase --- .github/actions/nm-build-vllm-whl/action.yml | 16 +++++++++++++++- .github/actions/nm-whl-summary/action.yml | 4 ++++ .github/workflows/build-whl.yml | 7 ++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/actions/nm-build-vllm-whl/action.yml b/.github/actions/nm-build-vllm-whl/action.yml index f83b8135e4938..876dcd41d20a5 100644 --- a/.github/actions/nm-build-vllm-whl/action.yml +++ b/.github/actions/nm-build-vllm-whl/action.yml @@ -14,6 +14,12 @@ outputs: whl: description: 'basename for generated whl' value: ${{ steps.whl.outputs.whl }} + tarball: + description: 'basename for generated tarball' + value: ${{ steps.whl.outputs.tarball }} + artifact: + description: 'artifact name' + value: ${{ steps.whl.outputs.artifact }} runs: using: composite steps: @@ -24,11 +30,19 @@ runs: source $(pyenv root)/versions/${{ inputs.python }}/envs/${VENV}/bin/activate SUCCESS=0 pip3 wheel --no-deps -w dist . || SUCCESS=$? - echo "status=${SUCCESS}" >> "$GITHUB_OUTPUT" ls -alh dist/ BASE=$(./.github/scripts/convert-version ${{ inputs.python }}) WHL_FILEPATH=$(find dist -iname "*nm_vllm*${BASE}*.whl") WHL=$(basename ${WHL_FILEPATH}) echo "whl=${WHL}" >> "$GITHUB_OUTPUT" + # generate .tar.gz + $SUCCESS || python3 setup.py sdist bdist_wheel || SUCCESS=$? + ls -alh dist/ + TARBALL_FILEPATH=$(find dist -iname "*nm-vllm*.tar.gz") + TARBALL=$(basename ${TARBALL_FILEPATH}) + echo "status=${SUCCESS}" >> "$GITHUB_OUTPUT" + echo "tarball=${TARBALL}" >> "$GITHUB_OUTPUT" + ARTIFACT=`echo "${WHL}" | sed 's/.whl//g'` + echo "artifact=${ARTIFACT}" >> "$GITHUB_OUTPUT" exit ${SUCCESS} shell: bash diff --git a/.github/actions/nm-whl-summary/action.yml b/.github/actions/nm-whl-summary/action.yml index 8a84fc1d1fe19..d784c60dd15e6 100644 --- a/.github/actions/nm-whl-summary/action.yml +++ b/.github/actions/nm-whl-summary/action.yml @@ -16,6 +16,9 @@ inputs: whl: description: 'whl file tested' required: true + tarball: + description: 'tar.gz file tested' + required: true runs: using: composite steps: @@ -34,4 +37,5 @@ runs: echo "| branch name: | '${{ github.ref_name }}' |" >> $GITHUB_STEP_SUMMARY echo "| python: | ${{ inputs.python }} |" >> $GITHUB_STEP_SUMMARY echo "| whl: | ${{ inputs.whl }} |" >> $GITHUB_STEP_SUMMARY + echo "| tarball: | ${{ inputs.tarball }} |" >> $GITHUB_STEP_SUMMARY shell: bash diff --git a/.github/workflows/build-whl.yml b/.github/workflows/build-whl.yml index dfbffac6e177e..ec6b99b07c5d1 100644 --- a/.github/workflows/build-whl.yml +++ b/.github/workflows/build-whl.yml @@ -113,12 +113,12 @@ jobs: python: ${{ inputs.python }} venv: ${{ env.VENV_BUILD_BASE }} - - name: upload whl + - name: upload dist uses: actions/upload-artifact@v4 if: success() || failure() with: - name: ${{ steps.build_whl.outputs.whl }} - path: dist/${{ steps.build_whl.outputs.whl }} + name: ${{ steps.build_whl.outputs.artifact }} + path: dist/ retention-days: 15 - name: summary @@ -129,6 +129,7 @@ jobs: testmo_run_url: https://neuralmagic.testmo.net/automation/runs/view/${{ steps.create_testmo_run.outputs.id }} python: ${{ inputs.python }} whl: ${{ steps.build_whl.outputs.whl }} + tarball: ${{ steps.build_whl.outputs.tarball }} - name: complete testmo run uses: ./.github/actions/nm-testmo-run-complete/ From e913b0322611469b705b7988f059f16aed236910 Mon Sep 17 00:00:00 2001 From: dhuang Date: Mon, 25 Mar 2024 15:51:17 -0400 Subject: [PATCH 2/3] don't repeat wheel generation --- .github/actions/nm-build-vllm-whl/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/nm-build-vllm-whl/action.yml b/.github/actions/nm-build-vllm-whl/action.yml index 876dcd41d20a5..183cbbf2aa931 100644 --- a/.github/actions/nm-build-vllm-whl/action.yml +++ b/.github/actions/nm-build-vllm-whl/action.yml @@ -36,7 +36,7 @@ runs: WHL=$(basename ${WHL_FILEPATH}) echo "whl=${WHL}" >> "$GITHUB_OUTPUT" # generate .tar.gz - $SUCCESS || python3 setup.py sdist bdist_wheel || SUCCESS=$? + $SUCCESS || python3 setup.py sdist || SUCCESS=$? ls -alh dist/ TARBALL_FILEPATH=$(find dist -iname "*nm-vllm*.tar.gz") TARBALL=$(basename ${TARBALL_FILEPATH}) From ffa3c7d2e8139237aa89138d5b24845cbed6585e Mon Sep 17 00:00:00 2001 From: dhuang Date: Thu, 28 Mar 2024 12:29:39 -0400 Subject: [PATCH 3/3] address comment --- .github/actions/nm-build-vllm-whl/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/nm-build-vllm-whl/action.yml b/.github/actions/nm-build-vllm-whl/action.yml index 183cbbf2aa931..1f382ff2e3aae 100644 --- a/.github/actions/nm-build-vllm-whl/action.yml +++ b/.github/actions/nm-build-vllm-whl/action.yml @@ -36,7 +36,7 @@ runs: WHL=$(basename ${WHL_FILEPATH}) echo "whl=${WHL}" >> "$GITHUB_OUTPUT" # generate .tar.gz - $SUCCESS || python3 setup.py sdist || SUCCESS=$? + (exit $SUCCESS) && (python3 setup.py sdist) || SUCCESS=$? ls -alh dist/ TARBALL_FILEPATH=$(find dist -iname "*nm-vllm*.tar.gz") TARBALL=$(basename ${TARBALL_FILEPATH})