Filter core properties by using local core config

Signed-off-by: Raasz, Pawel <[email protected]>
openvinotoolkit · Dec 10, 2024 · 2772f3d · 2772f3d
1 parent ce822f7
commit 2772f3d
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 162 deletions.
diff --git a/src/inference/src/dev/core_impl.cpp b/src/inference/src/dev/core_impl.cpp
diff --git a/src/inference/src/dev/core_impl.hpp b/src/inference/src/dev/core_impl.hpp
@@ -63,6 +63,9 @@ class CoreImpl : public ov::ICore, public std::enable_shared_from_this<ov::ICore
 
     class CoreConfig final {
     public:
+        CoreConfig() = default;
+        CoreConfig(const CoreConfig& other);
+
         struct CacheConfig {
             std::string _cacheDir;
             std::shared_ptr<ov::ICacheManager> _cacheManager;
@@ -83,9 +86,8 @@ class CoreImpl : public ov::ICore, public std::enable_shared_from_this<ov::ICore
 
         bool get_enable_mmap() const;
 
-        // Creating thread-safe copy of config including shared_ptr to ICacheManager
-        // Passing empty or not-existing name will return global cache config
-        CacheConfig get_cache_config_for_device(const ov::Plugin& plugin, ov::AnyMap& parsedConfig) const;
+        // Creating thread-safe copy of global config including shared_ptr to ICacheManager
+        CacheConfig get_cache_config_for_device(const ov::Plugin& plugin) const;
 
     private:
         mutable std::mutex _cacheConfigMutex;
@@ -96,12 +98,15 @@ class CoreImpl : public ov::ICore, public std::enable_shared_from_this<ov::ICore
 
     struct CacheContent {
         explicit CacheContent(const std::shared_ptr<ov::ICacheManager>& cache_manager,
+                              bool mmap_enabled = false,
                               const std::string model_path = {})
             : cacheManager(cache_manager),
-              modelPath(model_path) {}
+              modelPath(model_path),
+              mmap_enabled{mmap_enabled} {}
         std::shared_ptr<ov::ICacheManager> cacheManager;
         std::string blobId = {};
         std::string modelPath = {};
+        bool mmap_enabled = false;
     };
 
     // Core settings (cache config, etc)
@@ -183,12 +188,6 @@ class CoreImpl : public ov::ICore, public std::enable_shared_from_this<ov::ICore
     }
     void add_extensions_unsafe(const std::vector<ov::Extension::Ptr>& extensions) const;
 
-    Plugin get_plugin(const std::string& pluginName, bool on_create_filter_config) const;
-
-    AnyMap get_supported_property(const Plugin& plugin, const AnyMap& config, bool keep_core, bool rw_only) const;
-
-    AnyMap get_hw_plugin_properties_or_forward(const Plugin& plugin, const AnyMap& config) const;
-
 public:
     CoreImpl();
 

diff --git a/src/plugins/hetero/src/plugin.cpp b/src/plugins/hetero/src/plugin.cpp
@@ -284,8 +284,6 @@ ov::Any ov::hetero::Plugin::get_property(const std::string& name, const ov::AnyM
     } else if (ov::internal::supported_properties == name) {
         return decltype(ov::internal::supported_properties)::value_type{
             ov::PropertyName{ov::internal::caching_properties.name(), ov::PropertyMutability::RO},
-            // write-only as internal
-            ov::PropertyName{ov::cache_encryption_callbacks.name(), ov::PropertyMutability::WO},
         };
     } else if (ov::device::full_name == name) {
         return decltype(ov::device::full_name)::value_type{get_device_name()};

diff --git a/src/plugins/intel_cpu/src/plugin.cpp b/src/plugins/intel_cpu/src/plugin.cpp
@@ -453,13 +453,6 @@ ov::Any Plugin::get_ro_property(const std::string& name, const ov::AnyMap& optio
 #endif
             ov::PropertyName{ov::internal::exclusive_async_requests.name(), ov::PropertyMutability::RW},
             ov::PropertyName{ov::internal::compiled_model_runtime_properties.name(), ov::PropertyMutability::RO},
-            // as write-only as internal only
-            ov::PropertyName{ov::intel_cpu::snippets_mode.name(), ov::PropertyMutability::WO},
-            ov::PropertyName{ov::internal::compiled_model_runtime_properties_supported.name(),
-                                ov::PropertyMutability::RO},
-            ov::PropertyName{ov::cache_encryption_callbacks.name(), ov::PropertyMutability::WO},
-            ov::PropertyName{ov::intel_cpu::lp_transforms_mode.name(), ov::PropertyMutability::WO},
-            ov::PropertyName{ov::intel_cpu::cpu_runtime_cache_capacity.name(), ov::PropertyMutability::WO},
         };
     } else if (name == ov::device::full_name) {
         return decltype(ov::device::full_name)::value_type(deviceFullName);

diff --git a/src/plugins/template/src/plugin.cpp b/src/plugins/template/src/plugin.cpp
@@ -285,8 +285,7 @@ ov::Any ov::template_plugin::Plugin::get_property(const std::string& name, const
             ov::PropertyName{ov::internal::caching_properties.name(), ov::PropertyMutability::RO},
             ov::PropertyName{ov::internal::exclusive_async_requests.name(), ov::PropertyMutability::RW},
             ov::PropertyName{ov::inference_num_threads.name(), ov::PropertyMutability::RW},
-            ov::PropertyName{ov::internal::threads_per_stream.name(), ov::PropertyMutability::RW},
-            ov::PropertyName{ov::cache_encryption_callbacks.name(), ov::PropertyMutability::WO}};
+            ov::PropertyName{ov::internal::threads_per_stream.name(), ov::PropertyMutability::RW}};
     } else if (ov::available_devices == name) {
         // TODO: fill list of available devices
         return decltype(ov::available_devices)::value_type{{""}};

diff --git a/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp b/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp
@@ -629,7 +629,14 @@ TEST_P(OVCompiledModelBaseTest, canLoadCorrectNetworkToGetExecutableWithIncorrec
         config.emplace(confItem.first, confItem.second);
     }
 
-    OV_ASSERT_NO_THROW(std::ignore = core->compile_model(function, target_device, config));
+    bool is_meta_devices = target_device.find("AUTO") != std::string::npos ||
+                           target_device.find("MULTI") != std::string::npos ||
+                           target_device.find("HETERO") != std::string::npos;
+    if (is_meta_devices) {
+        EXPECT_NO_THROW(auto execNet = core->compile_model(function, target_device, config));
+    } else {
+        EXPECT_ANY_THROW(auto execNet = core->compile_model(function, target_device, config));
+    }
 }
 
 typedef std::tuple<ov::element::Type,  // Type to convert