Merge pull request #704 from amd/dev

Merge from AMD

Author: arjunsuresh

.gitignore

@@ -18,6 +18,7 @@ htmlcov
 tmp-*
 local/cache/
 mlc-log.txt
+.mlc-log.txt
 repos.json
 index_script.json
 index_cache.json

automation/script/module.py

@@ -1723,9 +1723,9 @@ def _run(self, i):
             # Assemble PIP versions
             pip_version_string = ''
 
-            pip_version = env.get('MLC_VERSION', '')
-            pip_version_min = env.get('MLC_VERSION_MIN', '')
-            pip_version_max = env.get('MLC_VERSION_MAX', '')
+            pip_version = str(env.get('MLC_VERSION', ''))
+            pip_version_min = str(env.get('MLC_VERSION_MIN', ''))
+            pip_version_max = str(env.get('MLC_VERSION_MAX', ''))
 
             if pip_version != '':
                 pip_version_string = '==' + pip_version
@@ -4786,6 +4786,7 @@ def relaxed_subset(v, variation_tags):
 def get_version_tag_from_version(version, cached_tags):
     tags_to_add = []
     if version != '':
+        version = str(version)
         if 'version-' + version not in cached_tags:
             cached_tags.append('version-' + version)
         if '-git-' in version:

automation/script/remote_run.py

@@ -65,7 +65,7 @@ def remote_run(self_module, i):
     if i.get('remote_pull_mlc_repos', False):
         run_cmds.append("mlc pull repo")
 
-    script_run_cmd = " ".join(mlc_run_cmd.split(" ")[3:])
+    script_run_cmd = " ".join(mlc_run_cmd.split(" ")[1:])
     run_cmds.append(f"mlcr {script_run_cmd}")
 
     remote_inputs = {}

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

@@ -609,6 +609,9 @@ variations:
   linux-tools:
     env:
       MLC_SYS_UTIL_NAME: linux-tools
+      MLC_SYS_UTIL_VERSION_CMD: perf --version
+      MLC_SYS_UTIL_VERSION_RE: \b(\d+\.\d+(?:\.\d+)?)\b
+      MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 0
     new_env_keys:
     - MLC_LINUX_TOOLS_VERSION
     state:

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

@@ -0,0 +1,66 @@
+# README for get-intel-pin-tool
+This README is automatically generated. Add custom content in [info.md](info.md). Please follow the [script execution document](https://docs.mlcommons.org/mlcflow/targets/script/execution-flow/) to understand more about the MLC script execution.
+
+`mlcflow` stores all local data under `$HOME/MLC` by default. So, if there is space constraint on the home directory and you have more space on say `/mnt/$USER`, you can do
+```
+mkdir /mnt/$USER/MLC
+ln -s /mnt/$USER/MLC $HOME/MLC
+```
+You can also use the `ENV` variable `MLC_REPOS` to control this location but this will need a set after every system reboot.
+
+## Setup
+
+If you are not on a Python development environment please refer to the [official docs](https://docs.mlcommons.org/mlcflow/install/) for the installation.
+
+```bash
+python3 -m venv mlcflow
+. mlcflow/bin/activate
+pip install mlcflow
+```
+
+- Using a virtual environment is recommended (per `pip` best practices), but you may skip it or use `--break-system-packages` if needed.
+
+### Pull mlperf-automations
+
+Once `mlcflow` is installed:
+
+```bash
+mlc pull repo mlcommons@mlperf-automations --pat=<Your Private Access Token>
+```
+- `--pat` or `--ssh` is only needed if the repo is PRIVATE
+- If `--pat` is avoided, you'll be asked to enter the password where you can enter your Private Access Token
+- `--ssh` option can be used instead of `--pat=<>` option if you prefer to use SSH for accessing the github repository.
+## Run Commands
+
+```bash
+mlcr get-intel-pin-tool,get-intel-pintool,get,intel,pintool,pin,tool
+```
+
+### Script Inputs
+
+| Name | Description | Choices | Default |
+|------|-------------|---------|------|
+| `--pintool_dir` |  |  | `` |
+### Generic Script Inputs
+
+| Name | Description | Choices | Default |
+|------|-------------|---------|------|
+| `--input` | Input to the script passed using the env key `MLC_INPUT` |  | `` |
+| `--output` | Output from the script passed using the env key `MLC_OUTPUT` |  | `` |
+| `--outdirname` | The directory to store the script output |  | `cache directory ($HOME/MLC/repos/local/cache/<>) if the script is cacheable or else the current directory` |
+| `--outbasename` | The output file/folder name |  | `` |
+| `--name` |  |  | `` |
+| `--extra_cache_tags` | Extra cache tags to be added to the cached entry when the script results are saved |  | `` |
+| `--skip_compile` | Skip compilation |  | `False` |
+| `--skip_run` | Skip run |  | `False` |
+| `--accept_license` | Accept the required license requirement to run the script |  | `False` |
+| `--skip_system_deps` | Skip installing any system dependencies |  | `False` |
+| `--git_ssh` | Use SSH for git repos |  | `False` |
+| `--gh_token` | Github Token |  | `` |
+| `--hf_token` | Huggingface Token |  | `` |
+| `--verify_ssl` | Verify SSL |  | `False` |
+## Variations
+
+### Version
+
+- `version.4.0` (default)

script/get-tool-intel-pin/README.md

@@ -1,4 +1,4 @@
-alias: get-intel-pin-tool
+alias: get-tool-intel-pin
 automation_alias: script
 automation_uid: 5b4e0237da074764
 cache: true
@@ -29,12 +29,6 @@ post_deps: []
 posthook_deps: []
 tags:
 - get-intel-pin-tool
-- get-intel-pintool
-- get
-- intel
-- pintool
-- pin
-- tool
 tests:
   run_inputs:
   - {}