Removing the prints

Author: sfatimar

onnxruntime/core/providers/openvino/backend_utils.cc

@@ -38,6 +38,16 @@ bool IsCILogEnabled() {
   return false;
 }
 
+std::string get_shapes_string(const reshape_t& shapes) {
+  std::stringstream ss;
+  for (auto& shape : shapes) {
+    if (!ss.str().empty())
+      ss << ", ";
+    ss << "\'" << shape.first << "': " << shape.second;
+  }
+  return ss.str();
+}
+
 std::shared_ptr<const OVNetwork>
 CreateOVModel(std::string&& model,
               const SessionContext& session_context,
@@ -46,25 +56,29 @@ CreateOVModel(std::string&& model,
     std::cout << "CreateNgraphFunc" << std::endl;
   }
   try {
-    auto ov_model = OVCore::Get()->ReadModel(std::move(model), session_context.onnx_model_path_name.string());
+     auto ov_model = OVCore::Get()->ReadModel(std::move(model), session_context.onnx_model_path_name.string());
+
+     if (!session_context.affinity.empty()) {
+       LOGS_DEFAULT(INFO) << log_tag << "Setting the ov nodes to specified affinity";
+       Set_Affinity(ov_model, session_context);
+     }
 
     if (!session_context.reshape.empty()) {
       LOGS_DEFAULT(INFO) << log_tag << "Reshaping the ov tensor to specified shape";
       ov_model->reshape(session_context.reshape);
     }
 
+     ov::preprocess::PrePostProcessor preproc(ov_model);
+     ov_model = preproc.build();
+
+
     if (!session_context.layout.empty()) {
       LOGS_DEFAULT(INFO) << log_tag << "Setting the ov tensor layout to specified layout";
       ov_model = Set_Layout(ov_model, session_context.layout);
     }
 
-    if (!session_context.affinity.empty()) {
-      LOGS_DEFAULT(INFO) << log_tag << "Setting the ov nodes to specified affinity";
-      Set_Affinity(ov_model, session_context);
-    }
-
     // Check for Constant Folding
-    /* if ((session_context.device_type != "NPU") && !session_context.is_wholly_supported_graph) {
+    if ((session_context.device_type != "NPU") && !session_context.is_wholly_supported_graph) {
       ov::pass::ConstantFolding pass_const_obj;
       pass_const_obj.run_on_model(ov_model);
       auto& results = const_cast<ov::ResultVector&>(ov_model.get()->get_results());
@@ -78,7 +92,7 @@ CreateOVModel(std::string&& model,
         }
         --index;
       }
-    }*/
+    }
 #ifndef NDEBUG
     if (IsDebugEnabled()) {
       std::string name = ov_model->get_friendly_name();
@@ -168,10 +182,8 @@ void Set_Affinity(std::shared_ptr<OVNetwork> ov_model, const SessionContext& ses
      auto it = session_context.affinity.find(name);
      if (it != session_context.affinity.end()) {
        ov_node->get_rt_info()["affinity"] = it->second;
-       //std::cout << "node name " << name << " on " << it->second << "\t";
      } else {
        ov_node->get_rt_info()["affinity"] = selected_device;
-       //std::cout << "node name " << name << " on " << selected_device << "\t";
      }
   }
 }

onnxruntime/core/providers/openvino/backend_utils.h

@@ -108,6 +108,8 @@ bool IsModelStreamXML(std::istream& model_stream);
 
 void Set_Affinity(std::shared_ptr<OVNetwork> ov_model, const SessionContext& session_context);
 
+std::string get_shapes_string(const reshape_t& shapes);
+
 }  // namespace backend_utils
 }  // namespace openvino_ep
 }  // namespace onnxruntime

onnxruntime/core/providers/openvino/backends/basic_backend.cc

@@ -112,7 +112,6 @@ BasicBackend::BasicBackend(std::unique_ptr<ONNX_NAMESPACE::ModelProto>& model_pr
                                                    subgraph_context_.subgraph_name);
       } else {  // For all other types use ov::ov_core read_model() to generate OV IR
                 // followed by ov::ov_core compile_model()
-        std::cout << "CreateOVModel\n";
         ov_model = CreateOVModel(std::move(model), session_context_, const_outputs_map_);
         exe_network_ = OVCore::Get()->CompileModel(
             ov_model, hw_target, device_config, enable_causallm, subgraph_context_.subgraph_name);

onnxruntime/core/providers/openvino/backends/basic_backend.h

@@ -93,10 +93,13 @@ struct OnnxToOvNetworkBindings {
         //            "Input names mismatch between OpenVINO and ONNX. ", onnx_name,
         //            " doesn't exist in the list of OpenVINO input tensor names");
 
+        if (!matched_names) {
+          continue; 
+        }
         auto ov_param_index = std::distance(ov_parameters.begin(), it);
-
         auto shape = ov_parameters[ov_param_index].get_partial_shape();
         auto type = ov_parameters[ov_param_index].get_element_type();
+
         ParameterInfo info{onnx_name, ov_param_index, onnx_param_index, type, ParameterShape{shape}};
 
         // Analyze shape dynamism and set flags
@@ -125,7 +128,7 @@ struct OnnxToOvNetworkBindings {
             has_dynamic_io_ = true;
           }
         }
-
+        
         input_output_map.push_back(std::move(info));
       }
     };

onnxruntime/core/providers/openvino/openvino_execution_provider.cc

@@ -185,7 +185,6 @@ common::Status OpenVINOExecutionProvider::Compile(
 
       for (const auto& fused_node_graph : fused_nodes) {
         const GraphViewer& graph_body_viewer = fused_node_graph.filtered_graph;
-
         // Set include_embed_data to true only for the first backend manager
         backend_it->TryExportCompiledBlobAsEPCtxNode(graph_body_viewer, is_first);
 

onnxruntime/core/providers/openvino/openvino_parser_utils.cc

@@ -327,8 +327,6 @@ affinity_t OpenVINOParserUtils::ParseAffinity(const std::string& affinity_defini
     std::smatch device_match = *device_it;
     std::string device_name = device_match[1].str();
     std::string nodes_list_str = device_match[2].str();
-    //std::cout << "device_name " << device_name << "\n";
-    //std::cout << "nodes_list_str " << nodes_list_str << "\n";
     std::stringstream nodes_list(nodes_list_str);
     std::string item;
 
@@ -337,9 +335,6 @@ affinity_t OpenVINOParserUtils::ParseAffinity(const std::string& affinity_defini
     }
   }
 
-  //for (auto item : result_map){
-  //  std::cout << "\n" << item.first << " on " << item.second << "\n";
-  //}
   return result_map;
 }
 

onnxruntime/core/providers/openvino/openvino_provider_factory.cc

@@ -267,7 +267,6 @@ static void ParseProviderInfo(const ProviderOptions& provider_options,
   }
 
   if (provider_options.contains("affinity")) {
-    std::cout << "Provider options contain affinity\n";
     pi.affinity = OpenVINOParserUtils::ParseAffinity(provider_options.at("affinity"));
   }
 

onnxruntime/core/providers/openvino/ov_interface.cc

@@ -84,7 +84,7 @@ std::shared_ptr<OVNetwork> OVCore::ReadModel(std::string&& model, const std::str
     ov::frontend::InputModel::Ptr inputModel;
 
     ov::AnyVector params{&modelStream, model_path};
-
+    
     FE = manager.load_by_model(params);
     if (FE) {
       inputModel = FE->load(params);