Merge branch 'main' into tuan/sparsegpt

.github/workflows/build-nightly.yml

@@ -0,0 +1,22 @@
+name: build-nightly
+run-name: ${{ github.workflow }} is to create nightly wheel file for pypi
+on:
+  push:
+    branches:
+      - 'main'
+  schedule:
+    - cron: '30 0 * * *'
+  workflow_dispatch:
+
+
+jobs:
+
+    BUILD-SPARSEML-NIGHTLY:
+
+      uses: ./.github/workflows/util.yml
+      with:
+        runs_on: ubuntu-22.04
+        run_id: ${{ github.run_id }}
+        build_type: nightly
+        testmo_project_id: 9
+      secrets: inherit

.github/workflows/build-release.yml

@@ -0,0 +1,19 @@
+name: build-release
+run-name: ${{ github.workflow }} is to create release wheel file for pypi
+on:
+  push:
+    branches:
+      - 'release/[0-9]+.[0-9]+'
+    workflow_dispatch:
+
+jobs:
+
+    BUILD-SPARSEML-RELEASE:
+
+      uses: ./.github/workflows/util.yml
+      with:
+        runs_on: ubuntu-22.04
+        run_id: ${{ github.run_id }}
+        build_type: release
+        testmo_project_id: 9
+      secrets: inherit

.github/workflows/util.yml

@@ -0,0 +1,129 @@
+name: report-to-testmo
+on:
+  workflow_call:
+    inputs:
+      runs_on:
+        description: "runner label specifying instance running the job"
+        type: string
+        required: true 
+      run_id:
+        description: "run id provided by GHA"
+        required: true
+        type: string
+      build_type:
+        description: "build type: nightly or release"
+        type: string
+        required: true
+      testmo_project_id:
+        description: "testmo project id"
+        type: string
+        required: true
+
+jobs:
+
+  BUILD:
+    runs-on: ${{ inputs.runs_on }}
+    outputs:
+      status: ${{ steps.build.outputs.status }}
+      commitid: ${{ steps.build.outputs.commitid }}
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+
+      - name: repo checkout
+        uses: actions/checkout@v3
+
+      - name: s3
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.AWS_WEBIDENTITY_FOR_GITHUB_ACTIONS }}
+          aws-region: us-east-1
+
+      - name: build
+        id: build
+        run: |
+             pwd
+             sudo apt-get -y install python3-pip
+             pip3 --version
+             sudo pip3 install virtualenv
+             virtualenv venv
+             source venv/bin/activate
+             pip install -e .
+             if [[ "${{ inputs.build_type }}" = release ]]; then
+                 sed -i 's/is_release = False/is_release = True/g' src/${{ github.event.repository.name }}/version.py
+             fi
+             status=$(make -B build || echo 'FAILED')
+             deactivate
+             echo "=========== Build log ==========="
+             echo "${status}"
+             echo "commitid=${GITHUB_SHA:0:7}" >> "$GITHUB_OUTPUT"
+             echo "=========== Build status ==========="
+             if [[ "${status}" = "FAILED" ]]; then
+                 echo "${{ github.event.repository.name }} build failed"
+                 echo "status=failed" >> "$GITHUB_OUTPUT"
+                 exit 1
+             else
+                 echo "${{ github.event.repository.name }} build success"
+             fi
+             echo "=========== Generated build ==========="
+             ls dist/
+             echo "=========== Copy build to S3 ==========="
+             aws s3 cp dist/*.whl s3://nm-github-actions/${{ github.event.repository.name }}/
+             if [ $? -eq 0 ]; then
+                 echo "ok: copied to s3://nm-github-actions/${{ github.event.repository.name }}/"
+                 echo "status=success" >> "$GITHUB_OUTPUT"
+             else
+                 echo "failed: copied to s3://nm-github-actions/${{ github.event.repository.name }}/"
+                 echo "status=failed" >> "$GITHUB_OUTPUT"
+                 exit 1
+             fi
+             oldDate=`date --date='-2 month' +%Y%m%d`
+             oldWhl=`(aws s3 ls s3://nm-github-actions/${{ github.event.repository.name }}/ | grep nightly | grep "${oldDate}") || echo "notfound"`
+             if [[ "${oldWhl}" != 'notfound' ]]; then
+                 for oldwhl in $(echo "${oldWhl}" | awk '{print $4}')
+                 do
+                     echo "Remove old build ${oldwhl} in S3"
+                     aws s3 rm s3://nm-github-actions/${{ github.event.repository.name }}/${oldwhl}
+                 done
+             fi
+
+  TESTMO:
+    if: success() || failure()
+    needs: BUILD
+    runs-on: ${{ inputs.runs_on }}
+    steps:
+
+      - id: report
+        run: |
+          echo "node: $(node -v)"
+          echo "npm: $(npm -v)"
+          echo "Installing testmo cli..."
+          sudo npm install -g @testmo/testmo-cli    
+          export TESTMO_TOKEN=${{ secrets.TESTMO_TEST_TOKEN }}
+          TESTMO_URL="https://neuralmagic.testmo.net"
+          todaytime=`date +%Y%m%d`
+          name="${{ github.event.repository.name }} ${{ inputs.build_type }} ${todaytime} ${{ needs.BUILD.outputs.commitid }} RunID:${{ inputs.run_id }}"
+          echo "========== Build info ==========="
+          echo "name: ${name}"
+          echo "build status: ${{ needs.BUILD.outputs.status }}"
+          exit_code=1
+          if [[ "${{ needs.BUILD.outputs.status }}" = "success" ]]; then
+              exit_code=0
+          fi
+          echo "<status>${{ needs.BUILD.outputs.status }}</status>" > result.xml
+          echo "echo \"GHA job ${{ needs.BUILD.outputs.status }}: https://github.com/neuralmagic/${{ github.event.repository.name }}/actions/runs/${{ inputs.run_id }}\"; exit ${exit_code}" > result.sh
+          echo "========== Report to testmo ==========="
+          echo "testmo automation:run:submit \\"
+          echo "  --instance ${TESTMO_URL} \\"
+          echo "  --project-id ${{ inputs.testmo_project_id }} \\"
+          echo "  --name ${name} \\"
+          echo "  --source ${{ github.event.repository.name }} \\"
+          echo "  --results result.xml"
+          testmo automation:run:submit \
+                         --instance "${TESTMO_URL}" \
+                         --project-id ${{ inputs.testmo_project_id }} \
+                         --name "${name}" \
+                         --source "${{ github.event.repository.name }}" \
+                         --results result.xml \
+                         -- bash result.sh

src/sparseml/pytorch/sparsification/quantization/helpers.py

@@ -706,7 +706,7 @@ def prepare_embeddings_qat(
     for submodule in module.modules():
         submodule_qconfig = getattr(submodule, "qconfig", None)
         submodule_qconfig = submodule_qconfig or qconfig
-        if type(submodule) is Embedding and submodule_qconfig is not None:
+        if isinstance(submodule, Embedding) and submodule_qconfig is not None:
             _prepare_qat_embedding(submodule, submodule_qconfig)
 
 

src/sparseml/transformers/export.py

@@ -578,6 +578,9 @@ def export(
     data_args: Optional[str] = None,
     one_shot: Optional[str] = None,
 ):
+    if os.path.exists(model_path):
+        # expand to absolute path to support downstream logic
+        model_path = os.path.abspath(model_path)
     export_transformer_to_onnx(
         task=task,
         model_path=model_path,