build-input-dep-whl: cleanup (#121)

- fix input descriptions
- remove unused inputs
- use generic `WHL_FILE`, `SDIST_FILE` as env-var outputs

Author: dtrifiro

.github/actions/build-xformers/action.yml

@@ -15,5 +15,5 @@ runs:
       # shellcheck disable=SC1091
       source "${VENV}/bin/activate"
 
-      bash "$(dirname "$0")/build_xformers.sh" || (echo "xformers build failed" >&2 && exit 1)
+      bash ${{ github.action_path }}/build_xformers.sh" || (echo "xformers build failed" >&2 && exit 1)
     shell: bash

.github/actions/build-xformers/build_xformers.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 # this sets the following github actions env vars:
-#  - xformers_whl
-#  - xformers_tarfile
+#  - WHL_FILE
+#  - SDIST_FILE
+#  - WHL_STATUS
 set -eu
 
 # FIXME: this should be in the base runner image
@@ -24,7 +25,7 @@ SUCCESS=0
 uv build --wheel --sdist --no-build-isolation || SUCCESS=$?
 sccache --show-stats
 
-echo "xformers_whl_status=${SUCCESS}" | tee -a "$GITHUB_ENV"
+echo "WHL_STATUS=${SUCCESS}" | tee -a "$GITHUB_ENV"
 
 if [ ${SUCCESS} -ne 0 ]; then
 	exit 1
@@ -35,5 +36,5 @@ uv run --pre --no-project --with wheel-metadata-injector wheel-metadata-injector
 
 XFORMERS_TARFILE="$(find dist -type f -iname "*\.tar.gz" -exec basename {} \;)"
 
-echo "xformers_whl=${XFORMERS_WHL}" | tee -a "$GITHUB_ENV"
-echo "xformers_tarfile=${XFORMERS_TARFILE}" | tee -a "$GITHUB_ENV"
+echo "WHL_FILE=${XFORMERS_WHL}" | tee -a "$GITHUB_ENV"
+echo "SDIST_FILE=${XFORMERS_TARFILE}" | tee -a "$GITHUB_ENV"

.github/workflows/build-input-dep-whl.yml

@@ -63,7 +63,7 @@ on:
         type: string
         required: true
       repo:
-        description: "REPO to build, e.g. 'nm-vllm-ent'"
+        description: "REPO to build, e.g. 'facebookresearch/xformers'"
         type: string
         required: true
       branch:
@@ -74,8 +74,8 @@ on:
         description: "python version, e.g. 3.12.5"
         type: string
         default: 3.12.5
-      partitions_file:
-        description: "file defining the test partitions"
+      package_name:
+        description: "package name, e.g. 'xformers'"
         type: string
         required: true
       target_device:
@@ -116,6 +116,12 @@ jobs:
       tarfile: fromJSON(${{ steps.build.outputs.outputs }}).tarfile
 
     steps:
+    - name: checkout nm-cicd
+      id: checkout-nm-cicd
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.gitref }}
+
     - name: checkout ${{ inputs.repo }}
       id: checkout-repo
       uses: actions/checkout@v4
@@ -124,7 +130,7 @@ jobs:
         ref: ${{ inputs.branch }}
         fetch-depth: 0
         token: ${{ secrets.CICD_GITHUB_PAT }}
-        path: ${{ inputs.repo }}
+        path: ${{ env.CLIENT_PATH }}
         submodules: recursive
 
     - name: 'Authenticate to Google Cloud'
@@ -163,26 +169,33 @@ jobs:
 
     - name: copy whl and source distribution
       run: |
-        assets_base="gs://nm-vllm-certs/${{inputs.package_name}}/assets/${RUN_ID}"
-        gcloud storage cp "${DIST_PATH}/${whl}" "${assets_base}/${whl}"
-        gcloud storage cp "${DIST_PATH}/${tarfile}" "${assets_base}/${tarfile}"
-      env:
-        RUN_ID: ${{github.run_id}}
+        if [[ -z "${WHL_FILE}" || -z "${SDIST_FILE}" ]]; then
+          echo "::error::WHL_FILE or SDIST_FILE are not set"
+          exit 1
+        fi
+
+        assets_base="gs://nm-vllm-certs/${{inputs.repo}}/assets/${GITHUB_RUN_ID}"
+        echo "Copying sdist and whl to ${assets_base}"
+        echo "sdist=${DIST_PATH}/${SDIST_FILE}"
+        echo "whl=${DIST_PATH}/${WHL_FILE}"
+
+        gcloud storage cp "${DIST_PATH}/${WHL_FILE}" "${assets_base}/${whl}"
+        gcloud storage cp "${DIST_PATH}/${SDIST_FILE}" "${assets_base}/${tarfile}"
 
     - name: upload whl
       uses: actions/upload-artifact@v4
       if: success() || failure()
       with:
-        name: ${{ env.whl }}
-        path: ${{ env.DIST_PATH }}/${{ env.whl }}
+        name: ${{ env.WHL_FILE }}
+        path: ${{ env.DIST_PATH }}/${{ env.WHL_FILE }}
         retention-days: 5
 
     - name: upload tar.gz
       uses: actions/upload-artifact@v4
       if: success() || failure()
       with:
-        name: ${{ inputs.python }}-${{ env.tarfile }}
-        path: ${{ env.DIST_PATH }}/${{ env.tarfile }}
+        name: ${{ inputs.python }}-${{ env.SDIST_FILE }}
+        path: ${{ env.DIST_PATH }}/${{ env.SDIST_FILE }}
         retention-days: 5
 
     - name: summary
@@ -195,14 +208,11 @@ jobs:
         repo: ${{ inputs.repo }}
         branch: ${{ inputs.branch }}
         python: ${{ inputs.python }}
-        whl_status: ${{ steps.build.outputs.whl_status }}
+        whl_status: ${{ env.WHL_STATUS }}}
 
     - name: run status
       id: run_status
       if: success() || failure()
-      env:
-        BUILD_STATUS: ${{ env.whl_status }}
-        WHL_STATUS: ${{ env.whl_status }}
       run: |
         echo "build status: ${WHL_STATUS}"
         if [ -z "${WHL_STATUS}" ] || [ "${WHL_STATUS}" -ne "0" ]; then exit 1; fi