Investigate refactoring opportunities for batch management in Plugin and Compiler - clang

Author: DariaMityagina

src/plugins/intel_npu/src/common/include/intel_npu/common/icompiler_adapter.hpp

@@ -42,12 +42,11 @@ class ICompilerAdapter {
      * @return A wrapper over the corresponding L0 graph handles (multiple only if "initBlobs" has been provided). This
      * wrapper further details the compiled model and brings it in a state closer to execution.
      */
-    virtual std::shared_ptr<IGraph> parse(
-        ov::Tensor mainBlob,
-        const Config& config,
-        std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
-        const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
-        std::optional<int64_t> batchSize = std::nullopt) const = 0;
+    virtual std::shared_ptr<IGraph> parse(ov::Tensor mainBlob,
+                                          const Config& config,
+                                          std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
+                                          const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
+                                          std::optional<int64_t> batchSize = std::nullopt) const = 0;
 
     virtual ov::SupportedOpsMap query(const std::shared_ptr<const ov::Model>& model, const Config& config) const = 0;
     virtual uint32_t get_version() const = 0;

src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp

@@ -22,12 +22,11 @@ class DriverCompilerAdapter final : public ICompilerAdapter {
 
     std::shared_ptr<IGraph> compileWS(const std::shared_ptr<ov::Model>& model, const Config& config) const override;
 
-    std::shared_ptr<IGraph> parse(
-        ov::Tensor mainBlob,
-        const Config& config,
-        std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
-        const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
-        std::optional<int64_t> batchSize = std::nullopt) const override;
+    std::shared_ptr<IGraph> parse(ov::Tensor mainBlob,
+                                  const Config& config,
+                                  std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
+                                  const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
+                                  std::optional<int64_t> batchSize = std::nullopt) const override;
 
     ov::SupportedOpsMap query(const std::shared_ptr<const ov::Model>& model, const Config& config) const override;
 

src/plugins/intel_npu/src/compiler_adapter/include/plugin_compiler_adapter.hpp

@@ -23,12 +23,11 @@ class PluginCompilerAdapter final : public ICompilerAdapter {
 
     std::shared_ptr<IGraph> compileWS(const std::shared_ptr<ov::Model>& model, const Config& config) const override;
 
-    std::shared_ptr<IGraph> parse(
-        ov::Tensor mainBlob,
-        const Config& config,
-        std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
-        const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
-        std::optional<int64_t> batchSize = std::nullopt) const override;
+    std::shared_ptr<IGraph> parse(ov::Tensor mainBlob,
+                                  const Config& config,
+                                  std::optional<std::vector<ov::Tensor>> initBlobs = std::nullopt,
+                                  const std::optional<std::shared_ptr<const ov::Model>>& model = std::nullopt,
+                                  std::optional<int64_t> batchSize = std::nullopt) const override;
 
     ov::SupportedOpsMap query(const std::shared_ptr<const ov::Model>& model, const Config& config) const override;
 

src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp

@@ -231,12 +231,11 @@ std::shared_ptr<IGraph> DriverCompilerAdapter::compileWS(const std::shared_ptr<o
                                              config);
 }
 
-std::shared_ptr<IGraph> DriverCompilerAdapter::parse(
-    ov::Tensor mainBlob,
-    const Config& config,
-    std::optional<std::vector<ov::Tensor>> initBlobs,
-    const std::optional<std::shared_ptr<const ov::Model>>& model,
-    std::optional<int64_t> batchSize) const {
+std::shared_ptr<IGraph> DriverCompilerAdapter::parse(ov::Tensor mainBlob,
+                                                     const Config& config,
+                                                     std::optional<std::vector<ov::Tensor>> initBlobs,
+                                                     const std::optional<std::shared_ptr<const ov::Model>>& model,
+                                                     std::optional<int64_t> batchSize) const {
     OV_ITT_TASK_CHAIN(PARSE_BLOB, itt::domains::NPUPlugin, "DriverCompilerAdapter", "parse");
 
     _logger.debug("parse start");

src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp

@@ -255,12 +255,11 @@ std::shared_ptr<IGraph> PluginCompilerAdapter::compileWS(const std::shared_ptr<o
         _compiler);
 }
 
-std::shared_ptr<IGraph> PluginCompilerAdapter::parse(
-    ov::Tensor mainBlob,
-    const Config& config,
-    std::optional<std::vector<ov::Tensor>> initBlobs,
-    const std::optional<std::shared_ptr<const ov::Model>>& model,
-    std::optional<int64_t> batchSize) const {
+std::shared_ptr<IGraph> PluginCompilerAdapter::parse(ov::Tensor mainBlob,
+                                                     const Config& config,
+                                                     std::optional<std::vector<ov::Tensor>> initBlobs,
+                                                     const std::optional<std::shared_ptr<const ov::Model>>& model,
+                                                     std::optional<int64_t> batchSize) const {
     OV_ITT_TASK_CHAIN(PARSE_BLOB, itt::domains::NPUPlugin, "PluginCompilerAdapter", "parse");
 
     _logger.debug("parse start");