Skip to content

Commit f40a4d5

Browse files
committed
Added get-tool-perf, fixes some version detection errors
1 parent 8201223 commit f40a4d5

14 files changed

Lines changed: 142 additions & 57 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ htmlcov
1818
tmp-*
1919
local/cache/
2020
mlc-log.txt
21+
.mlc-log.txt
2122
repos.json
2223
index_script.json
2324
index_cache.json

automation/script/module.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,9 +1723,9 @@ def _run(self, i):
17231723
# Assemble PIP versions
17241724
pip_version_string = ''
17251725

1726-
pip_version = env.get('MLC_VERSION', '')
1727-
pip_version_min = env.get('MLC_VERSION_MIN', '')
1728-
pip_version_max = env.get('MLC_VERSION_MAX', '')
1726+
pip_version = str(env.get('MLC_VERSION', ''))
1727+
pip_version_min = str(env.get('MLC_VERSION_MIN', ''))
1728+
pip_version_max = str(env.get('MLC_VERSION_MAX', ''))
17291729

17301730
if pip_version != '':
17311731
pip_version_string = '==' + pip_version
@@ -4786,6 +4786,7 @@ def relaxed_subset(v, variation_tags):
47864786
def get_version_tag_from_version(version, cached_tags):
47874787
tags_to_add = []
47884788
if version != '':
4789+
version = str(version)
47894790
if 'version-' + version not in cached_tags:
47904791
cached_tags.append('version-' + version)
47914792
if '-git-' in version:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,9 @@ variations:
609609
linux-tools:
610610
env:
611611
MLC_SYS_UTIL_NAME: linux-tools
612+
MLC_SYS_UTIL_VERSION_CMD: perf --version
613+
MLC_SYS_UTIL_VERSION_RE: \b(\d+\.\d+(?:\.\d+)?)\b
614+
MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 0
612615
new_env_keys:
613616
- MLC_LINUX_TOOLS_VERSION
614617
state:

script/get-intel-sde-tool/meta.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.
File renamed without changes.
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
alias: get-intel-pin-tool
1+
alias: get-tool-intel-pin
22
automation_alias: script
33
automation_uid: 5b4e0237da074764
44
cache: true
@@ -29,12 +29,6 @@ post_deps: []
2929
posthook_deps: []
3030
tags:
3131
- get-intel-pin-tool
32-
- get-intel-pintool
33-
- get
34-
- intel
35-
- pintool
36-
- pin
37-
- tool
3832
tests:
3933
run_inputs:
4034
- {}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
alias: get-tool-intel-sde
2+
automation_alias: script
3+
automation_uid: 5b4e0237da074764
4+
cache: true
5+
category: MLC Utils
6+
deps:
7+
- tags: detect,os
8+
- enable_if_env:
9+
MLC_DOWNLOAD_URL:
10+
- true
11+
extra_cache_tags: intel,sde,tool
12+
force_cache: true
13+
skip_if_env:
14+
MLC_INTEL_SDE_DIR_PATH:
15+
- true
16+
tags: download-and-extract,_extract
17+
update_tags_from_env_with_prefix:
18+
_url.:
19+
- MLC_DOWNLOAD_URL
20+
input_mapping:
21+
sde_dir: MLC_INTEL_SDE_DIR_PATH
22+
new_env_keys:
23+
- MLC_INTEL_SDE_DIR_PATH
24+
- MLC_INTEL_SDE_BIN_WITH_PATH
25+
- MLC_INTEL_SDE_VERSION
26+
- +PATH
27+
new_state_keys: []
28+
post_deps: []
29+
posthook_deps: []
30+
tags:
31+
- get-intel-sde-tool
32+
tests:
33+
run_inputs:
34+
- {}
35+
uid: 3546409e71c847bc
36+
variations:
37+
version.9_53_0:
38+
default: true
39+
env:
40+
MLC_DOWNLOAD_URL: https://downloadmirror.intel.com/850782/sde-external-9.53.0-2025-03-16-lin.tar.xz
41+
group: version

0 commit comments

Comments
 (0)