Merge branch 'dev' into dev

Author: amd-arsuresh

script/app-mlperf-inference/customize.py

@@ -593,8 +593,8 @@ def postprocess(i):
                     {'run_script_input': run_script_input, 'env': env, 'script_name': 'verify_accuracy'})
                 if r['return'] > 0:
                     return r
-        import submission_checker_main as checker
-        is_valid = checker.check_compliance_perf_dir(
+        import submission_checker.utils as checker_utils
+        is_valid = checker_utils.check_compliance_perf_dir(
             COMPLIANCE_DIR) if test != "TEST06" else True
         state['mlc-mlperf-inference-results'][state['MLC_SUT_CONFIG_NAME']
                                               ][model][scenario][test] = "passed" if is_valid else "failed"

script/generate-mlperf-inference-user-conf/customize.py

@@ -265,19 +265,11 @@ def preprocess(i):
         else:
             audit_path = test
 
-        if env['MLC_BENCHMARK_GROUP'] == "automotive":
-            audit_full_path = os.path.join(
-                env['MLC_MLPERF_INFERENCE_SOURCE'],
-                "compliance",
-                audit_path,
-                "audit.config")
-        else:
-            audit_full_path = os.path.join(
-                env['MLC_MLPERF_INFERENCE_SOURCE'],
-                "compliance",
-                "nvidia",
-                audit_path,
-                "audit.config")
+        audit_full_path = os.path.join(
+            env['MLC_MLPERF_INFERENCE_SOURCE'],
+            "compliance",
+            audit_path,
+            "audit.config")
 
         env['MLC_MLPERF_INFERENCE_AUDIT_PATH'] = audit_full_path
         # copy the audit conf to the run directory incase the implementation is
@@ -526,19 +518,11 @@ def run_files_exist(mode, OUTPUT_DIR, run_files, env, logger):
 
         test = env['MLC_MLPERF_LOADGEN_COMPLIANCE_TEST']
 
-        if env['MLC_BENCHMARK_GROUP'] == "automotive":
-            SCRIPT_PATH = os.path.join(
-                env['MLC_MLPERF_INFERENCE_SOURCE'],
-                "compliance",
-                test,
-                "run_verification.py")
-        else:
-            SCRIPT_PATH = os.path.join(
-                env['MLC_MLPERF_INFERENCE_SOURCE'],
-                "compliance",
-                "nvidia",
-                test,
-                "run_verification.py")
+        SCRIPT_PATH = os.path.join(
+            env['MLC_MLPERF_INFERENCE_SOURCE'],
+            "compliance",
+            test,
+            "run_verification.py")
 
         if test == "TEST06":
             cmd = f"{env['MLC_PYTHON_BIN_WITH_PATH']}  {SCRIPT_PATH}  -c  {COMPLIANCE_DIR}  -o  {OUTPUT_DIR} --scenario {scenario} --dtype int32"