[intel-npu] config: adding interface function to get optiondescriptor…

… from config; renaming getSupportedProperties for better clarity
openvinotoolkit · Oct 3, 2024 · f7dd279 · f7dd279
1 parent ab13d4a
commit f7dd279
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/plugins/intel_npu/src/al/include/intel_npu/al/config/config.hpp b/src/plugins/intel_npu/src/al/include/intel_npu/al/config/config.hpp
@@ -389,7 +389,7 @@ class OptionsDesc final {
     void reset();
 
     std::vector<std::string> getSupported(bool includePrivate = false) const;
-    std::vector<ov::PropertyName> getSupportedProperties(bool includePrivate = false) const;
+    std::vector<ov::PropertyName> getSupportedOptions(bool includePrivate = false) const;
 
     details::OptionConcept get(std::string_view key, OptionMode mode = OptionMode::Both) const;
     void walk(std::function<void(const details::OptionConcept&)> cb) const;
@@ -457,6 +457,7 @@ class Config final {
 
     bool hasOpt(std::string_view key) const;
     bool isOptPublic(std::string_view key) const;
+    details::OptionConcept getOpt(std::string_view key) const;
 
     template <class Opt>
     bool has() const;

diff --git a/src/plugins/intel_npu/src/al/src/config/config.cpp b/src/plugins/intel_npu/src/al/src/config/config.cpp
@@ -197,7 +197,7 @@ std::vector<std::string> OptionsDesc::getSupported(bool includePrivate) const {
     return res;
 }
 
-std::vector<ov::PropertyName> OptionsDesc::getSupportedProperties(bool includePrivate) const {
+std::vector<ov::PropertyName> OptionsDesc::getSupportedOptions(bool includePrivate) const {
     std::vector<ov::PropertyName> res;
     res.reserve(_impl.size());
 
@@ -228,6 +228,10 @@ bool Config::hasOpt(std::string_view key) const {
     return _desc->has(key);
 }
 
+details::OptionConcept Config::getOpt(std::string_view key) const {
+    return _desc->get(key);
+}
+
 bool Config::isOptPublic(std::string_view key) const {
     auto log = Logger::global().clone("Config");
     if (_desc->has(key)) {

diff --git a/src/plugins/intel_npu/src/plugin/src/plugin.cpp b/src/plugins/intel_npu/src/plugin/src/plugin.cpp
@@ -285,7 +285,8 @@ void Plugin::init_options(compilerVersion comp_ver) {
     // parse again env_variables after backend is initialized to get backend proprieties
     _globalConfig.parseEnvVars();
 
-    std::vector<ov::PropertyName> sup_props = _options->getSupportedProperties();
+    /// DEBUG TODO:remove
+    std::vector<ov::PropertyName> sup_props = _options->getSupportedOptions();
     std::cout << "Registered options: " << std::endl;
     for (const std::string& prop : sup_props) {
         std::cout << prop << std::endl;