Skip to content

Commit 4be38a9

Browse files
arjunsuresharjunsuresh
authored
Update customize.py | Use Path instead of string in inference-submiss… (#214)
* Update customize.py | Use Path instead of string in inference-submission-generation * Added quotes for filepath in get-platform-details * Added quote for R50 mlperf run on windows * Added quotes for file paths in draw-graph-from-json-data * Avoid space in mlperf-inference-submission
1 parent e6d607c commit 4be38a9

File tree

9 files changed

+109
-100
lines changed

9 files changed

+109
-100
lines changed

‎.github/workflows/build_wheel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- VERSION
1212

1313
jobs:
14+
1415
build_wheels:
1516
if: github.repository_owner == 'mlcommons'
1617
name: Build wheel

‎.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959
git config --global user.name github-actions[bot]
6060
git config --global user.email "github-actions[bot]@users.noreply.github.com"
6161
# Commit changes
62-
git commit -m '[Automated Commit] Format Codebase'
62+
git commit -m '[Automated Commit] Format Codebase [skip ci]'
6363
git push
6464
fi

‎script/activate-python-venv/customize.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from mlc import utils
2+
23
import os
34

45

‎script/app-mlperf-inference-mlcommons-python/customize.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ def get_run_cmd_reference(
250250
'MLC_MLPERF_DEVICE') != "tpu":
251251
if os_info['platform'] == 'windows':
252252
cmd = "python python/main.py --profile " + env['MLC_MODEL'] + "-" + env['MLC_MLPERF_BACKEND'] + \
253-
" --model=" + env['MLC_ML_MODEL_FILE_WITH_PATH'] + ' --dataset-path=' + env['MLC_DATASET_PREPROCESSED_PATH'] + \
254-
" --scenario " + env['MLC_MLPERF_LOADGEN_SCENARIO'] + " " + \
255-
" --output " + env['OUTPUT_DIR'] + " " + \
253+
" --model=\"" + env['MLC_ML_MODEL_FILE_WITH_PATH'] + '" --dataset-path="' + env['MLC_DATASET_PREPROCESSED_PATH'] + \
254+
"\" --scenario " + env['MLC_MLPERF_LOADGEN_SCENARIO'] + " " + \
255+
" --output \"" + env['OUTPUT_DIR'] + "\" " + \
256256
env['MLC_MLPERF_LOADGEN_EXTRA_OPTIONS'] + \
257257
scenario_extra_options + mode_extra_options + dataset_options
258258
else:

‎script/draw-graph-from-json-data/customize.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ def preprocess(i):
1313
automation = i['automation']
1414

1515
quiet = (env.get('MLC_QUIET', False) == 'yes')
16+
q = '"' if os_info['platform'] == 'windows' else "'"
1617

17-
env['MLC_RUN_CMD'] = f"""{env['MLC_PYTHON_BIN_WITH_PATH']} {os.path.join(env['MLC_TMP_CURRENT_SCRIPT_PATH'],"process-mlc-deps.py")} {env['MLC_JSON_INPUT_FILE']}"""
18+
env['MLC_RUN_CMD'] = f"""{env['MLC_PYTHON_BIN_WITH_PATH']} {q}{os.path.join(env['MLC_TMP_CURRENT_SCRIPT_PATH'],"process-mlc-deps.py")}{q} {q}{env['MLC_JSON_INPUT_FILE']}{q} """
1819

1920
if env.get('MLC_OUTPUT_IMAGE_PATH', '') != '':
20-
env['MLC_RUN_CMD'] += f""" --output_image {env['MLC_OUTPUT_IMAGE_PATH']}"""
21+
env['MLC_RUN_CMD'] += f""" --output_image {q}{env['MLC_OUTPUT_IMAGE_PATH']}{q} """
2122

2223
if env.get('MLC_OUTPUT_MERMAID_PATH', '') != '':
23-
env['MLC_RUN_CMD'] += f""" --output_mermaid {env['MLC_OUTPUT_MERMAID_PATH']}"""
24+
env['MLC_RUN_CMD'] += f""" --output_mermaid {q}{env['MLC_OUTPUT_MERMAID_PATH']}{q} """
2425

2526
return {'return': 0}
2627

‎script/generate-mlperf-inference-submission/customize.py

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import sys
66
from tabulate import tabulate
77
import mlperf_utils
8+
from pathlib import Path
89

910

1011
def preprocess(i):
@@ -71,7 +72,6 @@ def generate_submission(env, state, inp, submission_division):
7172
sys.path.append(submission_checker_dir)
7273

7374
if env.get('MLC_MLPERF_INFERENCE_SUBMISSION_DIR', '') == '':
74-
from pathlib import Path
7575
user_home = str(Path.home())
7676
env['MLC_MLPERF_INFERENCE_SUBMISSION_DIR'] = os.path.join(
7777
user_home, "mlperf_submission")
@@ -275,15 +275,19 @@ def generate_submission(env, state, inp, submission_division):
275275
{model: returned_model_name})
276276

277277
if check_dict_filled(sut_info.keys(), sut_info):
278-
system = env.get('MLC_HW_NAME', sut_info["system_name"])
278+
system = env.get(
279+
'MLC_HW_NAME',
280+
sut_info["system_name"]).replace(
281+
" ",
282+
"_")
279283
implementation = sut_info["implementation"]
280284
device = sut_info["device"]
281285
framework = sut_info["framework"].replace(" ", "_")
282286
framework_version = sut_info["framework_version"]
283287
run_config = sut_info["run_config"]
284288
new_res = f"{system}-{implementation}-{device}-{framework}-{run_config}"
285289
else:
286-
new_res = res
290+
new_res = res.replace(" ", "_")
287291

288292
print(f"The SUT folder name for submission generation is: {new_res}")
289293

@@ -535,17 +539,19 @@ def generate_submission(env, state, inp, submission_division):
535539
measurements_json = json.load(f)
536540
model_precision = measurements_json.get(
537541
"weight_data_types", "fp32")
538-
shutil.copy(
539-
measurements_json_path,
540-
os.path.join(
541-
target_measurement_json_path,
542-
sub_res + '.json'))
543542

544-
shutil.copy(
545-
measurements_json_path,
546-
os.path.join(
547-
target_measurement_json_path,
548-
'model-info.json'))
543+
# Convert paths to Path objects
544+
measurements_json_path = Path(measurements_json_path)
545+
target_measurement_json_path = Path(
546+
target_measurement_json_path)
547+
548+
destination = Path(
549+
target_measurement_json_path) / f"{sub_res}.json"
550+
shutil.copy(measurements_json_path, destination)
551+
destination = Path(
552+
target_measurement_json_path) / "model-info.json"
553+
shutil.copy(measurements_json_path, destination)
554+
549555
else:
550556
if mode.lower() == "performance":
551557
return {

‎script/get-mlperf-inference-sut-configs/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def postprocess(i):
1313
'MLC_HOST_SYSTEM_NAME',
1414
'default').replace(
1515
"-",
16-
"_")
16+
"_").replace(" ", "_")
1717
env['MLC_HW_NAME'] = host_name
1818

1919
device = env.get('MLC_MLPERF_DEVICE', 'cpu')

‎script/get-mlperf-inference-sut-description/customize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def preprocess(i):
1717
'MLC_HOST_SYSTEM_NAME',
1818
'default').replace(
1919
"-",
20-
"_")
20+
"_").replace(" ", "_")
2121
env['MLC_HW_NAME'] = host_name
2222
auto_detected_hw_name = True
2323

‎script/get-platform-details/run.sh

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,137 +2,137 @@
22

33
OUTPUT_FILE="$MLC_PLATFORM_DETAILS_FILE_PATH"
44
#set -e
5-
#echo $OUTPUT_FILE
5+
#echo "${OUTPUT_FILE}"
66
echo "WARNING: sudo permission is needed for some of the below commands"
77

8-
echo "Platform Details" > $OUTPUT_FILE
9-
echo "" >> $OUTPUT_FILE
10-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
11-
echo "1. uname -a" >> $OUTPUT_FILE
12-
eval "uname -a" >> $OUTPUT_FILE
8+
echo "Platform Details" > "${OUTPUT_FILE}"
9+
echo "" >> "${OUTPUT_FILE}"
10+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
11+
echo "1. uname -a" >> "${OUTPUT_FILE}"
12+
eval "uname -a" >> "${OUTPUT_FILE}"
1313
test $? -eq 0 || exit $?
14-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
14+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
1515

16-
echo "2. w" >> $OUTPUT_FILE
17-
eval "w" >> $OUTPUT_FILE
16+
echo "2. w" >> "${OUTPUT_FILE}"
17+
eval "w" >> "${OUTPUT_FILE}"
1818
test $? -eq 0 || exit $?
19-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
19+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
2020

21-
echo "3. Username" >> $OUTPUT_FILE
22-
eval "whoami" >> $OUTPUT_FILE
23-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
21+
echo "3. Username" >> "${OUTPUT_FILE}"
22+
eval "whoami" >> "${OUTPUT_FILE}"
23+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
2424

25-
echo "4. ulimit -a" >> $OUTPUT_FILE
26-
eval "ulimit -a" >> $OUTPUT_FILE
25+
echo "4. ulimit -a" >> "${OUTPUT_FILE}"
26+
eval "ulimit -a" >> "${OUTPUT_FILE}"
2727
test $? -eq 0 || exit $?
28-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
28+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
2929

30-
echo "5. sysinfo process ancestry" >> $OUTPUT_FILE
31-
eval "pstree" >> $OUTPUT_FILE
30+
echo "5. sysinfo process ancestry" >> "${OUTPUT_FILE}"
31+
eval "pstree" >> "${OUTPUT_FILE}"
3232
test $? -eq 0 || exit $?
33-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
33+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
3434

35-
echo "6. /proc/cpuinfo" >> $OUTPUT_FILE
36-
eval "cat /proc/cpuinfo" >> $OUTPUT_FILE
35+
echo "6. /proc/cpuinfo" >> "${OUTPUT_FILE}"
36+
eval "cat /proc/cpuinfo" >> "${OUTPUT_FILE}"
3737
test $? -eq 0 || exit $?
38-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
38+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
3939

40-
echo "7. lscpu" >> $OUTPUT_FILE
41-
eval "lscpu" >> $OUTPUT_FILE
40+
echo "7. lscpu" >> "${OUTPUT_FILE}"
41+
eval "lscpu" >> "${OUTPUT_FILE}"
4242
test $? -eq 0 || exit $?
43-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
43+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
4444

45-
echo "8. numactl --hardware" >> $OUTPUT_FILE
45+
echo "8. numactl --hardware" >> "${OUTPUT_FILE}"
4646
if [[ ${MLC_SUDO_USER} == "yes" ]]; then
4747
echo "${MLC_SUDO} numactl --hardware"
48-
eval "${MLC_SUDO} numactl --hardware" >> $OUTPUT_FILE
48+
eval "${MLC_SUDO} numactl --hardware" >> "${OUTPUT_FILE}"
4949
test $? -eq 0 || exit $?
5050
else
51-
echo "Requires SUDO permission" >> $OUTPUT_FILE
51+
echo "Requires SUDO permission" >> "${OUTPUT_FILE}"
5252
fi
53-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
53+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
5454

55-
echo "9. /proc/meminfo" >> $OUTPUT_FILE
56-
eval "cat /proc/meminfo" >> $OUTPUT_FILE
55+
echo "9. /proc/meminfo" >> "${OUTPUT_FILE}"
56+
eval "cat /proc/meminfo" >> "${OUTPUT_FILE}"
5757
test $? -eq 0 || exit $?
58-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
58+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
5959

60-
echo "10. who -r" >> $OUTPUT_FILE
61-
eval "who -r" >> $OUTPUT_FILE
60+
echo "10. who -r" >> "${OUTPUT_FILE}"
61+
eval "who -r" >> "${OUTPUT_FILE}"
6262
test $? -eq 0 || exit $?
63-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
63+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
6464

65-
echo "11. Systemd service manager version" >> $OUTPUT_FILE
66-
eval "systemctl --version | head -n 1" >> $OUTPUT_FILE
65+
echo "11. Systemd service manager version" >> "${OUTPUT_FILE}"
66+
eval "systemctl --version | head -n 1" >> "${OUTPUT_FILE}"
6767
#test $? -eq 0 || exit $?
68-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
68+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
6969

70-
echo "12. Services, from systemctl list-unit-files" >> $OUTPUT_FILE
71-
eval "systemctl list-unit-files" >> $OUTPUT_FILE
70+
echo "12. Services, from systemctl list-unit-files" >> "${OUTPUT_FILE}"
71+
eval "systemctl list-unit-files" >> "${OUTPUT_FILE}"
7272
#test $? -eq 0 || exit $?
73-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
73+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
7474

75-
echo "13. Linux kernel boot-time arguments, from /proc/cmdline" >> $OUTPUT_FILE
76-
eval "cat /proc/cmdline" >> $OUTPUT_FILE
75+
echo "13. Linux kernel boot-time arguments, from /proc/cmdline" >> "${OUTPUT_FILE}"
76+
eval "cat /proc/cmdline" >> "${OUTPUT_FILE}"
7777
test $? -eq 0 || exit $?
78-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
78+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
7979

80-
echo "14. cpupower frequency-info" >> $OUTPUT_FILE
81-
eval "cpupower frequency-info" >> $OUTPUT_FILE
82-
test $? -eq 0 || echo "FAILED: cpupower frequency-info" >> $OUTPUT_FILE
83-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
80+
echo "14. cpupower frequency-info" >> "${OUTPUT_FILE}"
81+
eval "cpupower frequency-info" >> "${OUTPUT_FILE}"
82+
test $? -eq 0 || echo "FAILED: cpupower frequency-info" >> "${OUTPUT_FILE}"
83+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
8484

85-
echo "15. sysctl" >> $OUTPUT_FILE
85+
echo "15. sysctl" >> "${OUTPUT_FILE}"
8686
if [[ ${MLC_SUDO_USER} == "yes" ]]; then
8787
echo "${MLC_SUDO} sysctl -a"
88-
eval "${MLC_SUDO} sysctl -a" >> $OUTPUT_FILE
88+
eval "${MLC_SUDO} sysctl -a" >> "${OUTPUT_FILE}"
8989
test $? -eq 0 || exit $?
9090
else
91-
echo "Requires SUDO permission" >> $OUTPUT_FILE
91+
echo "Requires SUDO permission" >> "${OUTPUT_FILE}"
9292
fi
93-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
93+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
9494

95-
echo "16. /sys/kernel/mm/transparent_hugepage" >> $OUTPUT_FILE
96-
eval "cat /sys/kernel/mm/transparent_hugepage/enabled" >> $OUTPUT_FILE
95+
echo "16. /sys/kernel/mm/transparent_hugepage" >> "${OUTPUT_FILE}"
96+
eval "cat /sys/kernel/mm/transparent_hugepage/enabled" >> "${OUTPUT_FILE}"
9797
test $? -eq 0 || exit $?
98-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
98+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
9999

100-
echo "17. /sys/kernel/mm/transparent_hugepage/khugepaged" >> $OUTPUT_FILE
101-
eval "cat /sys/kernel/mm/transparent_hugepage/khugepaged/defrag" >> $OUTPUT_FILE
100+
echo "17. /sys/kernel/mm/transparent_hugepage/khugepaged" >> "${OUTPUT_FILE}"
101+
eval "cat /sys/kernel/mm/transparent_hugepage/khugepaged/defrag" >> "${OUTPUT_FILE}"
102102
test $? -eq 0 || exit $?
103-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
103+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
104104

105-
echo "18. OS release" >> $OUTPUT_FILE
106-
eval "cat /etc/os-release" >> $OUTPUT_FILE
105+
echo "18. OS release" >> "${OUTPUT_FILE}"
106+
eval "cat /etc/os-release" >> "${OUTPUT_FILE}"
107107
test $? -eq 0 || exit $?
108-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
108+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
109109

110-
echo "19. Disk information" >> $OUTPUT_FILE
111-
eval "lsblk" >> $OUTPUT_FILE
110+
echo "19. Disk information" >> "${OUTPUT_FILE}"
111+
eval "lsblk" >> "${OUTPUT_FILE}"
112112
test $? -eq 0 || exit $?
113-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
113+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
114114

115-
echo "20. /sys/devices/virtual/dmi/id" >> $OUTPUT_FILE
116-
eval "ls /sys/devices/virtual/dmi/id" >> $OUTPUT_FILE
115+
echo "20. /sys/devices/virtual/dmi/id" >> "${OUTPUT_FILE}"
116+
eval "ls /sys/devices/virtual/dmi/id" >> "${OUTPUT_FILE}"
117117
test $? -eq 0 || exit $?
118-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
118+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
119119

120-
echo "21. dmidecode" >> $OUTPUT_FILE
120+
echo "21. dmidecode" >> "${OUTPUT_FILE}"
121121
if [[ ${MLC_SUDO_USER} == "yes" ]]; then
122-
eval "${MLC_SUDO} dmidecode" >> $OUTPUT_FILE
123-
test $? -eq 0 || echo "FAILED: dmidecode" >> $OUTPUT_FILE
122+
eval "${MLC_SUDO} dmidecode" >> "${OUTPUT_FILE}"
123+
test $? -eq 0 || echo "FAILED: dmidecode" >> "${OUTPUT_FILE}"
124124
else
125-
echo "Requires SUDO permission" >> $OUTPUT_FILE
125+
echo "Requires SUDO permission" >> "${OUTPUT_FILE}"
126126
fi
127-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
127+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
128128

129-
echo "22. BIOS" >> $OUTPUT_FILE
129+
echo "22. BIOS" >> "${OUTPUT_FILE}"
130130
if [[ ${MLC_SUDO_USER} == "yes" ]]; then
131-
eval "${MLC_SUDO} dmidecode -t bios" >> $OUTPUT_FILE
132-
test $? -eq 0 || echo "FAILED: dmidecode -t bios" >> $OUTPUT_FILE
131+
eval "${MLC_SUDO} dmidecode -t bios" >> "${OUTPUT_FILE}"
132+
test $? -eq 0 || echo "FAILED: dmidecode -t bios" >> "${OUTPUT_FILE}"
133133
else
134-
echo "Requires SUDO permission" >> $OUTPUT_FILE
134+
echo "Requires SUDO permission" >> "${OUTPUT_FILE}"
135135
fi
136-
echo "------------------------------------------------------------" >> $OUTPUT_FILE
136+
echo "------------------------------------------------------------" >> "${OUTPUT_FILE}"
137137

138-
echo "System information has been saved to $OUTPUT_FILE"
138+
echo "System information has been saved to "${OUTPUT_FILE}""

0 commit comments

Comments
 (0)