Fixes for mlperf inference code (#224)

* Fixes for mlperf inference code

Author: arjunsuresh

script/app-mlperf-inference-ctuning-cpp-tflite/customize.py

@@ -86,9 +86,6 @@ def preprocess(i):
     env['MLC_LINKER_LANG'] = 'CXX'
     env['MLC_RUN_DIR'] = os.getcwd()
 
-    if 'MLC_MLPERF_CONF' not in env:
-        env['MLC_MLPERF_CONF'] = os.path.join(
-            env['MLC_MLPERF_INFERENCE_SOURCE'], "mlperf.conf")
     if 'MLC_MLPERF_USER_CONF' not in env:
         env['MLC_MLPERF_USER_CONF'] = os.path.join(
             env['MLC_MLPERF_INFERENCE_CLASSIFICATION_AND_DETECTION_PATH'], "user.conf")

script/app-mlperf-inference-ctuning-cpp-tflite/src/classification.cpp

@@ -336,7 +336,6 @@ void TestSingleStream(Program *prg) {
   SystemUnderTestSingleStream sut(prg);
   QuerySampleLibrarySingleStream qsl(prg);
 
-  const std::string mlperf_conf_path = getenv_s("MLC_MLPERF_CONF");
   const std::string user_conf_path = getenv_s("MLC_MLPERF_USER_CONF");
   const std::string audit_conf_path =
       getenv_opt_s("MLC_MLPERF_INFERENCE_AUDIT_PATH", "");
@@ -347,7 +346,6 @@ void TestSingleStream(Program *prg) {
   const std::string scenario_string = getenv_s("MLC_MLPERF_LOADGEN_SCENARIO");
   const std::string mode_string = getenv_s("MLC_MLPERF_LOADGEN_MODE");
 
-  std::cout << "Path to mlperf.conf : " << mlperf_conf_path << std::endl;
   std::cout << "Path to user.conf : " << user_conf_path << std::endl;
   std::cout << "Model Name: " << model_name << std::endl;
   std::cout << "LoadGen Scenario: " << scenario_string << std::endl;
@@ -374,12 +372,6 @@ void TestSingleStream(Program *prg) {
                   ? mlperf::TestMode::FindPeakPerformance
                   : mlperf::TestMode::SubmissionRun;
 
-  if (ts.FromConfig(mlperf_conf_path, model_name, scenario_string)) {
-    std::cout << "Issue with mlperf.conf file at " << mlperf_conf_path
-              << std::endl;
-    exit(1);
-  }
-
   if (ts.FromConfig(user_conf_path, model_name, scenario_string)) {
     std::cout << "Issue with user.conf file at " << user_conf_path << std::endl;
     exit(1);

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

@@ -91,9 +91,6 @@ def preprocess(i):
     env['MLC_LINKER_LANG'] = 'CXX'
     env['MLC_RUN_DIR'] = os.getcwd()
 
-    if 'MLC_MLPERF_CONF' not in env:
-        env['MLC_MLPERF_CONF'] = os.path.join(
-            env['MLC_MLPERF_INFERENCE_SOURCE'], "mlperf.conf")
     if 'MLC_MLPERF_USER_CONF' not in env:
         env['MLC_MLPERF_USER_CONF'] = os.path.join(
             env['MLC_MLPERF_INFERENCE_CLASSIFICATION_AND_DETECTION_PATH'], "user.conf")

script/app-mlperf-inference-mlcommons-cpp/src/main.cpp

@@ -23,7 +23,6 @@ class InputSettings {
 
 public:
   InputSettings() {
-    mlperf_conf_path = getenv("MLC_MLPERF_CONF", "../inference/mlperf.conf");
     user_conf_path =
         getenv("MLC_MLPERF_USER_CONF",
                "../inference/vision/classification_and_detection/user.conf");
@@ -49,7 +48,6 @@ class InputSettings {
     performance_sample_count =
         std::stol(getenv("MLC_MLPERF_LOADGEN_PERFORMANCE_SAMPLE_COUNT", "0"));
     batch_size = std::stol(getenv("MLC_MLPERF_LOADGEN_MAX_BATCHSIZE", "32"));
-    std::cout << "MLPerf Conf path: " << mlperf_conf_path << std::endl;
     std::cout << "User Conf path: " << user_conf_path << std::endl;
     std::cout << "Dataset Preprocessed path: " << dataset_preprocessed_path
               << std::endl;
@@ -62,7 +60,6 @@ class InputSettings {
               << performance_sample_count << std::endl;
   }
 
-  std::string mlperf_conf_path;
   std::string user_conf_path;
   std::string audit_conf_path;
   std::string output_dir;
@@ -104,14 +101,6 @@ int main(int argc, const char *argv[]) {
                            ? mlperf::TestMode::FindPeakPerformance
                            : mlperf::TestMode::SubmissionRun;
 
-  // read test settings from mlperf.conf and user.conf
-  if (test_settings.FromConfig(input_settings.mlperf_conf_path,
-                               input_settings.model_name,
-                               input_settings.scenario_name)) {
-    std::cerr << "Could not read mlperf.conf at "
-              << input_settings.mlperf_conf_path << std::endl;
-    return 1;
-  }
   if (test_settings.FromConfig(input_settings.user_conf_path,
                                input_settings.model_name,
                                input_settings.scenario_name)) {

script/app-mlperf-inference/customize.py

@@ -311,6 +311,8 @@ def postprocess(i):
         # if custom model name is not set, the official model name will be
         # mapped to itself
         official_model_name = model
+        if "efficientnet" in official_model_name or "mobilenet" in official_model_name:
+            official_model_name = "resnet"
         model_mapping = {model_full_name: official_model_name}
         with open("model_mapping.json", "w") as fp:
             json.dump(model_mapping, fp, indent=2)

script/run-mlperf-inference-mobilenet-models/meta.yaml

@@ -9,7 +9,7 @@ default_env:
   MLC_MLPERF_RUN_INT8: 'yes'
   MLC_MLPERF_RUN_MOBILENETS: 'no'
 deps:
-- tags: get,sys-utils-cm
+- tags: get,sys-utils-mlc
 docker:
   input_mapping:
     imagenet_path: IMAGENET_PATH
@@ -21,8 +21,8 @@ docker:
   fake_run_deps: false
   mounts:
   - ${{ IMAGENET_PATH }}:${{ IMAGENET_PATH }}
-  - ${{ RESULTS_DIR }}:/home/cmuser/mobilenet_results
-  - ${{ SUBMISSION_DIR }}:/home/cmuser/inference_submission_3.1
+  - ${{ RESULTS_DIR }}:${{ RESULTS_DIR }}
+  - ${{ SUBMISSION_DIR }}:${{ SUBMISSION_DIR }}
   run: true
 input_mapping:
   find-performance: MLC_MLPERF_FIND_PERFORMANCE_MODE