Merge branch 'main' into interface-framework-onnx

Author: markurtz

.github/workflows/merge-test.yaml

@@ -1,10 +1,19 @@
-name: Pull Request Tests
-on: pull_request
+name: Test Checks
+on: 
+  push:
+    branches:
+      - main
+      - 'release/*'
+  pull_request:
+    branches:
+      - main
+      - 'release/*'
 
 jobs:
-  diff-check:
+  test-setup:
     runs-on: ubuntu-18.04
     outputs:
+      branch: ${{ steps.get-branch.outputs.branch }}
       base: ${{ steps.base-check.outputs.output }}
       deepsparse: ${{ steps.deepsparse-check.outputs.output }}
       keras: ${{ steps.keras-check.outputs.output }}
@@ -15,46 +24,60 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - run: git branch --show-current
+      - name: Get current branch
+        id: get-branch
+        run: >
+          (git branch --show-current | grep -E "release/")
+          && echo "::set-output name=branch::$(git branch --show-current)"
+          || echo "::set-output name=branch::main"
       - name: "Checking if sparseml was changed"
         id: base-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
       - name: "Checking if sparseml.deepsaprse was changed"
         id: deepsparse-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/deepsparse|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/deepsparse|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
       - name: "Checking if sparseml.keras was changed"
         id: keras-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/keras|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/keras|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
       - name: "Checking if sparseml.onnx was changed"
         id: onnx-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/onnx|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/onnx|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
       - name: "Checking if sparseml.pytorch was changed"
         id: pytorch-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/pytorch|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/pytorch|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
       - name: "Checking if sparseml.tensorflow_v1 was changed"
         id: tensorflow_v1-check
         run: >
-          (git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/tensorflow_v1|setup.py")
+          ((git diff --name-only origin/main HEAD | grep -E "[src|tests]/sparseml/tensorflow_v1|setup.py")
+          || (echo $GITHUB_REF | grep -E "refs/heads/[release/|main]"))
           && echo "::set-output name=output::1" || echo "::set-output name=output::0"
   base-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if: ${{needs.diff-check.outputs.base == 1}}
+    needs: test-setup
+    if: ${{needs.test-setup.outputs.base == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"
@@ -65,14 +88,15 @@ jobs:
         run: make test
   deepsparse-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if: ${{needs.diff-check.outputs.deepsparse == 1}}
+    needs: test-setup
+    if: ${{needs.test-setup.outputs.deepsparse == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"
@@ -83,14 +107,15 @@ jobs:
         run: make test TARGETS=deepsparse
   keras-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if:  ${{needs.diff-check.outputs.keras == 1}}
+    needs: test-setup
+    if:  ${{needs.test-setup.outputs.keras == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"
@@ -101,14 +126,15 @@ jobs:
         run: make test TARGETS=keras
   onnx-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if: ${{needs.diff-check.outputs.onnx == 1}}
+    needs: test-setup
+    if: ${{needs.test-setup.outputs.onnx == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"
@@ -119,14 +145,15 @@ jobs:
         run: make test TARGETS=onnx
   pytorch-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if: ${{needs.diff-check.outputs.pytorch == 1}}
+    needs: test-setup
+    if: ${{needs.test-setup.outputs.pytorch == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"
@@ -137,14 +164,15 @@ jobs:
         run: make test TARGETS=pytorch
   tensorflow-v1-tests:
     runs-on: ubuntu-18.04
-    needs: diff-check
-    if:  ${{needs.diff-check.outputs.tensorflow_v1 == 1}}
+    needs: test-setup
+    if:  ${{needs.test-setup.outputs.tensorflow_v1 == 1}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
           repository: "neuralmagic/sparsezoo"
           path: "sparsezoo"
+          ref: ${{needs.test-setup.outputs.branch}}
       - name: "⚙️ Install sparsezoo dependencies"
         run: pip3 install -U pip && pip3 install setuptools sparsezoo/
       - name: "Clean sparsezoo directory"

.github/workflows/pull-request-test.yaml .github/workflows/test-check.yaml.github/workflows/pull-request-test.yaml renamed to .github/workflows/test-check.yaml

@@ -25,8 +25,8 @@ limitations under the License.
     <a href="https://github.com/neuralmagic/sparseml/actions/workflows/quality-check.yaml">
         <img alt="Quality Check" src="https://img.shields.io/github/workflow/status/neuralmagic/sparseml/Quality%20Checks/main?label=Quality%20Checks&style=for-the-badge" height=25>
     </a>
-    <a href="https://github.com/neuralmagic/sparseml/actions/workflows/merge-test.yaml">
-        <img alt="Main" src="https://img.shields.io/github/workflow/status/neuralmagic/sparseml/Merge%20Tests/main?style=for-the-badge" height=25>
+    <a href="https://github.com/neuralmagic/sparseml/actions/workflows/test-check.yaml">
+        <img alt="Main" src="https://img.shields.io/github/workflow/status/neuralmagic/sparseml/Test%20Checks/main?label=Main&style=for-the-badge" height=25>
     </a>
 </p>
 <p>

README.md

@@ -76,9 +76,9 @@ def download_model_and_recipe(root_dir: str):
         repo="sparseml",
         dataset="cifar_10",
         training_scheme=None,
-        optim_name="base",
-        optim_category="none",
-        optim_target=None,
+        sparse_name="base",
+        sparse_category="none",
+        sparse_target=None,
         override_parent_path=model_dir,
     )
     base_zoo_model.download()

integrations/keras/prune_resnet20.py

@@ -280,7 +280,7 @@
     "    framework=\"pytorch\",\n",
     "    repo=\"torchvision\",\n",
     "    dataset=\"imagenette\",\n",
-    "    optim_name=\"pruned\",\n",
+    "    sparse_name=\"pruned\",\n",
     ")[0]  # unwrap search result\n",
     "recipe.download()\n",
     "recipe_path = recipe.downloaded_path()\n",