Fixes mlcommons#925, llvm src install, support --docker_host_mlc_repos

Author: amd-arsuresh

.github/workflows/test-mlc-script-features.yml

@@ -103,6 +103,60 @@ jobs:
       run: |
         mlcr run,docker,container --adr.compiler.tags=gcc --docker_mlc_repo=mlcommons@mlperf-automations --docker_mlc_repo_branch=dev --image_name=mlc-script-app-image-classification-onnx-py --env.MLC_DOCKER_RUN_SCRIPT_TAGS=app,image-classification,onnx,python --env.MLC_DOCKER_IMAGE_BASE=ubuntu:22.04 --env.MLC_DOCKER_IMAGE_REPO=local --quiet
 
+    - name: Test docker process_mounts input_mapping fallback (src_path fix)
+      shell: bash
+      run: |
+        python3 << 'PYTEST'
+        import subprocess, re, sys, os
+
+        # Find the automation/script directory via mlc
+        out = subprocess.run(['mlc', 'find', 'script', '--tags=detect,os', '--quiet'],
+                             capture_output=True, text=True)
+        match = re.search(r'Item path:\s*(.+)', out.stdout + out.stderr)
+        if not match:
+            print("ERROR: Could not locate MLC repo via 'mlc find script'")
+            sys.exit(1)
+        repo_root = os.path.dirname(os.path.dirname(match.group(1).strip()))
+        sys.path.insert(0, os.path.join(repo_root, 'automation'))
+
+        from script.docker_utils import process_mounts
+
+        # Test 1: input_mapping in run_state is used as fallback for docker path remapping
+        docker_settings = {'user': 'mlcuser'}
+        mounts = ['${{ MLC_SRC_REPO_PATH }}:${{ MLC_SRC_REPO_PATH }}']
+        env = {'MLC_SRC_REPO_PATH': '/home/user/repos/my-project'}
+        run_state = {
+            'input_mapping': {'src_path': 'MLC_SRC_REPO_PATH'},
+            'file_path_env_keys': [],
+            'folder_path_env_keys': []
+        }
+        f_run_cmd = {'src_path': '/home/user/repos/my-project'}
+
+        result = process_mounts(mounts, env, docker_settings, f_run_cmd, run_state)
+        assert result['return'] == 0, f"process_mounts failed: {result}"
+        assert f_run_cmd['src_path'] != '/home/user/repos/my-project', \
+            f"FAIL: src_path was not remapped to container path! Got: {f_run_cmd['src_path']}"
+        assert '/mlc-mount/' in f_run_cmd['src_path'], \
+            f"FAIL: Expected /mlc-mount/ in remapped path, got: {f_run_cmd['src_path']}"
+        print(f"PASS: src_path correctly remapped to {f_run_cmd['src_path']}")
+
+        # Test 2: without input_mapping, f_run_cmd should not be modified
+        f_run_cmd2 = {'src_path': '/home/user/repos/my-project'}
+        run_state2 = {
+            'input_mapping': {},
+            'file_path_env_keys': [],
+            'folder_path_env_keys': []
+        }
+        mounts2 = ['${{ MLC_SRC_REPO_PATH }}:${{ MLC_SRC_REPO_PATH }}']
+        result2 = process_mounts(mounts2, env, docker_settings, f_run_cmd2, run_state2)
+        assert result2['return'] == 0
+        assert f_run_cmd2['src_path'] == '/home/user/repos/my-project', \
+            f"FAIL: Without input_mapping, src_path should be unchanged, got: {f_run_cmd2['src_path']}"
+        print("PASS: Without input_mapping, src_path stays as host path")
+
+        print("\nAll process_mounts tests passed!")
+        PYTEST
+
   test_experiment:
     runs-on: ${{ matrix.os }}
     strategy:

automation/script/docker.py

@@ -156,6 +156,7 @@ def dockerfile(self_module, input_params):
     state = {}
     state['dockerfile_env'] = dockerfile_env
     state['dockerfile_build_env'] = dockerfile_build_env
+
     # Generate Dockerfile
     mlc_docker_input = {
         'action': 'run', 'automation': 'script', 'tags': 'build,dockerfile',
@@ -170,6 +171,9 @@ def dockerfile(self_module, input_params):
     if docker_inputs.get('mlc_repo_path', '') != '':
         mlc_docker_input['mlc_repo_path'] = docker_inputs['mlc_repo_path']
 
+    if is_true(input_params.get('docker_host_mlc_repos', '')):
+        mlc_docker_input['host_mlc_repos'] = 'yes'
+
     docker_v = False
     docker_s = False
     if is_true(input_params.get(

automation/script/docker_utils.py

@@ -45,7 +45,7 @@ def process_mounts(mounts, env, docker_settings, f_run_cmd, run_state):
         if "${{ " + key + " }}:${{ " + key + " }}" not in mounts:
             mounts.append("${{ " + key + " }}:${{ " + key + " }}")
 
-    docker_input_mapping = docker_settings.get("input_mapping", {})
+    docker_input_mapping = docker_settings.get("input_mapping", run_state.get("input_mapping", {}))
     container_env_string = ""
 
     for index in range(len(mounts)):

automation/script/module.py

@@ -5872,6 +5872,7 @@ def update_state_from_meta(meta, env, state, const, const_state, run_state, i):
 
     input_mapping = meta.get('input_mapping', {})
     if input_mapping:
+        run_state['input_mapping'] = input_mapping
         update_env_from_input_mapping(
             env,
             input_update_env,

script/README.md

@@ -1,6 +1,6 @@
 # MLCommons Automation Scripts
 
-*Last updated: 2026-04-21 04:32:01*
+*Last updated: 2026-04-22 06:04:04*
 
 This directory contains automation scripts for MLPerf benchmarks, AI/ML workflows, and development operations.
 

script/build-dockerfile/customize.py

@@ -343,7 +343,50 @@ def preprocess(i):
     f.write(EOL + '# Download MLC repo for scripts' + EOL)
     pat = env.get('MLC_GH_TOKEN', '')
 
-    if use_copy_repo:
+    if is_true(env.get('MLC_DOCKER_HOST_MLC_REPOS', '')):
+        # Copy all host MLC repos into the Docker image
+        host_repos_path = i['automation'].action_object.repos_path
+        if host_repos_path and os.path.isdir(host_repos_path):
+            build_context_dir = os.path.dirname(
+                env.get('MLC_DOCKERFILE_WITH_PATH',
+                        os.path.join(os.getcwd(), "Dockerfile")))
+            host_repos_context = os.path.join(build_context_dir, "mlc_host_repos")
+            if os.path.exists(host_repos_context):
+                shutil.rmtree(host_repos_context)
+            os.makedirs(host_repos_context, exist_ok=True)
+
+            copied_repos = []
+            for item in os.listdir(host_repos_path):
+                item_path = os.path.join(host_repos_path, item)
+                if not os.path.isdir(item_path):
+                    continue
+                # Skip local cache, index files, etc.
+                if item in ['local']:
+                    continue
+                dest = os.path.join(host_repos_context, item)
+                logger.info(f"Copying host repo {item} to build context")
+                shutil.copytree(item_path, dest)
+                copied_repos.append(item)
+
+            if copied_repos:
+                docker_repos_dest = "$HOME/MLC/repos"
+                for repo_name in copied_repos:
+                    relative_path = os.path.relpath(
+                        os.path.join(host_repos_context, repo_name),
+                        build_context_dir)
+                    f.write(
+                        f'COPY --chown={docker_user}:{docker_group} {relative_path} {docker_repos_dest}/{repo_name}' +
+                        EOL)
+                f.write(EOL + '# Register host MLC repositories' + EOL)
+                for repo_name in copied_repos:
+                    f.write(
+                        f'RUN mlc add repo {docker_repos_dest}/{repo_name} --quiet' +
+                        EOL)
+                f.write(EOL)
+        else:
+            logger.warning(f"MLC_DOCKER_HOST_MLC_REPOS_PATH not found: {host_repos_path}")
+
+    elif use_copy_repo:
         repo_name = os.path.basename(relative_repo_path)
         docker_repo_dest = f"$HOME/MLC/repos/{repo_name}"
         f.write(

script/build-dockerfile/meta.yaml

@@ -47,6 +47,7 @@ input_mapping:
   mlc_repo_flags: MLC_DOCKER_ADD_FLAG_TO_MLC_MLOPS_REPO
   mlc_repo_path: MLC_REPO_PATH
   mlc_repos: MLC_DOCKER_EXTRA_MLC_REPOS
+  host_mlc_repos: MLC_DOCKER_HOST_MLC_REPOS
   os: MLC_DOCKER_OS
   os_version: MLC_DOCKER_OS_VERSION
   package_manager_update_cmd: MLC_PACKAGE_MANAGER_UPDATE_CMD

script/install-llvm-src/meta.yaml

@@ -33,6 +33,7 @@ input_mapping:
   pull_changes: MLC_LLVM_REPO_PULL_CHANGES
   target_triple: MLC_LLVM_TARGET_TRIPLE
   targets: MLC_LLVM_TARGETS_TO_BUILD
+  src_path: MLC_LLVM_SRC_REPO_PATH
 
 # Dependencies
 deps:
@@ -54,9 +55,11 @@ deps:
   names:
   - llvm-src-repo
   tags: get,git,repo
-  skip_if_env:
+  skip_if_any_env:
     MLC_LLVM_INSTALLED_PATH:
     - true
+    MLC_LLVM_SRC_REPO_PATH:
+    - on
   update_tags_from_env_with_prefix:
     _branch.:
     - MLC_GIT_CHECKOUT
@@ -146,7 +149,7 @@ variations:
   openmp:
     default: true
     env:
-      +MLC_LLVM_ENABLE_PROJECTS:
+      +MLC_LLVM_ENABLE_RUNTIMES:
       - openmp
     group: openmp
   no-openmp-rt:
@@ -341,6 +344,8 @@ docker:
   skip_run_cmd: true
   pre_run_cmds:
   - mlc pull repo
+  mounts:
+    - ${{ MLC_LLVM_SRC_REPO_PATH }}:${{ MLC_LLVM_SRC_REPO_PATH }}
 
 # Output / debugging
 sort: 1000