From 9514674e94ceae30f81fb421e1807673bd885bca Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sat, 15 Mar 2025 19:36:15 +0530 Subject: [PATCH 1/6] Fix lists in install-llvm-src --- script/install-llvm-src/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/script/install-llvm-src/meta.yaml b/script/install-llvm-src/meta.yaml index 1973a78c0..0c8d91c43 100644 --- a/script/install-llvm-src/meta.yaml +++ b/script/install-llvm-src/meta.yaml @@ -62,12 +62,14 @@ variations: clang: default: true env: - +MLC_LLVM_ENABLE_PROJECTS: clang + +MLC_LLVM_ENABLE_PROJECTS: + - clang group: clang lld: default: true env: - +MLC_LLVM_ENABLE_PROJECTS: lld + +MLC_LLVM_ENABLE_PROJECTS: + - lld group: lld no-clang: group: clang @@ -207,7 +209,8 @@ variations: group: repo runtimes.#: env: - +MLC_LLVM_ENABLE_RUNTIMES: '#' + +MLC_LLVM_ENABLE_RUNTIMES: + - '#' sha.#: env: MLC_GIT_CHECKOUT_SHA: '#' From 2dfe5f97af0561d2ca5dac0c3b743c92522b81eb Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sat, 15 Mar 2025 15:54:45 +0000 Subject: [PATCH 2/6] Update customize.py --- script/install-llvm-src/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-llvm-src/customize.py b/script/install-llvm-src/customize.py index b1f5f303b..bbd4510c9 100644 --- a/script/install-llvm-src/customize.py +++ b/script/install-llvm-src/customize.py @@ -41,7 +41,7 @@ def preprocess(i): llvm_build_type = env['MLC_LLVM_BUILD_TYPE'] - targets_to_buuild = env.get('MLC_LLVM_TARGETS_TO_BUILD', 'X86') + targets_to_build = env.get('MLC_LLVM_TARGETS_TO_BUILD', 'X86') cmake_cmd = f"""cmake {os.path.join(env["MLC_LLVM_SRC_REPO_PATH"], "llvm")} -GNinja -DCMAKE_BUILD_TYPE={llvm_build_type } -DLLVM_ENABLE_PROJECTS={q}{enable_projects}{q} -DLLVM_ENABLE_RUNTIMES={q}{enable_runtimes}{q} -DCMAKE_INSTALL_PREFIX={q}{install_prefix} -DLLVM_ENABLE_RTTI=ON -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD={targets_to_build} {extra_cmake_options}""" From 02c223c5a807904ae67af22f3c474d8d13b32a62 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sat, 15 Mar 2025 16:24:52 +0000 Subject: [PATCH 3/6] Update customize.py --- script/install-llvm-src/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-llvm-src/customize.py b/script/install-llvm-src/customize.py index bbd4510c9..ea6b02c54 100644 --- a/script/install-llvm-src/customize.py +++ b/script/install-llvm-src/customize.py @@ -43,7 +43,7 @@ def preprocess(i): targets_to_build = env.get('MLC_LLVM_TARGETS_TO_BUILD', 'X86') - cmake_cmd = f"""cmake {os.path.join(env["MLC_LLVM_SRC_REPO_PATH"], "llvm")} -GNinja -DCMAKE_BUILD_TYPE={llvm_build_type } -DLLVM_ENABLE_PROJECTS={q}{enable_projects}{q} -DLLVM_ENABLE_RUNTIMES={q}{enable_runtimes}{q} -DCMAKE_INSTALL_PREFIX={q}{install_prefix} -DLLVM_ENABLE_RTTI=ON -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD={targets_to_build} {extra_cmake_options}""" + cmake_cmd = f"""cmake {os.path.join(env["MLC_LLVM_SRC_REPO_PATH"], "llvm")} -GNinja -DCMAKE_BUILD_TYPE={llvm_build_type } -DLLVM_ENABLE_PROJECTS={q}{enable_projects}{q} -DLLVM_ENABLE_RUNTIMES={q}{enable_runtimes}{q} -DCMAKE_INSTALL_PREFIX={q}{install_prefix}{q} -DLLVM_ENABLE_RTTI=ON -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD={targets_to_build} {extra_cmake_options}""" env['MLC_LLVM_CMAKE_CMD'] = cmake_cmd From 53268f78423d6da4a4e182af2d8a6d3a61dd5eae Mon Sep 17 00:00:00 2001 From: Arjun Date: Sat, 15 Mar 2025 22:10:35 +0530 Subject: [PATCH 4/6] Support lists in env update in script automation --- automation/script/module.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/automation/script/module.py b/automation/script/module.py index 36752d301..404851f08 100644 --- a/automation/script/module.py +++ b/automation/script/module.py @@ -460,7 +460,11 @@ def _run(self, i): # Add permanent env from OS (such as MLC_WINDOWS:"yes" on Windows) env_from_os_info = os_info.get('env', {}) if len(env_from_os_info) > 0: - env.update(env_from_os_info) + #env.update(env_from_os_info) + utils.merge_dicts({'dict1': env, + 'dict2': env_from_os_info, + 'append_lists': True, + 'append_unique': True}) # take some env from the user environment keys = [ @@ -833,7 +837,10 @@ def _run(self, i): script_item_env = meta.get('env', {}) # print(f"script meta env= {script_item_env}") - env.update(script_item_env) + utils.merge_dicts({'dict1': env, + 'dict2': script_item_env, + 'append_lists': True, + 'append_unique': True}) # print(f"env = {env}") script_item_state = meta.get('state', {}) @@ -1915,8 +1922,7 @@ def _run(self, i): # Finalize script # Force consts in the final new env and state - utils.merge_dicts({'dict1': env, 'dict2': const, - 'append_lists': True, 'append_unique': True}) + env.update(const) utils.merge_dicts({'dict1': state, 'dict2': const_state, 'append_lists': True, @@ -3473,7 +3479,7 @@ def _run_deps(self, deps, clean_env_keys_deps, env, state, const, const_state, a if r['return'] > 0: return r - # Update env/state with cost + # Update env/state with const env.update(const) utils.merge_dicts({'dict1': state, 'dict2': const_state, @@ -5052,10 +5058,7 @@ def prepare_and_run_script_with_postprocessing(i, postprocess="postprocess"): 'return': 16, 'error': 'script {} not found - please add one'.format(path_to_run_script)} # Update env and state with const - utils.merge_dicts({'dict1': env, - 'dict2': const, - 'append_lists': True, - 'append_unique': True}) + env.update(const) utils.merge_dicts({'dict1': state, 'dict2': const_state, 'append_lists': True, 'append_unique': True}) @@ -5281,8 +5284,7 @@ def run_detect_version(customize_code, customize_common_input, logger.debug(recursion_spaces + ' - Running detect_version ...') # Update env and state with const - utils.merge_dicts({'dict1': env, 'dict2': const, - 'append_lists': True, 'append_unique': True}) + env.update(const) utils.merge_dicts({'dict1': state, 'dict2': const_state, 'append_lists': True, @@ -5312,8 +5314,7 @@ def run_postprocess(customize_code, customize_common_input, recursion_spaces, logger.debug(recursion_spaces + ' - Running postprocess ...') # Update env and state with const - utils.merge_dicts({'dict1': env, 'dict2': const, - 'append_lists': True, 'append_unique': True}) + env.update(const) utils.merge_dicts({'dict1': state, 'dict2': const_state, 'append_lists': True, @@ -5745,7 +5746,8 @@ def update_state_from_meta(meta, env, state, const, const_state, deps, post_deps env.setdefault(key, default_env[key]) update_env = meta.get('env', {}) - env.update(update_env) + utils.merge_dicts({'dict1': env, 'dict2': update_env, + 'append_lists': True, 'append_unique': True}) update_meta_if_env = meta.get('update_meta_if_env', []) update_meta_if_env_from_state = run_state.get('update_meta_if_env', []) From 757be328304da7bae98bfd7733d5750d4d4bcd42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 15 Mar 2025 16:41:48 +0000 Subject: [PATCH 5/6] [Automated Commit] Format Codebase [skip ci] --- automation/script/module.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/script/module.py b/automation/script/module.py index 404851f08..840b69554 100644 --- a/automation/script/module.py +++ b/automation/script/module.py @@ -460,11 +460,11 @@ def _run(self, i): # Add permanent env from OS (such as MLC_WINDOWS:"yes" on Windows) env_from_os_info = os_info.get('env', {}) if len(env_from_os_info) > 0: - #env.update(env_from_os_info) + # env.update(env_from_os_info) utils.merge_dicts({'dict1': env, - 'dict2': env_from_os_info, - 'append_lists': True, - 'append_unique': True}) + 'dict2': env_from_os_info, + 'append_lists': True, + 'append_unique': True}) # take some env from the user environment keys = [ From 3b84aaeaea67e2a9045360a2cf7dea5023676287 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sat, 15 Mar 2025 16:43:59 +0000 Subject: [PATCH 6/6] Update build_wheel.yml --- .github/workflows/build_wheel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 8de31237d..1edf42589 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -10,7 +10,6 @@ on: paths: - VERSION - jobs: build_wheels: