Merge pull request mlcommons#847 from amd/dev

Updated Script Automation, support default_variations in script meta

Author: arjunsuresh

automation/script/README.md

@@ -1231,6 +1231,7 @@ def _run(self, i):
 
                     if default_version in versions:
                         versions_meta = versions[default_version]
+                        run_state['version_meta'] = versions_meta
                         r = self.update_state_from_meta(
                             versions_meta,
                             run_state,
@@ -1997,6 +1998,7 @@ def _update_state_from_version(self, meta, run_state, i):
 
         if version != '' and version in versions:
             versions_meta = versions[version]
+            run_state['version_meta'] = versions_meta
             r = self.update_state_from_meta(
                 versions_meta,
                 run_state,
@@ -2091,20 +2093,58 @@ def _update_state_from_variations(
         if not variation_tags and default_variation and default_variation not in excluded_variation_tags:
             variation_tags = [default_variation]
 
+        # Process default_variations from all sources BEFORE per-variation defaults.
+        # Priority order (highest first):
+        #   1. update_meta_if_env conditional default_variations
+        #   2. Script-level default_variations (top-level meta)
+        #   3. Version-level default_variations (version meta)
+        #   4. Per-variation default_variations (handled in _update_variation_tags_from_variations below)
+        #
+        # Since _get_variation_tags_from_default_variations only fills groups
+        # not already covered, processing higher-priority sources first ensures
+        # they win for each group.
+        conditional_dv = run_state.get('conditional_default_variations', {})
+        extra_meta_sources = []
+        if conditional_dv:
+            extra_meta_sources.append({'default_variations': conditional_dv})
+        extra_meta_sources.append(meta)
+        version_meta = run_state.get('version_meta', {})
+        if version_meta:
+            extra_meta_sources.append(version_meta)
+        for extra_meta_source in extra_meta_sources:
+            if extra_meta_source and 'default_variations' in extra_meta_source:
+                tmp_vt_static = copy.deepcopy(variation_tags)
+                for vi in range(len(tmp_vt_static)):
+                    if tmp_vt_static[vi] not in variations:
+                        vs = self._get_name_for_dynamic_variation_tag(
+                            tmp_vt_static[vi])
+                        if vs:
+                            tmp_vt_static[vi] = vs
+                r = self._get_variation_tags_from_default_variations(
+                    extra_meta_source, variations, variation_groups,
+                    tmp_vt_static, excluded_variation_tags)
+                if r['return'] > 0:
+                    return r
+                for t in r['variations_to_add']:
+                    if t not in variation_tags:
+                        variation_tags.append(t)
+
+        # Now process per-variation base variations and default_variations
+        # (lowest priority — only fills groups not already covered by
+        # script-level or version-level defaults above).
         r = self._update_variation_tags_from_variations(
             variation_tags, variation_groups, excluded_variation_tags, variations)
         if r['return'] > 0:
             return r
 
-        # process group defaults
+        # Process group defaults (the 'default' key inside each group)
         r = self._process_variation_tags_in_groups(
             variation_tags, variation_groups, excluded_variation_tags, variations)
         if r['return'] > 0:
             return r
         if variation_tags != r['variation_tags']:
             variation_tags = r['variation_tags']
-            # we need to again process variation tags if any new default
-            # variation is added
+            # re-expand if any new group default was added
             r = self._update_variation_tags_from_variations(
                 variation_tags, variation_groups, excluded_variation_tags, variations)
             if r['return'] > 0:
@@ -5605,6 +5645,19 @@ def _apply_conditional_meta_updates(update_meta_if_env, default_env, env, const,
                                'append_lists': True,
                                'append_unique': True})
 
+        # Accumulate default_variations from conditional meta updates.
+        # These will be picked up in _update_state_from_variations with
+        # the highest priority (above script-level default_variations).
+        c_default_variations = c_meta.get('default_variations', {})
+        if c_default_variations:
+            if 'conditional_default_variations' not in run_state:
+                run_state['conditional_default_variations'] = {}
+            # Later entries don't overwrite earlier ones (first match wins per
+            # group)
+            for group, variation in c_default_variations.items():
+                run_state['conditional_default_variations'].setdefault(
+                    group, variation)
+
     return {'return': 0}
 
 

automation/script/module.py

@@ -1,6 +1,6 @@
 # MLCommons Automation Scripts
 
-*Last updated: 2026-02-21 18:41:18*
+*Last updated: 2026-02-26 03:04:40*
 
 This directory contains automation scripts for MLPerf benchmarks, AI/ML workflows, and development operations.
 
@@ -994,6 +994,9 @@ This directory contains automation scripts for MLPerf benchmarks, AI/ML workflow
 - **[get-dataset-mlperf-inference-yolo-coco2017-filtered-dataset](get-dataset-mlperf-inference-yolo-coco2017-filtered-dataset/)**
   - get-dataset-mlperf-inference-yolo-coco2017-filtered-dataset
   - Tags: `get`, `dataset`, `mlperf-inference`, `yolo-coco2017-filtered`, `get-dataset-mlperf-inference-yolo-coco2017-filtered-dataset`
+- **[get-dataset-mmlu](get-dataset-mmlu/)**
+  - get-dataset-mmlu
+  - Tags: `get-dataset-mmlu`
 - **[get-dataset-nuscenes](get-dataset-nuscenes/)**
   - get-dataset-nuscenes
   - Tags: `get`, `dataset`, `nuscenes`
@@ -1080,7 +1083,7 @@ This directory contains automation scripts for MLPerf benchmarks, AI/ML workflow
 
 ## Statistics
 
-- **Total Scripts**: 317
+- **Total Scripts**: 318
 - **Categories**: 29
 
 ## Usage

script/README.md

@@ -13,6 +13,8 @@ extract_field() {
 
 if [[ ${MLC_HOST_OS_FLAVOR} == "macos" ]]; then
     sysctl -a | grep hw > tmp-lscpu.out
+    cpu_model_name=$(sysctl -n machdep.cpu.brand_string)
+    echo "MLC_HOST_CPU_MODEL_NAME=$cpu_model_name">>tmp-run-env.out
 else
     lscpu > tmp-lscpu.out
     memory_capacity=`free -h --si | grep Mem: | tr -s ' ' | cut -d' ' -f2`

script/detect-cpu/run.sh

@@ -6,6 +6,7 @@ category: Detection or installation of tools and artifacts
 deps:
 - env:
     MLC_GIT_CHECKOUT_PATH_ENV_NAME: MLC_MIMALLOC_SRC_PATH
+    MLC_GIT_REPO_VERSION_ENV_NAME: MLC_MIMALLOC_VERSION
   extra_cache_tags: mimalloc,repo,mimalloc-repo
   force_env_keys:
   - MLC_GIT_*
@@ -28,6 +29,7 @@ deps:
 new_env_keys:
 - MLC_MIMALLOC_PATH
 - MLC_MIMALLOC_LIB_PATH
+- MLC_MIMALLOC_VERSION
 - +LD_LIBRARY_PATH
 new_state_keys: []
 post_deps: []

script/get-lib-mimalloc/meta.yaml

@@ -6,6 +6,7 @@ category: Detection or installation of tools and artifacts
 deps:
 - env:
     MLC_GIT_CHECKOUT_PATH_ENV_NAME: MLC_TCMALLOC_SRC_PATH
+    MLC_GIT_REPO_VERSION_ENV_NAME: MLC_TCMALLOC_VERSION
   extra_cache_tags: tcmalloc,repo,tcmalloc-repo
   force_env_keys:
   - MLC_GIT_*
@@ -28,6 +29,7 @@ deps:
   tags: get,generic-sys-util,_build-essential
 new_env_keys:
 - MLC_TCMALLOC_PATH
+- MLC_TCMALLOC_VERSION
 - MLC_TCMALLOC_LIB_PATH
 - +LD_LIBRARY_PATH
 new_state_keys: []

script/get-lib-tcmalloc/meta.yaml

@@ -38,6 +38,12 @@ input_mapping:
   extra: MLC_GCC_EXTRA_CONFIGURE_STRING
   pull_changes: MLC_GCC_REPO_PULL_CHANGES
 
+update_meta_if_env:
+  - default_variations:
+      repo: darwin
+    enable_if_env:
+      MLC_HOST_OS_TYPE:
+        - darwin
 
 new_env_keys:
   - MLC_GCC_*