Merge pull request #649 from GATEOverflow/dev

Support update_meta_if_env at script level

Author: arjunsuresh

.github/workflows/build_wheel_off.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - VERSION
 
+
 jobs:
   build_wheels:
     if: github.repository_owner == 'mlcommons'

automation/script/module.py

@@ -809,14 +809,15 @@ def _run(self, i):
             run_state['script_entry_repo_git'] = script_item.repo.meta.get(
                 'git', False)
 
-        deps = meta.get('deps', [])
-        post_deps = meta.get('post_deps', [])
-        prehook_deps = meta.get('prehook_deps', [])
-        posthook_deps = meta.get('posthook_deps', [])
+        deps = []
+        post_deps = []
+        prehook_deps = []
+        posthook_deps = []
         input_mapping = meta.get('input_mapping', {})
+        new_env_keys_from_meta = []
+        new_state_keys_from_meta = []
+
         docker_settings = meta.get('docker')
-        new_env_keys_from_meta = meta.get('new_env_keys', [])
-        new_state_keys_from_meta = meta.get('new_state_keys', [])
 
         found_script_item = utils.assemble_object(
             meta['alias'], meta['uid'])
@@ -844,22 +845,30 @@ def _run(self, i):
         for key in script_item_default_env:
             env.setdefault(key, script_item_default_env[key])
 
-        # Force env from meta['env'] as a CONST
-        # (env OVERWRITE)
-        script_item_env = meta.get('env', {})
-        # print(f"script meta env= {script_item_env}")
+        # for update_meta_if_env
 
-        utils.merge_dicts({'dict1': env,
-                           'dict2': script_item_env,
-                           'append_lists': True,
-                           'append_unique': True})
-        # print(f"env = {env}")
+        r = update_state_from_meta(
+            meta,
+            env,
+            state,
+            const,
+            const_state,
+            deps,
+            post_deps,
+            prehook_deps,
+            posthook_deps,
+            new_env_keys_from_meta,
+            new_state_keys_from_meta,
+            run_state,
+            i)
+        if r['return'] > 0:
+            return r
 
-        script_item_state = meta.get('state', {})
-        utils.merge_dicts({'dict1': state,
-                           'dict2': script_item_state,
-                           'append_lists': True,
-                           'append_unique': True})
+        # taking from meta or else deps with same names will be ignored
+        deps = meta.get('deps', [])
+        post_deps = meta.get('post_deps', [])
+        prehook_deps = meta.get('prehook_deps', [])
+        posthook_deps = meta.get('posthook_deps', [])
 
         # Store the default_version in run_state -> may be overridden by
         # variations

script/get-generic-sys-util/meta.yaml

@@ -176,6 +176,13 @@ variations:
         brew: sox
         dnf: sox   
         yum: ''
+  gfortran-12-aarch64-linux-gnu: 
+    env:
+      MLC_SYS_UTIL_NAME: gfortran-12-aarch64
+    state:
+      gfortran-12-aarch64: # tbd: complete for other flavours of linux
+        apt: gfortran-12-aarch64-linux-gnu
+
   gfortran-aarch64-linux-gnu: 
     env:
       MLC_SYS_UTIL_NAME: gfortran-aarch64

script/install-llvm-src/meta.yaml

@@ -132,9 +132,10 @@ variations:
   cross-compile-x86-aarch64:
     deps:
       - tags: get,generic-sys-util,_crossbuild-essential-arm64
-      - tags: get,generic-sys-util,_gfortran-aarch64-linux-gnu
+      - tags: get,generic-sys-util,_gfortran-12-aarch64-linux-gnu
+
     env:
-      MLC_LLVM_CROSS_COMPILE_FLAGS: "-DCMAKE_SYSTEM_NAME=Linux  -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-linux-gnu -DCMAKE_Fortran_COMPILER=aarch64-linux-gnu-gfortran -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc  -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++"
+      MLC_LLVM_CROSS_COMPILE_FLAGS: "-DCMAKE_SYSTEM_NAME=Linux  -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-linux-gnu -DCMAKE_Fortran_COMPILER=aarch64-linux-gnu-gfortran-12 -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc  -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++"
   for-intel-mlperf-inference-v3.1-bert:
     adr:
       conda-package: