Skip to content

Commit 8b19450

Browse files
authored
Merge from GO (#448)
* Added option to skip detect-sudo, support postfix detection * Support installation variations in get,llvm * Fix tags for nvidia-harness
1 parent 3509e2c commit 8b19450

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

script/app-mlperf-inference/meta.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,6 +1820,8 @@ variations:
18201820
nvidia-inference-server:
18211821
version: r4.1
18221822
tags: _go
1823+
nvidia-harness:
1824+
tags: _v4.0
18231825
intel-harness:
18241826
tags: _v4.1
18251827
nvidia-scratch-space:
@@ -1841,6 +1843,8 @@ variations:
18411843
nvidia-inference-server:
18421844
version: r4.0
18431845
tags: _mlcommons
1846+
nvidia-harness:
1847+
tags: _v4.0
18441848
intel-harness:
18451849
tags: _v4.1
18461850
inference-src:
@@ -1862,6 +1866,8 @@ variations:
18621866
nvidia-inference-server:
18631867
version: r5.0
18641868
tags: _mlcommons
1869+
nvidia-harness:
1870+
tags: _v5.0
18651871
intel-harness:
18661872
tags: _v4.1
18671873
inference-src:

script/detect-sudo/customize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def preprocess(i):
2727
env['MLC_SUDO'] = '' # root user does not need sudo
2828
env['MLC_SUDO_USER'] = "yes"
2929
else:
30-
if can_execute_sudo_without_password(
31-
logger) or prompt_sudo(logger) == 0:
30+
if not is_true(env.get('MLC_SKIP_SUDO')) and (can_execute_sudo_without_password(
31+
logger) or prompt_sudo(logger) == 0):
3232
env['MLC_SUDO_USER'] = "yes"
3333
env['MLC_SUDO'] = 'sudo'
3434

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,9 @@ variations:
662662
postfix:
663663
env:
664664
MLC_SYS_UTIL_NAME: postfix
665+
MLC_SYS_UTIL_VERSION_CMD: postconf mail_version
666+
MLC_SYS_UTIL_VERSION_RE: mail_version = \b(\d+\.\d+(?:\.\d+)?)\b
667+
MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 1
665668
new_env_keys:
666669
- MLC_POSTFIX_VERSION
667670
state:

script/get-llvm/meta.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ prehook_deps:
2727
- 'yes'
2828
names: llvm-install
2929
reuse_version: true
30+
inherit_variation_tags: true
31+
skip_inherit_variation_groups:
32+
- install-src
3033
tags: install,llvm
3134
sort: 100
3235
tags:
@@ -39,13 +42,24 @@ tags:
3942
uid: 99832a103ed04eb8
4043
variations:
4144
from-prebuilt:
45+
group: install-src
46+
default: true
4247
ad:
4348
llvm-install:
4449
tags: prebuilt
4550
from-src:
51+
group: install-src
4652
ad:
4753
llvm-install:
4854
tags: src,_clang
4955
path.#:
5056
env:
5157
MLC_LLVM_DIR_PATH: '#'
58+
release: {}
59+
version.#: {}
60+
branch.#: {}
61+
runtimes.#: {}
62+
flang: {}
63+
sha.#: {}
64+
tag.#: {}
65+

0 commit comments

Comments
 (0)