Skip to content

Commit b0f34d8

Browse files
ctuning-adminctuning-admin
authored
Merge pull request #655 from mlcommons/main
sync
2 parents 250ab6c + 3d2520a commit b0f34d8

21 files changed

+145
-128
lines changed

‎.github/workflows/run-individual-script-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
for file in ${{ steps.getfile.outputs.files }}; do
3333
echo $file
3434
done
35-
python3 -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
36-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
35+
python3 -m pip install cmind
36+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
3737
DOCKER_CM_REPO=${{ github.event.pull_request.head.repo.html_url }} DOCKER_CM_REPO_BRANCH=${{ github.event.pull_request.head.ref }} TEST_INPUT_INDEX=${{ matrix.test-input-index }} python3 tests/script/process_tests.py ${{ steps.getfile.outputs.files }}

‎.github/workflows/test-cm-based-submission-generation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
python-version: ${{ matrix.python-version }}
5151
- name: Install dependencies
5252
run: |
53-
python3 -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
54-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
53+
python3 -m pip install cmind
54+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
5555
- name: Pull repo where test cases are uploaded
5656
run: |
5757
git clone -b submission-generation-tests https://github.com/mlcommons/inference.git submission_generation_tests

‎.github/workflows/test-cm-script-features.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
git config --system core.longpaths true
3333
- name: Install dependencies
3434
run: |
35-
python -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
36-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
37-
cm run script --quiet --tags=get,sys-utils-cm
35+
python -m pip install cmind
36+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
37+
cmx run script --quiet --tags=get,sys-utils-cm
3838
- name: Run test_docker on linux
3939
if: runner.os == 'linux'
4040
run: |

‎.github/workflows/test-cm-tutorial-retinanet.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
python-version: ${{ matrix.python-version }}
2929
- name: Install dependencies
3030
run: |
31-
python -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
32-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
33-
cm run script --quiet --tags=get,sys-utils-cm
31+
python -m pip install cmind
32+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
33+
cmx run script --quiet --tags=get,sys-utils-cm
3434
- name: Test CM Tutorial Retinanet
3535
run: |
3636
python script/test-cm-core/src/tutorials/test_tutorial_retinanet.py

‎.github/workflows/test-cm-tutorial-tvm-pip.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Install dependencies
3131
run: |
32-
python -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
33-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
34-
cm run script --quiet --tags=get,sys-utils-cm
32+
python -m pip install cmind
33+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
34+
cmx run script --quiet --tags=get,sys-utils-cm
3535
- name: Test CM Tutorial TVM pip install with VirtualMachine Runtime
3636
run: |
3737
python script/test-cm-core/src/tutorials/test_tutorial_tvm_pip_vm.py
@@ -51,9 +51,9 @@ jobs:
5151
python-version: ${{ matrix.python-version }}
5252
- name: Install dependencies
5353
run: |
54-
python -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
55-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
56-
cm run script --quiet --tags=get,sys-utils-cm
54+
python -m pip install cmind
55+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
56+
cmx run script --quiet --tags=get,sys-utils-cm
5757
- name: Test CM Tutorial TVM pip install with GraphExecutor Runtime
5858
run: |
5959
python script/test-cm-core/src/tutorials/test_tutorial_tvm_pip_ge.py

‎.github/workflows/test-cm-tutorial-tvm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
python-version: ${{ matrix.python-version }}
3131
- name: Install dependencies
3232
run: |
33-
python -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
34-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
35-
cm run script --quiet --tags=get,sys-utils-cm
33+
python -m pip install cmind
34+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
35+
cmx run script --quiet --tags=get,sys-utils-cm
3636
- name: Test CM Tutorial TVM
3737
run: |
3838
python script/test-cm-core/src/tutorials/test_tutorial_tvm.py

‎.github/workflows/test-image-classification-onnx.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
git config --system core.longpaths true
3333
- name: Install dependencies
3434
run: |
35-
python3 -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
36-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
37-
cm run script --quiet --tags=get,sys-utils-cm
35+
python3 -m pip install cmind
36+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
37+
cmx run script --quiet --tags=get,sys-utils-cm
3838
- name: Test image classification with ONNX
3939
run: |
40-
cm run script --tags=python,app,image-classification,onnx --quiet
40+
cmx run script --tags=python,app,image-classification,onnx --quiet

‎.github/workflows/test-mlperf-inference-abtf-poc.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
git config --system core.longpaths true
5454
- name: Install dependencies
5555
run: |
56-
pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
57-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
58-
cm pull repo mlcommons@cm4abtf --branch=poc
56+
pip install cmind
57+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
58+
cmx pull repo mlcommons@cm4abtf --branch=poc
5959
6060
- name: Install Docker on macos
6161
if: runner.os == 'macOS-deactivated'
@@ -112,4 +112,4 @@ jobs:
112112
113113
- name: Test MLPerf Inference ABTF POC using ${{ matrix.backend }} on ${{ matrix.os }}
114114
run: |
115-
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 }} ${{ matrix.docker }} -v
115+
cmx 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 }} ${{ matrix.docker }} --v

‎.github/workflows/test-mlperf-inference-bert-deepsparse-tf-onnxruntime-pytorch.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
python-version: ${{ matrix.python-version }}
3838
- name: Install dependencies
3939
run: |
40-
python3 -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
41-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
40+
python3 -m pip install cmind
41+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
4242
- name: Test MLPerf Inference Bert ${{ matrix.backend }} on ${{ matrix.os }}
4343
if: matrix.os == 'windows-latest'
4444
run: |
45-
cm run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} --model=bert-99 --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=5 --adr.loadgen.tags=_from-pip --pip_loadgen=yes --precision=${{ matrix.precision }} --target_qps=1 -v --quiet
45+
cmx run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} --model=bert-99 --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=5 --adr.loadgen.tags=_from-pip --pip_loadgen=yes --precision=${{ matrix.precision }} --target_qps=1 --v --quiet
4646
- name: Test MLPerf Inference Bert ${{ matrix.backend }} on ${{ matrix.os }}
4747
if: matrix.os != 'windows-latest'
4848
run: |

‎.github/workflows/test-mlperf-inference-mlcommons-cpp-resnet50.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ jobs:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Install dependencies
3636
run: |
37-
python3 -m pip install "cmind @ git+https://git@github.com/mlcommons/ck.git@mlperf-inference#subdirectory=cm"
38-
cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
39-
cm run script --quiet --tags=get,sys-utils-cm
40-
cm run script --quiet --tags=install,prebuilt,llvm --version=${{ matrix.llvm-version }}
37+
python3 -m pip install cmind
38+
cmx pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
39+
cmx run script --quiet --tags=get,sys-utils-cm
40+
cmx run script --quiet --tags=install,prebuilt,llvm --version=${{ matrix.llvm-version }}
4141
- name: Test MLPerf Inference MLCommons C++ ResNet50 on ${{ matrix.os }}
4242
if: matrix.os == 'windows-latest'
4343
run: |
44-
cmr "app mlperf inference mlcommons cpp" --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} --adr.loadgen.tags=_from-pip --pip_loadgen=yes -v --quiet
44+
cmx run script "app mlperf inference mlcommons cpp" --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} --adr.loadgen.tags=_from-pip --pip_loadgen=yes --v --quiet
4545
- name: Test MLPerf Inference MLCommons C++ ResNet50 on ${{ matrix.os }}
4646
if: matrix.os != 'windows-latest'
4747
run: |
48-
cmr "app mlperf inference mlcommons cpp" --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} -v --quiet
48+
cmx run script "app mlperf inference mlcommons cpp" --submitter="MLCommons" --hw_name=gh_${{ matrix.os }} --v --quiet
4949
- name: Push Results
5050
if: github.repository_owner == 'gateoverflow'
5151
env:
@@ -59,4 +59,4 @@ jobs:
5959
git config --global credential.https://github.com.helper "!gh auth git-credential"
6060
git config --global credential.https://gist.github.com.helper ""
6161
git config --global credential.https://gist.github.com.helper "!gh auth git-credential"
62-
cm run script --tags=push,github,mlperf,inference,submission --repo_url=https://github.com/gateoverflow/mlperf_inference_test_submissions_v5.0 --repo_branch=main --commit_message="Results from MLCommons C++ ResNet50 GH action on ${{ matrix.os }}" --quiet
62+
cmx run script --tags=push,github,mlperf,inference,submission --repo_url=https://github.com/gateoverflow/mlperf_inference_test_submissions_v5.0 --repo_branch=main --commit_message="Results from MLCommons C++ ResNet50 GH action on ${{ matrix.os }}" --quiet

0 commit comments

Comments
 (0)