Merge pull request #475 from mlcommons/anandhu-eng-patch-4

Code cleanup
mlcommons · Nov 4, 2024 · a8082e1 · a8082e1
2 parents 30ca2bc + b206baf
commit a8082e1
Showing 1 changed file with 14 additions and 54 deletions.
diff --git a/.github/workflows/test-mlperf-inference-abtf-poc.yml b/.github/workflows/test-mlperf-inference-abtf-poc.yml
@@ -16,13 +16,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-24.04]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-24.04, macos-latest, macos-13, windows-latest]
         python-version: [ "3.8", "3.12" ]
         backend: [ "pytorch" ]
         implementation: [ "python" ]
+        extra-args: [ "--adr.compiler.tags=gcc" ]
         exclude:
         - os: ubuntu-24.04
           python-version: "3.8"
+        - os: windows-latest
+          python-version: "3.8"
+        - os: windows-latest
+          extra-args: "--adr.compiler.tags=gcc" 
+        - os: macos-latest
+          python-version: "3.8"
+        - os: macos-13
+          python-version: "3.8"
+        include:
+          - os: windows-latest
+            extra-args: "--env.CM_MLPERF_LOADGEN_BUILD_FROM_SRC=off"
 
     steps:
     - uses: actions/checkout@v3
@@ -35,58 +47,6 @@ jobs:
         pip install cmind
         cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
         cm pull repo mlcommons@cm4abtf --branch=poc
-    - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on docker
-      run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.compiler.tags=gcc --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet  -v
-
-  build2:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, macos-13]
-        python-version: [ "3.12" ]
-        backend: [ "pytorch" ]
-        implementation: [ "python" ]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python3 -m pip install cmind
-        cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
-        cm pull repo mlcommons@cm4abtf --branch=poc
-    - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on ${{ matrix.os }}
-      run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.compiler.tags=gcc --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet  -v
-    
-  build3:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        python-version: [ "3.12" ]
-        backend: [ "pytorch" ]
-        implementation: [ "python" ]
-        exclude:
-        - python-version: "3.8"
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python3 -m pip install cmind
-        cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
-        cm pull repo mlcommons@cm4abtf --branch=poc
     - name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on ${{ matrix.os }}
       run: |
-        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --quiet --env.CM_MLPERF_LOADGEN_BUILD_FROM_SRC=off --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7  -v
+        cm run script --tags=run-abtf,inference,_poc-demo --test_query_count=2 --adr.cocoeval.version_max=1.5.7 --adr.cocoeval.version_max_usable=1.5.7 --quiet ${{ matrix.extra-args }} -v