Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #261 partially #426

Merged
merged 85 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
cc3d251
Updated fix for tests
Oseltamivir Oct 28, 2024
5e9c03c
Merge branch 'main' into main
arjunsuresh Oct 29, 2024
7cf27c6
Merge branch 'main' into main
arjunsuresh Oct 30, 2024
8686d81
Merge branch 'main' into main
arjunsuresh Oct 31, 2024
23d692b
- fixed regex for md5sum, pstree, and bzcat which caused failed tests
Oseltamivir Oct 31, 2024
6723d2c
- fixed an annoying psmisc/pstree bug
Oseltamivir Oct 31, 2024
737024b
- changed to use env var to detect stderr, fixed some regexes
Oseltamivir Nov 1, 2024
ffa3966
Use raw string in build-docker-image
arjunsuresh Nov 1, 2024
8f971e7
Merge remote-tracking branch 'upstream/main'
Oseltamivir Nov 2, 2024
6d9d675
Change numactl command to be more inclusive libnuma-dev => libnuma
Oseltamivir Nov 2, 2024
f1f084d
Added sympy dependency for retinanet
arjunsuresh Nov 2, 2024
b9eb3d7
Update _cm.json | Fix libnuma re
arjunsuresh Nov 2, 2024
3486ef9
Update default-config.yaml
arjunsuresh Nov 2, 2024
f1010d6
pstree regex change to be more lax for brew version
Oseltamivir Nov 2, 2024
8fef3ed
Added CM_TMP_VERSION_DETECT_GROUP_NUMBER for all packages
Oseltamivir Nov 3, 2024
7da8b3e
Update _cm.json
arjunsuresh Nov 3, 2024
53b1f7a
Update _cm.json
arjunsuresh Nov 3, 2024
9e39642
Update _cm.json
arjunsuresh Nov 3, 2024
6859606
change g++/gcc regex
Oseltamivir Nov 3, 2024
646252a
Update _cm.json
arjunsuresh Nov 3, 2024
90d17f0
Added pkg-config deps for get-generic-sys-util
arjunsuresh Nov 3, 2024
1f96160
Added pkg-config deps for get-generic-sys-util
arjunsuresh Nov 3, 2024
26f9eb3
Added pkg-config deps for get-generic-sys-util
arjunsuresh Nov 3, 2024
57b659a
Added pkg-config deps for get-generic-sys-util
arjunsuresh Nov 3, 2024
f049765
Added pkg-config deps for get-generic-sys-util
arjunsuresh Nov 3, 2024
d1f984b
Merge pull request #464 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
a71107f
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
5e02bad
Update _cm.json
arjunsuresh Nov 3, 2024
f7ccd2c
Fix pstree version detection on macos
arjunsuresh Nov 3, 2024
af72c65
Merge branch 'mlcommons:mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
81e7e16
Merge pull request #466 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
7f57b23
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
c0e92ac
Fix pstree version detection on macos
arjunsuresh Nov 3, 2024
699d542
Merge branch 'mlcommons:mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
5df4e4a
Update _cm.json
arjunsuresh Nov 3, 2024
93e8d94
Update _cm.json | Dont do version check for numactl
arjunsuresh Nov 3, 2024
68fec07
Update _cm.json
arjunsuresh Nov 3, 2024
00f3d26
Remove version detection for libffi
arjunsuresh Nov 3, 2024
bc9e102
Fix onnx version for nvidia mlperf inference retinanet
arjunsuresh Nov 3, 2024
fa071a0
Fix pstree version detect on macos
arjunsuresh Nov 3, 2024
62fe3a6
Fix version check for get-generic-sys-util install failures
arjunsuresh Nov 3, 2024
12b70e6
Fix version detection only for install mode
arjunsuresh Nov 3, 2024
0fe209f
Merge pull request #468 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
95ab4cc
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
9711d26
Support detached mode for nvidia-mlperf-inference-gptj
arjunsuresh Nov 3, 2024
104c711
Merge branch 'mlcommons:mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
da413c7
Merge pull request #469 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
1d24385
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
4d7195b
Cleanup for get-generic-sys-util
arjunsuresh Nov 3, 2024
17632f9
Merge branch 'mlcommons:mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
92391b3
Cleanup for get-generic-sys-util
arjunsuresh Nov 3, 2024
196c9b8
No version detection for psmisc
arjunsuresh Nov 3, 2024
f525195
No version detection for psmisc
arjunsuresh Nov 3, 2024
695897b
Merge pull request #470 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
36c4bf8
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
94ac51c
Fix tmp-run-env.out name
arjunsuresh Nov 3, 2024
5738432
Merge branch 'mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
b244d7b
Merge pull request #471 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
b1e4fc4
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
2da6bef
Update _cm.json | Fix bzip2 version cmd
arjunsuresh Nov 3, 2024
000a799
Fix tmp-run-env.out name
arjunsuresh Nov 3, 2024
4795f0b
Skip g++11 version detection for ubuntu 20.04
arjunsuresh Nov 3, 2024
c0823fa
Merge branch 'mlperf-inference' into mlperf-inference
arjunsuresh Nov 3, 2024
dd2c715
Skip g++11 version detection for ubuntu 20.04
arjunsuresh Nov 3, 2024
f1c9e31
Skip g++11 version detection for ubuntu 20.04
arjunsuresh Nov 3, 2024
4f7cfce
Merge pull request #472 from GATEOverflow/mlperf-inference
arjunsuresh Nov 3, 2024
185a88e
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 3, 2024
9990d98
Update _cm.json
arjunsuresh Nov 3, 2024
432a6ed
Remove version detect for libnuma-dev
arjunsuresh Nov 3, 2024
4478fde
Use berkeley link for imagenet-aux by default
arjunsuresh Nov 3, 2024
16578be
Merge branch 'mlperf-inference' into mlperf-inference
arjunsuresh Nov 4, 2024
30ca2bc
Merge pull request #473 from GATEOverflow/mlperf-inference
arjunsuresh Nov 4, 2024
eb45fce
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 4, 2024
c54eaaa
Remove ntpdate version detect
arjunsuresh Nov 4, 2024
9739faf
Update _cm.json
arjunsuresh Nov 4, 2024
3c7904b
Update _cm.json
arjunsuresh Nov 4, 2024
9501b18
Update _cm.json | Remove failing version detects
arjunsuresh Nov 4, 2024
c9edada
Removed pkg detection from pkg_config
arjunsuresh Nov 4, 2024
6385998
Update _cm.json
arjunsuresh Nov 4, 2024
cb0c19a
Generalised the code
anandhu-eng Nov 4, 2024
b206baf
split exclude condition
anandhu-eng Nov 4, 2024
a8082e1
Merge pull request #475 from mlcommons/anandhu-eng-patch-4
arjunsuresh Nov 4, 2024
16a88af
Rename README.md to README-extra.md
arjunsuresh Nov 4, 2024
961c6fe
Merge branch 'mlperf-inference' into main
arjunsuresh Nov 4, 2024
8470530
Update module.py
arjunsuresh Nov 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 14 additions & 54 deletions .github/workflows/test-mlperf-inference-abtf-poc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
3 changes: 1 addition & 2 deletions automation/script/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# TBD: when we have bandwidth and resources, we should refactor it
# and make it cleaner and simpler while keeping full backwards compatibility.
#

import os
import logging

Expand Down Expand Up @@ -3979,7 +3978,7 @@ def parse_version(self, i):
return r

string = r['string']

if r['match'].lastindex and r['match'].lastindex >= group_number:
version = r['match'].group(group_number)
else:
Expand Down
3 changes: 2 additions & 1 deletion script/app-mlperf-inference-nvidia/_cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ variations:
- tags: get,generic-python-lib,_pycocotools
- tags: get,generic-python-lib,_onnx-graphsurgeon
- tags: get,generic-python-lib,_package.onnx
version: 1.13.1
version: 1.14.1
- tags: get,generic-python-lib,_package.sympy

sdxl:
new_env_keys:
Expand Down
2 changes: 1 addition & 1 deletion script/build-docker-image/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def preprocess(i):
image_name = get_image_name(env)

if build_dockerfile:
dockerfile_path = "\${CM_DOCKERFILE_WITH_PATH}"
dockerfile_path = r"\${CM_DOCKERFILE_WITH_PATH}"

# Write .dockerignore
with open('.dockerignore', 'w') as f:
Expand Down
2 changes: 1 addition & 1 deletion script/get-dataset-imagenet-aux/_cm.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
},
"from.berkeleyvision": {
"group": "download-source",
"default": true,
"base": [
"2012"
],
Expand All @@ -51,7 +52,6 @@
},
"from.dropbox": {
"group": "download-source",
"default": true,
"base": [
"2012"
],
Expand Down
Loading
Loading