Skip to content

Path string fix #376

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Apr 22, 2025
Merged

Path string fix #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ea9e55
path string fix
anandhu-eng Apr 22, 2025
5e53ee4
fix quotes
anandhu-eng Apr 22, 2025
c8c969b
add space in MLC repo folder
anandhu-eng Apr 22, 2025
432a9cd
[Automated Commit] Format Codebase [skip ci]
github-actions[bot] Apr 22, 2025
3359e6a
test commit
anandhu-eng Apr 22, 2025
713ce33
better handling of fstring
anandhu-eng Apr 22, 2025
1595a01
test commit - closed division run on pull request target
anandhu-eng Apr 22, 2025
128d798
revert test commit
anandhu-eng Apr 22, 2025
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
11 changes: 9 additions & 2 deletions .github/workflows/test-mlperf-inference-resnet50-closed-division.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -64,7 +63,15 @@ jobs:
if: matrix.os == 'windows-latest'
run: |
git config --system core.longpaths true

- name: Export MLC_REPOS in Linux or Mac
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
run: |
echo "MLC_REPOS=$HOME/gh action/mlc" >> $GITHUB_ENV
- name: Export MLC_REPOS in Windows
if: matrix.os == 'windows-latest'
run: |
$mlcrepos = "${env:USERPROFILE}\gh action\mlc"
"MLC_REPOS=$mlcRepos" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Install mlcflow
run: |
pip install mlcflow
Expand Down
34 changes: 16 additions & 18 deletions script/app-mlperf-inference/customize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def postprocess(i):
os_info = i['os_info']

xsep = '^' if os_info['platform'] == 'windows' else '\\'
q = '"' if os_info['platform'] == 'windows' else "'"

env = i['env']
inp = i['input']
Expand Down Expand Up @@ -119,14 +120,13 @@ def postprocess(i):

if mode == "accuracy" or mode == "compliance" and env[
'MLC_MLPERF_LOADGEN_COMPLIANCE_TEST'] == "TEST01":
out_baseline_accuracy_string = f"""> {os.path.join(output_dir, "accuracy", "baseline_accuracy.txt")} """
out_compliance_accuracy_string = f"""> {os.path.join(output_dir, "accuracy", "compliance_accuracy.txt")} """
out_baseline_accuracy_string = f"""> {q}{os.path.join(output_dir, "accuracy", "baseline_accuracy.txt")}{q} """
out_compliance_accuracy_string = f"""> {q}{os.path.join(output_dir, "accuracy", "compliance_accuracy.txt")}{q} """
if model == "resnet50":
accuracy_filename = "accuracy-imagenet.py"
accuracy_filepath = os.path.join(env['MLC_MLPERF_INFERENCE_CLASSIFICATION_AND_DETECTION_PATH'], "tools",
accuracy_filename)
dataset_args = " --imagenet-val-file " + \
os.path.join(env['MLC_DATASET_AUX_PATH'], "val.txt")
dataset_args = f""" --imagenet-val-file {q}{os.path.join(env['MLC_DATASET_AUX_PATH'], "val.txt")}{q} """
accuracy_log_file_option_name = " --mlperf-accuracy-file "
datatype_option = " --dtype " + env['MLC_IMAGENET_ACCURACY_DTYPE']

Expand All @@ -141,8 +141,8 @@ def postprocess(i):
accuracy_filename = "accuracy-openimages.py"
accuracy_filepath = os.path.join(env['MLC_MLPERF_INFERENCE_CLASSIFICATION_AND_DETECTION_PATH'], "tools",
accuracy_filename)
dataset_args = " --openimages-dir " + \
os.getcwd() # just to make the script happy
# just to make the script happy
dataset_args = f""" --openimages-dir {q}{os.getcwd()}{q} """
accuracy_log_file_option_name = " --mlperf-accuracy-file "
datatype_option = ""

Expand All @@ -165,8 +165,8 @@ def postprocess(i):
env['MLC_DATASET_IGBH_SIZE'] + "'"
accuracy_log_file_option_name = " --mlperf-accuracy-file "
datatype_option = ""
out_baseline_accuracy_string = f""" --output-file {os.path.join(output_dir, "accuracy", "baseline_accuracy.txt")} """
out_compliance_accuracy_string = f""" --output-file {os.path.join(output_dir, "accuracy", "compliance_accuracy.txt")} """
out_baseline_accuracy_string = f""" --output-file {q}{os.path.join(output_dir, "accuracy", "baseline_accuracy.txt")}{q} """
out_compliance_accuracy_string = f""" --output-file {q}{os.path.join(output_dir, "accuracy", "compliance_accuracy.txt")}{q} """

elif 'stable-diffusion-xl' in model:
pass # No compliance check for now
Expand Down Expand Up @@ -499,9 +499,9 @@ def postprocess(i):
test,
"run_verification.py")
if test == "TEST06":
cmd = f"{env['MLC_PYTHON_BIN_WITH_PATH']} {SCRIPT_PATH} -c {COMPLIANCE_DIR} -o {OUTPUT_DIR} --scenario {scenario} --dtype int32"
cmd = f"""{env['MLC_PYTHON_BIN_WITH_PATH']} {q}{SCRIPT_PATH}{q} -c {q}{COMPLIANCE_DIR}{q} -o {q}{OUTPUT_DIR}{q} --scenario {scenario} --dtype int32"""
else:
cmd = f"{env['MLC_PYTHON_BIN_WITH_PATH']} {SCRIPT_PATH} -r {RESULT_DIR} -c {COMPLIANCE_DIR} -o {OUTPUT_DIR}"
cmd = f"""{env['MLC_PYTHON_BIN_WITH_PATH']} {q}{SCRIPT_PATH}{q} -r {q}{RESULT_DIR}{q} -c {q}{COMPLIANCE_DIR}{q} -o {q}{OUTPUT_DIR}{q}"""

print(cmd)
os.system(cmd)
Expand All @@ -524,8 +524,7 @@ def postprocess(i):
return {
'return': 1, 'error': 'TEST01 needs accuracy run to be completed first'}

cmd = "cd " + TEST01_DIR + " && bash " + SCRIPT_PATH + " " + os.path.join(ACCURACY_DIR, "mlperf_log_accuracy.json") + " " + \
os.path.join(COMPLIANCE_DIR, "mlperf_log_accuracy.json")
cmd = f"""cd {q}{TEST01_DIR}{q} && bash {q}{SCRIPT_PATH}{q} {q}{os.path.join(ACCURACY_DIR, "mlperf_log_accuracy.json")}{q} {q}{os.path.join(COMPLIANCE_DIR, "mlperf_log_accuracy.json")}{q} """
env['CMD'] = cmd
print(cmd)
r = automation.run_native_script(
Expand All @@ -544,9 +543,8 @@ def postprocess(i):

baseline_accuracy_file = os.path.join(
TEST01_DIR, "mlperf_log_accuracy_baseline.json")
CMD = "cd " + ACCURACY_DIR + " && " + env['MLC_PYTHON_BIN_WITH_PATH'] + ' ' + accuracy_filepath + accuracy_log_file_option_name + \
baseline_accuracy_file + ' ' + dataset_args + \
datatype_option + out_baseline_accuracy_string
CMD = f"""cd {q}{ACCURACY_DIR}{q} && {q}{env['MLC_PYTHON_BIN_WITH_PATH']}{q} {q}{accuracy_filepath}{q} \
{accuracy_log_file_option_name} {q}{baseline_accuracy_file}{q} {dataset_args} {datatype_option} {out_baseline_accuracy_string} """

env['CMD'] = CMD
r = automation.run_native_script(
Expand All @@ -558,9 +556,9 @@ def postprocess(i):
return {'return': 1,
'error': f"{baseline_accuracy_file} is empty"}

CMD = "cd " + ACCURACY_DIR + " && " + env['MLC_PYTHON_BIN_WITH_PATH'] + ' ' + accuracy_filepath + accuracy_log_file_option_name + \
os.path.join(TEST01_DIR, "mlperf_log_accuracy.json") + \
dataset_args + datatype_option + out_compliance_accuracy_string
CMD = f"""cd {q}{ACCURACY_DIR}{q} && {q}{env['MLC_PYTHON_BIN_WITH_PATH']}{q} {q}{accuracy_filepath}{q} \
{accuracy_log_file_option_name} {q}{os.path.join(TEST01_DIR, "mlperf_log_accuracy.json")}{q} {dataset_args} {datatype_option} \
{out_compliance_accuracy_string} """

env['CMD'] = CMD
r = automation.run_native_script(
Expand Down
Loading