Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/test-resnet50.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python3 -m pip install mlc-scripts
python3 -m pip install mlcflow
mlc pull repo mlcommons@mlperf-automations --branch=subcheckmod_change
#python3 -m pip install mlc-scripts
- name: Test Resnet50 and end to end submission generation
run: |
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=resnet50 --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src.version=custom --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short,_r6.0 --quiet --submitter="MLCommons" --hw_name=default --model=resnet50 --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.submission_checker_refactor --adr.inference-src.version=custom --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
#mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=resnet50 --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src.version=custom --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
7 changes: 5 additions & 2 deletions .github/workflows/test-retinanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python3 -m pip install mlc-scripts
python3 -m pip install mlcflow
mlc pull repo mlcommons@mlperf-automations --branch=subcheckmod_change
#python3 -m pip install mlc-scripts
- name: Test Retinanet and end to end submission generation
run: |
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=retinanet --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=10 --adr.compiler.tags=gcc --adr.inference-src.version=custom --adr.inference-src.tags=_repo.${{ github.event.pull_request.head.repo.html_url }},_branch.${{ github.event.pull_request.head.ref }} --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short,_r6.0 --quiet --submitter="MLCommons" --hw_name=default --model=retinanet --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=10 --adr.compiler.tags=gcc --adr.accuracy-check-src.tags=_branch.submission_checker_refactor --adr.inference-src.version=custom --adr.inference-src.tags=_branch.submission_checker_refactor --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom
#mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=retinanet --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=10 --adr.compiler.tags=gcc --adr.inference-src.version=custom --adr.inference-src.tags=_repo.${{ github.event.pull_request.head.repo.html_url }},_branch.${{ github.event.pull_request.head.ref }} --adr.inference-src-loadgen.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom
7 changes: 5 additions & 2 deletions .github/workflows/test-rgat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python3 -m pip install mlc-scripts
python3 -m pip install mlcflow
mlc pull repo mlcommons@mlperf-automations --branch=subcheckmod_change
#python3 -m pip install mlc-scripts
- name: Test R-GAT and end to end submission generation
run: |
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --category=datacenter --hw_name=default --model=rgat --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.$PR_HEAD_REF,_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.tags=_branch.$PR_HEAD_REF,_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
mlcr run,mlperf,inference,generate-run-cmds,_submission,_short,_r6.0 --quiet --submitter="MLCommons" --category=datacenter --hw_name=default --model=rgat --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.submission_checker_refactor --adr.inference-src-loadgen.tags=_branch.$PR_HEAD_REF,_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
#mlcr run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --category=datacenter --hw_name=default --model=rgat --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.$PR_HEAD_REF,_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.tags=_branch.$PR_HEAD_REF,_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src-loadgen.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
11 changes: 7 additions & 4 deletions .github/workflows/test-submission-generation.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This workflow will test the submission generation using MLPerf Automation
# This workflow will test the submission generation using MLPerf Automation.
# This test calls the test-mlperf-inference-submission-generation.yml file from automation repo

name: MLC based Submission Generation

Expand All @@ -12,7 +13,9 @@ on:

jobs:
run-tests:
uses: mlcommons/mlperf-automations/.github/workflows/test-mlperf-inference-submission-generation.yml@dev
uses: mlcommons/mlperf-automations/.github/workflows/test-mlperf-inference-submission-generation.yml@subcheckmod_change
with:
ref: ${{ github.event.pull_request.head.ref }}
repo-url: ${{ github.event.pull_request.head.repo.html_url }}
inf-branch: ${{ github.event.pull_request.head.ref }}
inf-repo-url: ${{ github.event.pull_request.head.repo.html_url }}
automation-repo: mlcommons@mlperf-automations
automation-repo-branch: subcheckmod_change
6 changes: 4 additions & 2 deletions tools/submission/preprocess_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ def clean_invalid_results(args, log_path, config, system_desc, system_json,
if not args.nomove_failed_to_open:
target_code_path = change_first_directory_to_open(
model_code_path)
target_code_path = change_folder_name_in_path(
log_path, "code", "src")
target_results_path = change_first_directory_to_open(
model_results_path)
target_measurements_path = change_first_directory_to_open(
Expand Down Expand Up @@ -543,9 +545,9 @@ def infer_scenario_results(args, config):
shutil.copytree(high_accuracy_model_path,
low_accuracy_model_path)
high_accuracy_model_code_path = os.path.join(log_path, "..",
"code", model)
"src", model)
low_accuracy_model_code_path = os.path.join(log_path, "..",
"code", low_accuracy_model)
"src", low_accuracy_model)
if not os.path.exists(
low_accuracy_model_code_path):
shutil.copytree(high_accuracy_model_code_path,
Expand Down
11 changes: 2 additions & 9 deletions tools/submission/submission_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -3093,15 +3093,8 @@ def check_measurement_dir(
is_valid = False

for i in files:
if i.startswith(system_desc) and i.endswith(
"_" + scenario + ".json"):
if i.lower() == "measurements.json":
system_file = i
end = len("_" + scenario + ".json")
break
elif i.startswith(system_desc) and i.endswith(".json"):
system_file = i
end = len(".json")
break

weight_data_types = None
if system_file:
Expand All @@ -3117,7 +3110,7 @@ def check_measurement_dir(
log.error(
"%s, field %s is missing meaningful value", fname, k)

code_dir = os.path.join(root, "code", model)
code_dir = os.path.join(root, "src", model)
if not os.path.exists(code_dir):
# see if the code dir is per model
if not os.path.exists(os.path.dirname(code_dir)):
Expand Down
Loading