Skip to content

Commit 0c16655

Browse files
authored
Merge from GO (#292)
* Invalidate invalid config results * Fix v25.02 for armnn * Fix git push command if working directory is clean * Added _path.# variations for gcc,aocc
1 parent 6ae3774 commit 0c16655

File tree

6 files changed

+26
-2
lines changed

6 files changed

+26
-2
lines changed

script/generate-mlperf-inference-user-conf/customize.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ def run_files_exist(mode, OUTPUT_DIR, run_files, env):
480480
if (
481481
"result_validity" not in mlperf_log.get_keys()
482482
or mlperf_log["result_validity"] != "VALID"
483+
or "error_invalid_config" in mlperf_log.get_keys()
483484
):
484485
return False
485486

script/get-aocc/meta.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,7 @@ tags:
4343
- get
4444
- aocc
4545
uid: 1ceb0656e99a44ec
46+
variations:
47+
_path.#:
48+
env:
49+
MLC_AOCC_DIR_PATH: #

script/get-gcc/customize.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ def preprocess(i):
1111
recursion_spaces = i['recursion_spaces']
1212
file_name_c = 'gcc.exe' if os_info['platform'] == 'windows' else 'gcc'
1313

14+
if 'MLC_GCC_BIN_WITH_PATH' not in env:
15+
if env.get('MLC_GCC_DIR_PATH', '') != '':
16+
gcc_path = env['MLC_GCC_DIR_PATH']
17+
if os.path.exists(os.path.join(gcc_path, 'bin', 'gcc')):
18+
env['MLC_TMP_PATH'] = os.path.join(gcc_path, 'bin')
19+
1420
if env.get('MLC_HOST_OS_FLAVOR', '') == 'rhel':
1521
if "12" in env.get('MLC_VERSION', '') or "12" in env.get(
1622
'MLC_VERSION_MIN', ''):

script/get-gcc/meta.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ tags:
3030
- cpp-compiler
3131
- get-gcc
3232
uid: dbf4ab5cbed74372
33+
variations:
34+
_path.#:
35+
env:
36+
MLC_GCC_DIR_PATH: #

script/get-lib-armnn/meta.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ versions:
3737
env:
3838
MLC_LIB_ARMNN_VERSION: v23.11
3939
MLC_TMP_GIT_BRANCH_NAME: branches/armnn_23_11
40+
'25.02':
41+
env:
42+
MLC_LIB_ARMNN_VERSION: v23.11
43+
MLC_TMP_GIT_BRANCH_NAME: branches/armnn_23_11

script/push-mlperf-inference-results-to-github/run.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ if [[ -n ${MLC_MLPERF_INFERENCE_SUBMISSION_DIR} ]]; then
1616
fi
1717
test $? -eq 0 || exit $?
1818

19-
git commit -a -m "${MLC_MLPERF_RESULTS_REPO_COMMIT_MESSAGE}"
20-
test $? -eq 0 || exit $?
19+
if ! git diff-index --quiet HEAD --; then
20+
git commit -a -m "${MLC_MLPERF_RESULTS_REPO_COMMIT_MESSAGE}"
21+
test $? -eq 0 || exit $?
22+
else
23+
echo "No changes to commit."
24+
fi
25+
2126

2227
echo ${MLC_GIT_PUSH_CMD}
2328
${MLC_GIT_PUSH_CMD}

0 commit comments

Comments
 (0)