Release networkStorage and compiledNetwork for import_model path

MirceaDan99 · Oct 29, 2024 · af080e0 · af080e0
1 parent 8749462
commit af080e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrapper.hpp b/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrapper.hpp
@@ -75,7 +75,7 @@ class ZeGraphExtWrappers final : public ZeGraphExtWrappersInterface {
 
     void setGraphArgumentValue(ze_graph_handle_t graphHandle, uint32_t argi_, const void* argv) const override;
 
-    void initializeGraph(ze_graph_handle_t graphHandle, const Config& config) const override;
+    void initializeGraph(ze_graph_handle_t graphHandle, const Config& config, std::optional<std::vector<uint8_t>> /* unusedNetworkStorageOpt */) const override;
 
 private:
     template <ze_graph_ext_version_t T = TableExtension, std::enable_if_t<!NotSupportQuery(T), bool> = true>

diff --git a/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrapper_interface.hpp b/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrapper_interface.hpp
@@ -34,7 +34,7 @@ class ZeGraphExtWrappersInterface {
 
     virtual void setGraphArgumentValue(ze_graph_handle_t graphHandle, uint32_t argi_, const void* argv) const = 0;
 
-    virtual void initializeGraph(ze_graph_handle_t graphHandle, const Config& config) const = 0;
+    virtual void initializeGraph(ze_graph_handle_t graphHandle, const Config& config, std::optional<std::vector<uint8_t>> /* unusedNetworkStorageOpt */) const = 0;
 
     virtual ~ZeGraphExtWrappersInterface() = default;
 };

diff --git a/src/plugins/intel_npu/src/compiler_adapter/src/driver_graph.cpp b/src/plugins/intel_npu/src/compiler_adapter/src/driver_graph.cpp
@@ -106,7 +106,7 @@ void DriverGraph::initialize(const Config& config) {
             set_workload_type(config.get<WORKLOAD_TYPE>());
         }
 
-        _zeGraphExt->initializeGraph(_handle, config);
+        _zeGraphExt->initializeGraph(_handle, config, std::move(_networkStorage));
 
         _logger.debug("Graph initialize finish");
     }

diff --git a/src/plugins/intel_npu/src/compiler_adapter/src/plugin_graph.cpp b/src/plugins/intel_npu/src/compiler_adapter/src/plugin_graph.cpp
@@ -18,7 +18,7 @@ PluginGraph::PluginGraph(const std::shared_ptr<ZeGraphExtWrappersInterface>& zeG
                          uint32_t groupOrdinal,
                          ze_graph_handle_t graphHandle,
                          NetworkMetadata metadata,
-                         const std::vector<uint8_t> compiledNetwork,
+                         std::vector<uint8_t> compiledNetwork,
                          const Config& config)
     : IGraph(graphHandle, std::move(metadata)),
       _zeGraphExt(zeGraphExt),
@@ -98,7 +98,7 @@ void PluginGraph::initialize(const Config& config) {
             set_workload_type(config.get<WORKLOAD_TYPE>());
         }
 
-        _zeGraphExt->initializeGraph(_handle, config);
+        _zeGraphExt->initializeGraph(_handle, config, std::move(_compiledNetwork));
 
         _logger.debug("Graph initialize finish");
     }

diff --git a/src/plugins/intel_npu/src/compiler_adapter/src/ze_graph_ext_wrapper.cpp b/src/plugins/intel_npu/src/compiler_adapter/src/ze_graph_ext_wrapper.cpp
@@ -154,7 +154,7 @@ void ZeGraphExtWrappers<TableExtension>::setGraphArgumentValue(ze_graph_handle_t
 }
 
 template <ze_graph_ext_version_t TableExtension>
-void ZeGraphExtWrappers<TableExtension>::initializeGraph(ze_graph_handle_t graphHandle, const Config& config) const {
+void ZeGraphExtWrappers<TableExtension>::initializeGraph(ze_graph_handle_t graphHandle, const Config& config, std::optional<std::vector<uint8_t>> /* unusedNetworkStorageOpt */) const {
     if (_graphDdiTableExt.version() < ZE_GRAPH_EXT_VERSION_1_8) {
         initialize_graph_through_command_list(graphHandle, config);
     } else {