Skip to content

Commit abbf6d7

Browse files
authored
Fix remembered selection not working
1 parent 7732c25 commit abbf6d7

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

automation/script/cache_utils.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def prepare_cache_tags(i):
7777
cached_tags.append(x)
7878

7979
explicit_cached_tags = cached_tags.copy()
80+
explicit_cached_tags.append("-tmp")
8081

8182
# explicit variations
8283
if len(i['explicit_variation_tags']) > 0:
@@ -161,12 +162,15 @@ def search_cache(i, explicit_cached_tags):
161162
i['logger'].debug(
162163
i['recursion_spaces'] +
163164
' - Pruning cache list outputs with the following tags: {}'.format(explicit_cached_tags))
164-
165165
cache_list = i['cache_list']
166+
167+
n_tags = [p[1:] for p in explicit_cached_tags if p.startswith("-")]
168+
p_tags = [p for p in explicit_cached_tags if not p.startswith("-")]
169+
166170
pruned_cache_list = [
167171
item
168172
for item in cache_list
169-
if set(explicit_cached_tags) <= set(item.meta.get('tags', []))
173+
if set(p_tags) <= set(item.meta.get('tags', [])) and set(n_tags).isdisjoint(set(item.meta.get('tags', [])))
170174
]
171175

172176
return pruned_cache_list
@@ -214,9 +218,19 @@ def validate_cached_scripts(i, found_cached_scripts):
214218
'''
215219
valid = []
216220
if len(found_cached_scripts) > 0:
221+
222+
# We can consider doing quiet here if noise is too much
223+
# import logging
224+
# logger = i['logger']
225+
# logger_level_saved = logger.level
226+
# logger.setLevel(logging.ERROR)
227+
# saved_quiet = i['env'].get('MLC_QUIET', False)
228+
# i['env']['MLC_QUIET'] = True
217229
for cached_script in found_cached_scripts:
218230
if is_cached_entry_valid(i, cached_script):
219231
valid.append(cached_script)
232+
# logger.setLevel(logger_level_saved)
233+
# i['env']['MLC_QUIET'] = saved_quiet
220234

221235
return valid
222236

@@ -417,9 +431,7 @@ def find_cached_script(i):
417431
i, explicit_cached_tags, found_cached_scripts)
418432
found_cached_scripts = validate_cached_scripts(i, found_cached_scripts)
419433

420-
search_tags = '-tmp'
421-
if len(explicit_cached_tags) > 0:
422-
search_tags += ',' + ','.join(explicit_cached_tags)
434+
search_tags = ','.join(explicit_cached_tags)
423435

424436
return {'return': 0, 'cached_tags': cached_tags,
425437
'search_tags': search_tags, 'found_cached_scripts': found_cached_scripts}

automation/script/module.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@ def _run(self, i):
492492
quiet = i.get(
493493
'quiet',
494494
False) if 'quiet' in i else (
495-
env.get(
495+
str(env.get(
496496
'MLC_QUIET',
497-
'').lower() == 'yes')
497+
'')).lower() in ["1", "true", "yes", "on"])
498498
if quiet:
499499
env['MLC_QUIET'] = 'yes'
500500

script/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MLCommons Automation Scripts
22

3-
*Last updated: 2026-02-04 18:34:12*
3+
*Last updated: 2026-02-05 19:23:12*
44

55
This directory contains automation scripts for MLPerf benchmarks, AI/ML workflows, and development operations.
66

script/get-oneapi/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ function run() {
1111
# Check if it was already installed
1212
if echo "$OUTPUT" | grep -q "already installed"; then
1313
echo "OneAPI is already installed. Exiting."
14+
echo "Try rm -rf $HOME/intel to clear existing installation"
15+
echo "**********************"
16+
echo " "
17+
1418
exit 0
1519
fi
1620

script/get-oneapi/meta.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ automation_uid: 5b4e0237da074764
44
cache: true
55
category: Compiler automation
66
clean_files: []
7-
default_version: 2025.3.1
7+
default_version: 2025.3.2
88
deps:
99
- tags: detect,os
1010
name: Detect or install OneAPI compiler
@@ -36,6 +36,17 @@ tests:
3636
- fortran
3737

3838
versions:
39+
2025.3.2:
40+
env:
41+
MLC_ONEAPI_INSTALL_URL_BASE: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/6caa93ca-e10a-4cc5-b210-68f385feea9e
42+
MLC_ONEAPI_INSTALL_FILENAME: intel-oneapi-base-toolkit-2025.3.1.36_offline.sh
43+
MLC_ONEAPI_CXX_COMPILER_URL_BASE: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0d61d48a-4fe8-4cb2-bd9d-94d2c19c6227
44+
MLC_ONEAPI_CXX_COMPILER_FILENAME: intel-dpcpp-cpp-compiler-2025.3.2.26_offline.sh
45+
MLC_ONEAPI_FORTRAN_COMPILER_URL_BASE: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3e53d136-2870-4836-adb1-892b558fa34a
46+
MLC_ONEAPI_FORTRAN_COMPILER_FILENAME: intel-fortran-compiler-2025.3.2.25_offline.sh
47+
MLC_ONEAPI_INSTALL_VERSION_PREFIX: '2025.3'
48+
MLC_VERSION: '2025.3.2'
49+
MLC_ONEAPI_CXX: 'yes'
3950
2025.3.1:
4051
env:
4152
MLC_ONEAPI_INSTALL_URL_BASE: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d640da34-77cc-4ab2-8019-ac5592f4ec19

0 commit comments

Comments
 (0)