Copy weights file to epctx output directory

Author: ericcraw

Diff for: onnxruntime/core/providers/openvino/backend_manager.cc

@@ -85,17 +85,20 @@ BackendManager::BackendManager(SessionContext& session_context,
 
   auto& sw = shared_context_.shared_weights;
   if (session_context_.so_share_ep_contexts) {
-    std::filesystem::path weight_filename = session_context_.onnx_model_path_name.parent_path();
     if (sw.external_weight_filename.empty() && !sw.metadata.empty()) {
       // Reasonable assumption that all metadata entries have the same external file location
       sw.external_weight_filename = sw.metadata.begin()->second.location;
     }
-    weight_filename /= sw.external_weight_filename;
-    std::ifstream weight_file(weight_filename);
 
+    auto weight_path = session_context_.GetNewWeightsFilePath(sw.external_weight_filename);
+    if (!std::filesystem::exists(weight_path)) {
+      weight_path = session_context_.GetModelDirectory() / sw.external_weight_filename;
+    }
+
+    std::ifstream weight_file(weight_path);
     if (weight_file) {
       if (!sw.mapped_weights) {
-        sw.mapped_weights = std::make_unique<SharedContext::SharedWeights::WeightsFile>(weight_filename);
+        sw.mapped_weights = std::make_unique<SharedContext::SharedWeights::WeightsFile>(weight_path);
       }
       backend_utils::CreateOVTensors(session_context_.device_type, sw.metadata, *sw.mapped_weights);
     }
@@ -324,7 +327,7 @@ static bool IsQDQGraph(const onnxruntime::GraphViewer& graph_viewer) {
 static void DumpOpenVINOEPModel([[maybe_unused]] const std::filesystem::path& onnx_model_path_name,
                                 [[maybe_unused]] ONNX_NAMESPACE::ModelProto* model_proto,
                                 [[maybe_unused]] const onnxruntime::Node& fused_node) {
-#ifdef  NOT_RELEASE
+#ifdef NOT_RELEASE
   if (openvino_ep::backend_utils::IsDebugEnabled()) {
     auto model_name = onnx_model_path_name.empty() ? "unknown.onnx" : onnx_model_path_name.filename();
 

Diff for: onnxruntime/core/providers/openvino/contexts.h

@@ -118,6 +118,20 @@ struct SessionContext : ProviderInfo {
   mutable bool has_external_weights = false;       // Value is set to mutable to modify from capability
   const std::vector<uint32_t> OpenVINO_Version = {OPENVINO_VERSION_MAJOR, OPENVINO_VERSION_MINOR};
   const std::string openvino_sdk_version = std::to_string(OPENVINO_VERSION_MAJOR) + "." + std::to_string(OPENVINO_VERSION_MINOR);
+
+  fs::path GetModelDirectory() const {
+    return onnx_model_path_name.parent_path();
+  }
+
+  fs::path GetEpContextOutputDirectory() const {
+    return so_context_file_path.empty() ? GetModelDirectory() : so_context_file_path;
+  }
+
+  fs::path GetNewWeightsFilePath(fs::path external_weights_filename) const {
+    ORT_ENFORCE(!external_weights_filename.empty(), "External weights filename should not be empty.");
+    // Otherwise, use the provided external weights filename.
+    return GetEpContextOutputDirectory() / fs::path(external_weights_filename.filename().string() + "_weights.bin");
+  }
 };
 
 // Holds context specific to subgraph.

Diff for: onnxruntime/core/providers/openvino/openvino_execution_provider.cc

@@ -102,12 +102,13 @@ common::Status OpenVINOExecutionProvider::Compile(
         graph_body_viewer_0.DomainToVersionMap().at(kOnnxDomain);
   }
 
+  const auto metadata_path = session_context_.GetEpContextOutputDirectory() / "metadata.bin";
+
   // Temporary code to read metadata before it moves to the .bin
   auto& metadata = shared_context_->shared_weights.metadata;
   if (session_context_.so_share_ep_contexts && metadata.empty()) {
     // Metadata is always read from model location, this could be a source or epctx model
-    fs::path metadata_filename = session_context_.onnx_model_path_name.parent_path() / "metadata.bin";
-    std::ifstream file(metadata_filename, std::ios::binary);
+    std::ifstream file(metadata_path, std::ios::binary);
     if (file) {
       file >> metadata;
     }
@@ -174,18 +175,13 @@ common::Status OpenVINOExecutionProvider::Compile(
   }
 
   if (session_context_.so_share_ep_contexts) {
-    fs::path metadata_filename;
-    if (session_context_.so_context_file_path.empty()) {
-      metadata_filename = session_context_.onnx_model_path_name.parent_path() / "metadata.bin";
-    } else {
-      metadata_filename = session_context_.so_context_file_path.parent_path() / "metadata.bin";
-    }
+    const auto& sw_path_filename = shared_context_->shared_weights.external_weight_filename;
+    fs::path new_weights_file_path = session_context_.GetNewWeightsFilePath(sw_path_filename);
+    fs::path original_weights_path = session_context_.GetModelDirectory() / sw_path_filename;
+
+    std::filesystem::copy_file(original_weights_path, new_weights_file_path, std::filesystem::copy_options::skip_existing);
 
-    // Metadata is generated only for shared contexts
-    // If saving metadata then save it to the provided path or ose the original model path
-    // Multiple calls to Compile() will update the metadata and for the last call
-    //   the resulting file will contain the aggregated content
-    std::ofstream file(metadata_filename, std::ios::binary);
+    std::ofstream file(metadata_path, std::ios::binary);
     if (file) {
       file << metadata;
     }