Move the fd getter prop to npuw

Signed-off-by: Anoob Anto Kodankandath <[email protected]>

Author: akodanka

src/inference/include/openvino/runtime/properties.hpp

@@ -241,14 +241,6 @@ static constexpr Property<std::string, PropertyMutability::RO> model_name{"NETWO
 static constexpr Property<uint32_t, PropertyMutability::RO> optimal_number_of_infer_requests{
     "OPTIMAL_NUMBER_OF_INFER_REQUESTS"};
 
-/**
- * @brief Type definition for file descriptor getter callback.
- * Function that takes a file path string and returns a file descriptor as int.
- * This is useful for scenarios where file access needs to be controlled externally.
- * @ingroup ov_runtime_cpp_prop_api
- */
-using FdGetterType = std::function<int(const std::string&)>;
-
 /**
  * @brief Namespace with hint properties
  */
@@ -540,14 +532,6 @@ static constexpr Property<uint32_t> num_requests{"PERFORMANCE_HINT_NUM_REQUESTS"
  */
 static constexpr Property<std::shared_ptr<const ov::Model>> model{"MODEL_PTR"};
 
-/**
- * @brief This key identifies callback function to get file descriptor for a given file path.
- * The callback takes a file path string and returns a file descriptor as int.
- * This is useful for scenarios where file access needs to be controlled externally.
- * @ingroup ov_runtime_cpp_prop_api
- */
-static constexpr Property<FdGetterType> fd_getter{"FD_GETTER"};
-
 /**
  * @brief Special key for auto batching feature configuration. Enabled by default
  * @ingroup ov_runtime_cpp_prop_api

src/plugins/intel_npu/src/al/include/intel_npu/npuw_private_properties.hpp

@@ -8,6 +8,13 @@
 
 namespace ov {
 namespace intel_npu {
+
+/**
+ * @brief Type definition for file descriptor getter callback.
+ * Function that takes a file path string and returns a file descriptor as int.
+ * This is useful for scenarios where file access needs to be controlled externally.
+ */
+using FdGetterType = std::function<int(const std::string&)>;
 /**
  * @brief
  * Type: bool
@@ -17,6 +24,13 @@ namespace intel_npu {
 static constexpr ov::Property<bool> use_npuw{"NPU_USE_NPUW"};
 
 namespace npuw {
+/**
+ * @brief This key identifies callback function to get file descriptor for a given file path.
+ * The callback takes a file path string and returns a file descriptor as int.
+ * This is useful for scenarios where file access needs to be controlled externally.
+ */
+static constexpr ov::Property<FdGetterType> fd_getter{"FD_GETTER"};
+
 /**
  * @brief
  * Type: std::string

src/plugins/intel_npu/src/plugin/npuw/compiled_model.cpp

@@ -9,6 +9,7 @@
 
 #include "accuracy/comparator.hpp"
 #include "intel_npu/npu_private_properties.hpp"
+#include "intel_npu/npuw_private_properties.hpp"
 #include "just_sync_infer_request.hpp"
 #include "logging.hpp"
 #include "openvino/core/parallel.hpp"
@@ -1141,17 +1142,17 @@ std::shared_ptr<ov::npuw::CompiledModel> ov::npuw::CompiledModel::deserialize(
         std::shared_ptr<ov::Model> model_ptr;
         // Cache model's constants
         WeightsContext::ConstsCache consts_cache;
-        ov::FdGetterType fd_getter = nullptr;
+        ov::intel_npu::FdGetterType fd_getter = nullptr;
         if (is_weightless) {
             if (properties.find(ov::weights_path.name()) != properties.end()) {
                 weights_path = properties.at(ov::weights_path.name()).as<std::string>();
                 NPUW_ASSERT(!weights_path.empty() &&
                             "Empty weights_path. Please provide WEIGHTS_PATH or MODEL_PTR in the configuration.");
 
                 // Check if fd_getter function is provided
-                if (const auto fd_it = properties.find(ov::hint::fd_getter.name()); fd_it != properties.end()) {
-                    if (fd_it->second.is<ov::FdGetterType>()) {
-                        fd_getter = fd_it->second.as<ov::FdGetterType>();
+                if (const auto fd_it = properties.find(ov::intel_npu::npuw::fd_getter.name()); fd_it != properties.end()) {
+                    if (fd_it->second.is<ov::intel_npu::FdGetterType>()) {
+                        fd_getter = fd_it->second.as<ov::intel_npu::FdGetterType>();
                     }
                 }
             } else if (properties.find(ov::hint::model.name()) != properties.end()) {

src/plugins/intel_npu/src/plugin/npuw/lazy_tensor.hpp

@@ -7,6 +7,7 @@
 #include <memory>
 #include <variant>
 
+#include "intel_npu/npuw_private_properties.hpp"
 #include "openvino/op/constant.hpp"
 #include "openvino/runtime/shared_buffer.hpp"
 #include "openvino/runtime/tensor.hpp"
@@ -108,7 +109,7 @@ class Const {
     std::size_t m_byte_size = 0;
     ov::Tensor m_read_from_bin;
     std::string m_weights_path;
-    ov::FdGetterType m_fd_getter = nullptr;
+    ov::intel_npu::FdGetterType m_fd_getter = nullptr;
     mutable ov::npuw::s11n::WeightsPtr m_mmaped_weights = nullptr;
     // FIXME: special case when a new Constant was added into the model,
     // then made into LazyTensor during folding. We need to keep a copy of it,

src/plugins/intel_npu/src/plugin/npuw/serialization.cpp

@@ -29,7 +29,7 @@ ov::npuw::s11n::WeightsContext::WeightsContext(const ov::npuw::s11n::WeightsPtr&
                                                const std::string& _weights_path,
                                                const s11n::WeightsContext::ConstsCache& _consts_cache,
                                                const BF16Cache& _bf16_consts,
-                                               const ov::FdGetterType& _fd_getter)
+                                               const ov::intel_npu::FdGetterType& _fd_getter)
     : weights(_weights),
       weights_path(_weights_path),
       consts_cache(_consts_cache),

src/plugins/intel_npu/src/plugin/npuw/serialization.hpp

@@ -14,6 +14,8 @@
 #include <string>
 #include <tuple>
 #include <unordered_map>
+
+#include "intel_npu/npuw_private_properties.hpp"
 #include <unordered_set>
 #include <vector>
 
@@ -129,7 +131,7 @@ struct WeightsContext {
                    const std::string& _weights_path,
                    const ConstsCache& _consts_cache,
                    const BF16Cache& _bf16_consts,
-                   const ov::FdGetterType& _fd_getter = nullptr);
+                   const ov::intel_npu::FdGetterType& _fd_getter = nullptr);
 
     WeightsContext& operator=(const WeightsContext& other) = default;
 
@@ -144,7 +146,7 @@ struct WeightsContext {
     std::string weights_path;
     ConstsCache consts_cache;
     BF16Cache bf16_consts;
-    ov::FdGetterType fd_getter = nullptr;
+    ov::intel_npu::FdGetterType fd_getter = nullptr;
 };
 
 BF16Cache get_bf16_consts(const std::shared_ptr<ov::Model>& model);