Changes after rebase ontop of fixes for mixed parameter fixes

Author: TedThemistokleous

onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc

@@ -153,7 +153,7 @@ MIGraphXExecutionProvider::MIGraphXExecutionProvider(const MIGraphXExecutionProv
     }
   }
 
-  //Save/load migraphx compiled models
+  // Save/load migraphx compiled models
   const std::string save_comp_model_env = onnxruntime::GetEnvironmentVar(migraphx_env_vars::kSaveCompiledModel);
   if (!save_comp_model_env.empty()) {
     save_compiled_model_ = (std::stoi(save_comp_model_env) == 0 ? false : true);
@@ -1151,8 +1151,7 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
     migraphx::program prog;
 
     if (!no_input_shape) {
-      if(!load_compiled_model_)
-      {
+      if (!load_compiled_model_) {
         LOGS_DEFAULT(INFO) << "No Input shapes detected quantizing model" << std::endl;
         prog = migraphx::parse_onnx_buffer(onnx_string_buffer, options);
 
@@ -1192,18 +1191,17 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
         prog.compile(t_, co);
         LOGS_DEFAULT(INFO) << "Model Compile: Complete" << std::endl;
 
-        if (save_compiled_model_)
-        {
+        if (save_compiled_model_) {
           LOGS_DEFAULT(INFO) << "Model Save: Begin" << std::endl;
           migraphx::file_options fo;
           fo.set_file_format("msgpack");
           migraphx::save(prog, save_compiled_path_.c_str(), fo);
           LOGS_DEFAULT(INFO) << "Model Save: Complete" << std::endl;
         }
-      }
-      else
-      {
+      } else {
+        LOGS_DEFAULT(INFO) << "Model Load: Attempting to Load Pre-Compiled Model" << std::endl;
         prog = migraphx::load(load_compiled_path_.c_str());
+        LOGS_DEFAULT(INFO) << "Model Load: Complete" << std::endl;
       }
 
       auto prog_output_shapes = prog.get_output_shapes();
@@ -1303,8 +1301,7 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
       // input shapes are different, needs to re-parse onnx and
       // re-compile the program
       if (!input_shape_match) {
-        if(!load_compiled_model_)
-        {
+        if (!load_compiled_model_) {
           LOGS_DEFAULT(VERBOSE) << "No Input shapes mismatch detected. Recompiling" << std::endl;
           prog = migraphx::parse_onnx_buffer(onnx_string, cmp_options);
 
@@ -1363,16 +1360,14 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
           prog.compile(t, co);
 
           LOGS_DEFAULT(INFO) << "Model Compile: Completed" << std::endl;
-          if (save_compiled_model_)
-          {
+          if (save_compiled_model_) {
             LOGS_DEFAULT(INFO) << "Model Save: Begin" << std::endl;
             migraphx::file_options fo;
             fo.set_file_format("msgpack");
             migraphx::save(prog, save_compiled_path_.c_str(), fo);
             LOGS_DEFAULT(INFO) << "Model Save: Completed" << std::endl;
           }
-        else
-        {
+        } else {
           prog = migraphx::load(load_compiled_path_.c_str());
         }
 
@@ -1462,7 +1457,7 @@ Status MIGraphXExecutionProvider::Compile(const std::vector<FusedNodeAndGraph>&
             HIP_CALL_THROW(hipMemcpy(output_data, gpu_res.data(), res_shape.bytes(), hipMemcpyDeviceToDevice));
           }
         }
-      }
+      };
 
       return Status::OK();
     };

onnxruntime/core/providers/migraphx/migraphx_execution_provider_info.cc

@@ -22,7 +22,6 @@ constexpr const char* kSaveModelPath = "migx_save_model_name";
 constexpr const char* kLoadCompiledModel = "migx_load_compiled_model";
 constexpr const char* kLoadModelPath = "migx_load_model_name";
 
-
 }  // namespace provider_option_names
 }  // namespace migraphx
 

onnxruntime/python/onnxruntime_pybind_state.cc

@@ -832,7 +832,11 @@ std::unique_ptr<IExecutionProvider> CreateExecutionProviderInstance(
           0,
           0,
           0,
-          nullptr};
+          nullptr,
+          1,
+          "./compiled_model.mxr",
+          1,
+          "./compiled_model.mxr"};
       for (auto option : it->second) {
         if (option.first == "device_id") {
           if (!option.second.empty()) {
@@ -879,7 +883,7 @@ std::unique_ptr<IExecutionProvider> CreateExecutionProviderInstance(
                 "[ERROR] [MIGraphX] The value for the key 'migx_int8_use_native_calibration_table' should be"
                 " 'True' or 'False'. Default value is 'False'.\n");
           }
-        } else if(option.first == "migraphx_save_compiled_model") {
+        } else if (option.first == "migraphx_save_compiled_model") {
           if (option.second == "True" || option.second == "true") {
             params.migraphx_fp16_enable = true;
           } else if (option.second == "False" || option.second == "false") {
@@ -889,16 +893,16 @@ std::unique_ptr<IExecutionProvider> CreateExecutionProviderInstance(
                 "[ERROR] [MIGraphX] The value for the key 'migx_save_compiled_model' should be"
                 " 'True' or 'False'. Default value is 'False'.\n");
           }
-        } else if(option.first == "migraphx_save_model_path") {
+        } else if (option.first == "migraphx_save_model_path") {
           if (!option.second.empty()) {
             save_model_path = option.second;
-            params.migraphx_save_compiled_model_path = save_model_path.c_str();
+            params.migraphx_save_model_path = save_model_path.c_str();
           } else {
             ORT_THROW(
                 "[ERROR] [MIGraphX] The value for the key 'migx_save_model_name' should be a "
-                "file name i.e. 'model.mxr'.\n");
+                "file name i.e. 'compiled_model.mxr'.\n");
           }
-        } else if(option.first == "migraphx_load_compiled_model") {
+        } else if (option.first == "migraphx_load_compiled_model") {
           if (option.second == "True" || option.second == "true") {
             params.migraphx_fp16_enable = true;
           } else if (option.second == "False" || option.second == "false") {
@@ -908,17 +912,16 @@ std::unique_ptr<IExecutionProvider> CreateExecutionProviderInstance(
                 "[ERROR] [MIGraphX] The value for the key 'migx_load_compiled_model' should be"
                 " 'True' or 'False'. Default value is 'False'.\n");
           }
-        } else if(option.first == "migraphx_load_model_path") {
+        } else if (option.first == "migraphx_load_model_path") {
           if (!option.second.empty()) {
             load_model_path = option.second;
-            params.migraphx_load_compiled_model_path = load_model_path.c_str();
+            params.migraphx_load_model_path = load_model_path.c_str();
           } else {
             ORT_THROW(
                 "[ERROR] [MIGraphX] The value for the key 'migx_load_model_name' should be a "
-                "file name i.e. 'model.mxr'.\n");
+                "file name i.e. 'compiled_model.mxr'.\n");
           }
-        }
-        else {
+        } else {
           ORT_THROW("Invalid MIGraphX EP option: ", option.first);
         }
       }

onnxruntime/test/util/default_providers.cc

@@ -76,7 +76,11 @@ std::unique_ptr<IExecutionProvider> DefaultMIGraphXExecutionProvider() {
       0,
       0,
       0,
-      nullptr};
+      nullptr,
+      1,
+      "./compiled_model.mxr",
+      1,
+      "./compiled_model.mxr"};
   return MIGraphXProviderFactoryCreator::Create(&params)->CreateProvider();
 #else
   return nullptr;