From 4b389f3a3559353ae8504b566a2f19be19ef9655 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Thu, 29 May 2025 10:46:27 +0000 Subject: [PATCH 1/4] Added option to skip detect-sudo, support postfix detection --- script/detect-sudo/customize.py | 4 ++-- script/get-generic-sys-util/meta.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py index 3e1b65059..41236eb0c 100644 --- a/script/detect-sudo/customize.py +++ b/script/detect-sudo/customize.py @@ -27,8 +27,8 @@ def preprocess(i): env['MLC_SUDO'] = '' # root user does not need sudo env['MLC_SUDO_USER'] = "yes" else: - if can_execute_sudo_without_password( - logger) or prompt_sudo(logger) == 0: + if not is_true(env.get('MLC_SKIP_SUDO')) and ( can_execute_sudo_without_password( + logger) or prompt_sudo(logger) == 0): env['MLC_SUDO_USER'] = "yes" env['MLC_SUDO'] = 'sudo' diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml index b8f248337..7e0f33ca0 100644 --- a/script/get-generic-sys-util/meta.yaml +++ b/script/get-generic-sys-util/meta.yaml @@ -662,6 +662,9 @@ variations: postfix: env: MLC_SYS_UTIL_NAME: postfix + MLC_SYS_UTIL_VERSION_CMD: postconf mail_version + MLC_SYS_UTIL_VERSION_RE: mail_version = \b(\d+\.\d+(?:\.\d+)?)\b + MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 1 new_env_keys: - MLC_POSTFIX_VERSION state: From dc76ec1a7447e5e5782d9c79069ed969776d8089 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 29 May 2025 10:48:49 +0000 Subject: [PATCH 2/4] [Automated Commit] Format Codebase [skip ci] --- script/detect-sudo/customize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py index 41236eb0c..104d8b781 100644 --- a/script/detect-sudo/customize.py +++ b/script/detect-sudo/customize.py @@ -27,7 +27,7 @@ def preprocess(i): env['MLC_SUDO'] = '' # root user does not need sudo env['MLC_SUDO_USER'] = "yes" else: - if not is_true(env.get('MLC_SKIP_SUDO')) and ( can_execute_sudo_without_password( + if not is_true(env.get('MLC_SKIP_SUDO')) and (can_execute_sudo_without_password( logger) or prompt_sudo(logger) == 0): env['MLC_SUDO_USER'] = "yes" env['MLC_SUDO'] = 'sudo' From ffc4e25c2af2503e440f260bf457a1bd28f78ac0 Mon Sep 17 00:00:00 2001 From: Arjun Date: Mon, 2 Jun 2025 18:15:29 +0530 Subject: [PATCH 3/4] Support installation variations in get,llvm --- script/get-llvm/meta.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/script/get-llvm/meta.yaml b/script/get-llvm/meta.yaml index 8193227b7..abcebd854 100644 --- a/script/get-llvm/meta.yaml +++ b/script/get-llvm/meta.yaml @@ -27,6 +27,9 @@ prehook_deps: - 'yes' names: llvm-install reuse_version: true + inherit_variation_tags: true + skip_inherit_variation_groups: + - install-src tags: install,llvm sort: 100 tags: @@ -39,13 +42,24 @@ tags: uid: 99832a103ed04eb8 variations: from-prebuilt: + group: install-src + default: true ad: llvm-install: tags: prebuilt from-src: + group: install-src ad: llvm-install: tags: src,_clang path.#: env: MLC_LLVM_DIR_PATH: '#' + release: {} + version.#: {} + branch.#: {} + runtimes.#: {} + flang: {} + sha.#: {} + tag.#: {} + From 988924a24c7394758df13b8398f8026497495c91 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Mon, 2 Jun 2025 18:55:39 +0530 Subject: [PATCH 4/4] Fix tags for nvidia-harness --- script/app-mlperf-inference/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/script/app-mlperf-inference/meta.yaml b/script/app-mlperf-inference/meta.yaml index abf480eff..dcfea1431 100644 --- a/script/app-mlperf-inference/meta.yaml +++ b/script/app-mlperf-inference/meta.yaml @@ -1820,6 +1820,8 @@ variations: nvidia-inference-server: version: r4.1 tags: _go + nvidia-harness: + tags: _v4.0 intel-harness: tags: _v4.1 nvidia-scratch-space: @@ -1841,6 +1843,8 @@ variations: nvidia-inference-server: version: r4.0 tags: _mlcommons + nvidia-harness: + tags: _v4.0 intel-harness: tags: _v4.1 inference-src: @@ -1862,6 +1866,8 @@ variations: nvidia-inference-server: version: r5.0 tags: _mlcommons + nvidia-harness: + tags: _v5.0 intel-harness: tags: _v4.1 inference-src: