Merge branch 'dev' into dev

Author: amd-arsuresh

.github/workflows/test-mlperf-inference-mlcommons-cpp-resnet50.yml

@@ -22,6 +22,9 @@ jobs:
         exclude:
           - os: windows-latest
           - os: macos-latest
+            compiler-string: --adr.compiler.tags=gcc
+          - os: macos-latest
+            compiler-string: --adr.compiler.tags=aocc --env.MLC_AOCC_ACCEPT_EULA=yes
 
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -25,3 +25,4 @@ repos.json
 index_script.json
 index_cache.json
 index_experiment.json
+*.egg-info/

automation/script/docker_utils.py

@@ -45,7 +45,8 @@ 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", run_state.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

@@ -2658,7 +2658,7 @@ def search(self, i):
 
         script_tags = i.get('script_tags', [])
         variation_tags = i.get('variation_tags', [])
-        
+
         if not script_tags and tags_string:
             r = get_variation_and_script_tags(tags_string.strip())
             script_tags = r['script_tags']
@@ -4483,8 +4483,8 @@ def docker(self, i):
         from script.docker import docker_run
         return docker_run(self, i)
 
-
     ############################################################
+
     def apptainerfile(self, i):
         from script.apptainer import apptainerfile
         return apptainerfile(self, i)
@@ -4494,6 +4494,7 @@ def apptainer(self, i):
         from script.apptainer import apptainer_run
         return apptainer_run(self, i)
     ############################################################
+
     def experiment(self, i):
         from script.experiment import experiment_run
         return experiment_run(self, i)
@@ -5929,7 +5930,6 @@ def update_state_from_meta(meta, env, state, const, const_state, run_state, i):
     if folder_path_env_keys:
         run_state['folder_path_env_keys'] += folder_path_env_keys
 
-    
     return {'return': 0}
 
 ##############################################################################

script/app-mlperf-inference-mlcommons-cpp/customize.py

@@ -111,10 +111,9 @@ def preprocess(i):
     if '+ LDCXXFLAGS' not in env:
         env['+ LDCXXFLAGS'] = []
 
-    env['+ LDCXXFLAGS'] += [
-        "-lmlperf_loadgen",
-        "-lpthread"
-    ]
+    env['+ LDCXXFLAGS'].append("-lmlperf_loadgen")
+    if os_info['platform'] != 'darwin':
+        env['+ LDCXXFLAGS'].append("-lpthread")
 
     # For PyTorch, link against torch, torch_cpu, and c10
     if env.get('MLC_MLPERF_BACKEND', '') == 'pytorch':

script/build-dockerfile/customize.py

@@ -350,7 +350,8 @@ def preprocess(i):
             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")
+            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)
@@ -384,7 +385,8 @@ def preprocess(i):
                         EOL)
                 f.write(EOL)
         else:
-            logger.warning(f"MLC_DOCKER_HOST_MLC_REPOS_PATH not found: {host_repos_path}")
+            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)