Support base variation inside dynamic variations

.github/workflows/build_wheels.yml

@@ -6,7 +6,6 @@ on:
   workflow_dispatch: {}
 
 jobs:
-
   build_wheels:
     if: github.repository_owner == 'mlcommons'
     name: Build wheel

automation/script/module.py

@@ -3146,7 +3146,7 @@ def _update_variation_meta_with_dynamic_suffix(
             value = variation_meta[key]
 
             if isinstance(value, list):  # deps,pre_deps...
-                for item in value:
+                for i, item in enumerate(value):
                     if isinstance(item, dict):
                         for item_key in item:
                             item_value = item[item_key]
@@ -3163,6 +3163,9 @@ def _update_variation_meta_with_dynamic_suffix(
                             else:
                                 item[item_key] = item[item_key].replace(
                                     "#", variation_tag_dynamic_suffix)
+                    elif isinstance(item, str):
+                        value[i] = value[i].replace(
+                            "#", variation_tag_dynamic_suffix)
 
             elif isinstance(value, dict):  # add_deps, env, ..
                 for item in value:
@@ -3188,8 +3191,9 @@ def _update_variation_meta_with_dynamic_suffix(
                             value[item] = value[item].replace(
                                 "#", variation_tag_dynamic_suffix)
 
-            else:  # scalar value
-                pass  # no dynamic update for now
+            else:  # scalar value, never used?
+                variation_meta[key] = variation_meta[key].replace(
+                    "#", variation_tag_dynamic_suffix)
 
     ##########################################################################
 

script/get-llvm/customize.py

@@ -15,6 +15,19 @@ def preprocess(i):
     env['FILE_NAME_C'] = file_name_c
 
     if 'MLC_LLVM_CLANG_BIN_WITH_PATH' not in env:
+
+        if env.get('MLC_LLVM_DIR_PATH', '') != '':
+            llvm_path = env['MLC_LLVM_DIR_PATH']
+            if os.path.exists(os.path.join(llvm_path, 'bin', 'clang')):
+                env['MLC_TMP_PATH'] = os.path.join(llvm_path, 'bin')
+            else:
+                for l in os.listdir(aocc_path):
+                    if os.path.exists(os.path.join(
+                            llvm_path, l, 'bin', 'clang')):
+                        llvm_path = os.path.join(llvm_path, l)
+                        env['MLC_LLVM_DIR_PATH'] = llvm_path
+                        env['MLC_TMP_PATH'] = os.path.join(llvm_path, 'bin')
+
         r = i['automation'].find_artifact({'file_name': file_name_c,
                                            'env': env,
                                            'os_info': os_info,

script/get-llvm/meta.yaml

@@ -46,3 +46,6 @@ variations:
     ad:
       llvm-install:
         tags: src,_clang
+  path.#:
+    env:
+      MLC_LLVM_DIR_PATH: '#'

script/install-llvm-src/meta.yaml

@@ -56,6 +56,14 @@ tags:
 - src-llvm
 uid: 2af16e9a6c5f4702
 variations:
+  version.main:
+    group: version
+    base:
+      - branch.main
+  version.#:
+    group: version
+    base:
+      - tag.#
   branch.#:
     env:
       MLC_GIT_CHECKOUT: '#'