renames to use "nm-"

neuralmagic · Jun 4, 2024 · bbde198 · bbde198
1 parent 7731ec3
commit bbde198
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 128 deletions.
diff --git a/.github/actions/nm-install-test-whl/action.yml b/.github/actions/nm-install-test-whl/action.yml
diff --git a/.github/workflows/nm-benchmark.yml b/.github/workflows/nm-benchmark.yml
@@ -115,25 +115,19 @@ jobs:
         with:
           fs_cache: ${{ secrets.HF_FS_CACHE }}
 
-    #   - name: download whl
-    #     id: download
-    #     uses: actions/download-artifact@v4
-    #     with:
-    #       name: ${{ inputs.whl }}
-    #       path: ${{ inputs.whl }}
-
-    #   - name: install whl
-    #     id: install_whl
-    #     uses: ./.github/actions/nm-install-whl/
-    #     with:
-    #         python: ${{ inputs.python }}
-    #         venv:
+      - name: download whl
+        id: download
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.whl }}
+          path: ${{ inputs.whl }}
 
       - name: install whl
-        run: |
-            pip install --extra-index-url https://pypi.neuralmagic.com/simple nm-vllm
-            mv vllm vllm-ignore  || echo "no 'vllm' folder to move"
-            mv csrc csrc-ignore  || echo "no 'csrc' folder to move"
+        id: install_whl
+        uses: ./.github/actions/nm-install-whl/
+        with:
+            python: ${{ inputs.python }}
+            venv:
 
       - name: run benchmarks
         uses: ./.github/actions/nm-benchmark/
@@ -143,10 +137,6 @@ jobs:
           python: ${{ inputs.python }}
           venv:
 
-      - name: take a look
-        run: |
-            ls -al benchmark-results
-
       - name: store benchmark result artifacts
         if: success()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/nm-build-test.yml b/.github/workflows/nm-build-test.yml
@@ -70,7 +70,7 @@ on:
 jobs:
 
     BUILD:
-        uses: ./.github/workflows/build.yml
+        uses: ./.github/workflows/nm-build.yml
         with:
             wf_category: ${{ inputs.wf_category }}
             build_label: ${{ inputs.build_label }}
@@ -84,7 +84,7 @@ jobs:
     TEST-SOLO:
         needs: [BUILD]
         if: success()
-        uses: ./.github/workflows/test.yml
+        uses: ./.github/workflows/nm-test.yml
         with:
             test_label: ${{ inputs.test_label_solo }}
             timeout: ${{ inputs.test_timeout }}
@@ -97,7 +97,7 @@ jobs:
     TEST-MULTI:
         needs: [BUILD]
         if: success() && contains(fromJSON('["NIGHTLY", "WEEKLY", "RELEASE"]'), inputs.wf_category)
-        uses: ./.github/workflows/test.yml
+        uses: ./.github/workflows/nm-test.yml
         with:
             test_label: ${{ inputs.test_label_multi }}
             timeout: ${{ inputs.test_timeout }}

diff --git a/.github/workflows/nm-nightly.yml b/.github/workflows/nm-nightly.yml
@@ -18,7 +18,7 @@ on:
 jobs:
 
     PYTHON-3-8:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             wf_category: NIGHTLY
             python: 3.8.17
@@ -36,7 +36,7 @@ jobs:
         secrets: inherit
 
     PYTHON-3-9:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             wf_category: NIGHTLY
             python: 3.9.17
@@ -54,7 +54,7 @@ jobs:
         secrets: inherit
 
     PYTHON-3-10:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             wf_category: NIGHTLY
             python: 3.10.12
@@ -72,7 +72,7 @@ jobs:
         secrets: inherit
 
     PYTHON-3-11:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             wf_category: NIGHTLY
             python: 3.11.4

diff --git a/.github/workflows/nm-release.yml b/.github/workflows/nm-release.yml
@@ -14,7 +14,7 @@ on:
 jobs:
 
   PYTHON-3-8:
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/nm-build-test.yml
     with:
       wf_category: 'RELEASE'
       python: 3.8.17
@@ -32,7 +32,7 @@ jobs:
     secrets: inherit
 
   PYTHON-3-9:
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/nm-build-test.yml
     with:
       wf_category: 'RELEASE'
       python: 3.9.17
@@ -50,7 +50,7 @@ jobs:
     secrets: inherit
 
   PYTHON-3-10:
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/nm-build-test.yml
     with:
       wf_category: 'RELEASE'
       python: 3.10.12
@@ -68,7 +68,7 @@ jobs:
     secrets: inherit
 
   PYTHON-3-11:
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/nm-build-test.yml
     with:
       wf_category: 'RELEASE'
       python: 3.11.4

diff --git a/.github/workflows/nm-remote-push.yml b/.github/workflows/nm-remote-push.yml
@@ -13,7 +13,7 @@ concurrency:
 jobs:
 
     BUILD-TEST-3-8:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             python: 3.8.17
             gitref: ${{ github.ref }}
@@ -29,7 +29,7 @@ jobs:
         secrets: inherit
 
     BUILD-TEST-3-9:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             python: 3.9.17
             gitref: ${{ github.ref }}
@@ -45,7 +45,7 @@ jobs:
         secrets: inherit
 
     BUILD-TEST-3-10:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             python: 3.10.12
             gitref: ${{ github.ref }}
@@ -61,7 +61,7 @@ jobs:
         secrets: inherit
 
     BUILD-TEST-3-11:
-        uses: ./.github/workflows/build-test.yml
+        uses: ./.github/workflows/nm-build-test.yml
         with:
             python: 3.11.4
             gitref: ${{ github.ref }}

diff --git a/.github/workflows/nm-test-accuracy-full.yml b/.github/workflows/nm-test-accuracy-full.yml
@@ -1,4 +1,4 @@
-name: nm-test-accuracy-full
+name: nm test accuracy full
 on:
   # makes workflow reusable
   workflow_call:

diff --git a/.github/workflows/nm-test-accuracy-smoke.yml b/.github/workflows/nm-test-accuracy-smoke.yml
@@ -1,4 +1,4 @@
-name: nm-test-accuracy-smoke
+name: nm test accuracy smoke
 on:
   # makes workflow reusable
   workflow_call:

diff --git a/.github/workflows/nm-test.yml b/.github/workflows/nm-test.yml
@@ -128,13 +128,6 @@ jobs:
                 python: ${{ inputs.python }}
                 venv:
 
-            # TODO: DELETE
-            # - name: install from pypi
-            #   run: |
-            #     mv vllm vllm-ignore
-            #     mv csrc csrc-ignore
-            #     pip3 install --extra-index-url https://pypi.neuralmagic.com/simple nm-vllm[sparse]
-
             - name: run buildkite script
               run: |
                 cd tests && sudo bash ../.buildkite/download-images.sh
@@ -147,18 +140,6 @@ jobs:
                 test_directory: tests
                 test_results: test-results
 
-            # TODO: DELETE
-            # - name: install and test whl
-            #   id: test
-            #   uses: ./.github/actions/nm-install-test-whl/
-            #   with:
-            #     pypi: ${{ secrets.NM_PRIVATE_PYPI_LOCATION }}
-            #     python: ${{ inputs.python }}
-            #     venv:
-            #     test_skip_list: ${{ inputs.test_skip_list }}
-            #     test_directory: tests
-            #     test_results: test-results
-
             - name: upload code coverage html
               uses: actions/upload-artifact@v4
               if: success() || failure()

diff --git a/.github/workflows/nm-weekly.yml b/.github/workflows/nm-weekly.yml
@@ -18,7 +18,7 @@ on:
 jobs:
 
   BUILD-TEST:
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/nm-build-test.yml
     with:
       wf_category: WEEKLY
       python: 3.10.12