From 253166d34907ff8eb4db065e1b564e955b743a2a Mon Sep 17 00:00:00 2001 From: Arjun Date: Wed, 14 May 2025 23:27:46 +0000 Subject: [PATCH 1/3] Support ifort install in oneapi --- script/get-oneapi/install.sh | 7 +++++++ script/get-oneapi/meta.yaml | 3 +++ 2 files changed, 10 insertions(+) diff --git a/script/get-oneapi/install.sh b/script/get-oneapi/install.sh index ef2039e43..59d523b6a 100644 --- a/script/get-oneapi/install.sh +++ b/script/get-oneapi/install.sh @@ -7,3 +7,10 @@ cmd="bash ./${MLC_ONEAPI_INSTALL_FILENAME} -a --silent --cli --eula accept --in echo $cmd eval $cmd + +if [[ ${MLC_ONEAPI_FORTRAN} == 'yes' ]] then + wget -nc https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2238465b-cfc7-4bf8-ad04-e55cb6577cba/intel-fortran-essentials-2025.1.1.8_offline.sh + cmd="bash ./intel-fortran-essentials-2025.1.1.8_offline.sh -a --silent --cli --eula accept --install-dir ${PWD}/install" + echo $cmd + eval $cmd +fi diff --git a/script/get-oneapi/meta.yaml b/script/get-oneapi/meta.yaml index 653418412..14394cf2a 100644 --- a/script/get-oneapi/meta.yaml +++ b/script/get-oneapi/meta.yaml @@ -41,3 +41,6 @@ variations: path.#: env: MLC_ONEAPI_DIR_PATH: "#" + fortran: + env: + MLC_ONEAPI_FORTRAN: 'yes' From 223e542ec1634bf0215aff0ba9c1f64973db945e Mon Sep 17 00:00:00 2001 From: Arjun Date: Thu, 15 May 2025 19:23:34 +0530 Subject: [PATCH 2/3] Support default_env in update_meta_if_env, add update_tags_if_env --- automation/script/module.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/automation/script/module.py b/automation/script/module.py index bb1f73440..fba785c01 100644 --- a/automation/script/module.py +++ b/automation/script/module.py @@ -3401,6 +3401,12 @@ def _run_deps(self, deps, clean_env_keys_deps, env, state, const, const_state, a for t in update_tags_from_env: if env.get(t, '').strip() != '': d['tags'] += "," + env[t] + + update_tags_if_env = d.get("update_tags_if_env", []) + for t in update_tags_if_env: + if not is_dep_tobe_skipped(update_tags_if_env[t], env): + d['tags'] += "," + t + inherit_variation_tags = d.get("inherit_variation_tags", False) skip_inherit_variation_groups = d.get( @@ -5772,10 +5778,16 @@ def update_state_from_meta(meta, env, state, const, const_state, deps, post_deps for c_meta in run_state['update_meta_if_env']: if is_dep_tobe_skipped(c_meta, env): continue + utils.merge_dicts({'dict1': default_env, 'dict2': c_meta.get( + 'default_env', {}), 'append_lists': True, 'append_unique': True}) utils.merge_dicts({'dict1': env, 'dict2': c_meta.get( 'env', {}), 'append_lists': True, 'append_unique': True}) + utils.merge_dicts({'dict1': const, 'dict2': c_meta.get( + 'const', {}), 'append_lists': True, 'append_unique': True}) utils.merge_dicts({'dict1': state, 'dict2': c_meta.get( 'state', {}), 'append_lists': True, 'append_unique': True}) + utils.merge_dicts({'dict1': const_state, 'dict2': c_meta.get( + 'const_state', {}), 'append_lists': True, 'append_unique': True}) if c_meta.get('docker', {}): if not state.get('docker', {}): state['docker'] = {} @@ -5784,6 +5796,11 @@ def update_state_from_meta(meta, env, state, const, const_state, deps, post_deps 'append_lists': True, 'append_unique': True}) + + #Updating again in case update_meta_if_env happened + for key in default_env: + env.setdefault(key, default_env[key]) + update_const = meta.get('const', {}) if update_const: const.update(update_const) From 6d12ac1706f3c4898fc8bea96ab8153fe853ac33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 15 May 2025 13:54:14 +0000 Subject: [PATCH 3/3] [Automated Commit] Format Codebase [skip ci] --- automation/script/module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/automation/script/module.py b/automation/script/module.py index fba785c01..5cac406ae 100644 --- a/automation/script/module.py +++ b/automation/script/module.py @@ -3401,13 +3401,12 @@ def _run_deps(self, deps, clean_env_keys_deps, env, state, const, const_state, a for t in update_tags_from_env: if env.get(t, '').strip() != '': d['tags'] += "," + env[t] - + update_tags_if_env = d.get("update_tags_if_env", []) for t in update_tags_if_env: if not is_dep_tobe_skipped(update_tags_if_env[t], env): d['tags'] += "," + t - inherit_variation_tags = d.get("inherit_variation_tags", False) skip_inherit_variation_groups = d.get( "skip_inherit_variation_groups", []) @@ -5796,8 +5795,7 @@ def update_state_from_meta(meta, env, state, const, const_state, deps, post_deps 'append_lists': True, 'append_unique': True}) - - #Updating again in case update_meta_if_env happened + # Updating again in case update_meta_if_env happened for key in default_env: env.setdefault(key, default_env[key])