[PYTHON/CPP/BENCHMARK_APP] Revert changes to Core, align version prin…

…ts usin only provided methods
openvinotoolkit · Nov 8, 2022 · e92c9f6 · e92c9f6
1 parent a02074b
commit e92c9f6
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 25 deletions.
diff --git a/samples/cpp/benchmark_app/main.cpp b/samples/cpp/benchmark_app/main.cpp
@@ -43,7 +43,7 @@ std::string get_console_command(int argc, char* argv[]) {
     std::string relative_path(argv[0]);
     std::vector<char> buffer;
 
-    uint32_t len = 1024;
+    uint32_t len = 1;
     do {
         buffer.resize(len);
         len = GetFullPathNameA(relative_path.data(), len, buffer.data(), nullptr);

diff --git a/samples/cpp/common/utils/include/samples/common.hpp b/samples/cpp/common/utils/include/samples/common.hpp
@@ -131,12 +131,6 @@ inline std::string fileExt(const std::string& filename) {
 }
 
 inline slog::LogStream& operator<<(slog::LogStream& os, const ov::Version& version) {
-    os << version.description << " version ";
-    for (int i = 0; i < 30 - strlen(version.description); i++) {
-        os << ".";
-    }
-    os << " " << OPENVINO_VERSION_MAJOR << "." << OPENVINO_VERSION_MINOR << "." << OPENVINO_VERSION_PATCH << slog::endl;
-
     os << "Build ................................. ";
     os << version.buildNumber << slog::endl;
 

diff --git a/src/bindings/python/src/pyopenvino/core/core.cpp b/src/bindings/python/src/pyopenvino/core/core.cpp
@@ -237,14 +237,6 @@ void regclass_Core(py::module m) {
             :rtype: openvino.runtime.CompiledModel
         )");
 
-    cls.def("get_version",
-            &ov::Core::get_version,
-            R"(
-                Gets OpenVINO version information.
-                :return: Version information.
-                :rtype: openvino.runtime.Version
-            )");
-
     cls.def("get_versions",
             &ov::Core::get_versions,
             py::arg("device_name"),

diff --git a/src/inference/include/openvino/runtime/core.hpp b/src/inference/include/openvino/runtime/core.hpp
@@ -65,7 +65,6 @@ class OPENVINO_RUNTIME_API Core {
      * @param device_name Device name to identify a plugin.
      * @return A vector of versions.
      */
-    Version get_version() const;
     std::map<std::string, Version> get_versions(const std::string& device_name) const;
 
 #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT

diff --git a/src/inference/src/ie_core.cpp b/src/inference/src/ie_core.cpp
@@ -1917,8 +1917,6 @@ Core::Core(const std::string& xmlConfigFile) {
 #endif
 }
 
-Version Core::get_version() const {OV_CORE_CALL_STATEMENT({ return ov::get_openvino_version(); })}
-
 std::map<std::string, Version> Core::get_versions(const std::string& deviceName) const {
     OV_CORE_CALL_STATEMENT({
         std::map<std::string, Version> versions;

diff --git a/tools/benchmark_tool/openvino/tools/benchmark/benchmark.py b/tools/benchmark_tool/openvino/tools/benchmark/benchmark.py
@@ -39,18 +39,14 @@ def add_extension(self, path_to_extensions: str=None, path_to_cldnn_config: str=
                 self.core.add_extension(extension)
 
     def print_version_info(self) -> None:
-        version = self.core.get_version()
-        description = f"{version.description} version "
+        version = get_version()
         logger.info("OpenVINO:")
-        logger.info(f"{description:.<39} {version.major}.{version.minor}.{version.patch}")
-        logger.info(f"{'Build ':.<39} {version.build_number}")
+        logger.info(f"{'Build ':.<39} {version}")
         logger.info("")
 
         logger.info("Device info:")
         for device, version in self.core.get_versions(self.device).items():
-            description = f"{version.description} version "
             logger.info(f"{device}")
-            logger.info(f"{description:.<39} {version.major}.{version.minor}.{version.patch}")
             logger.info(f"{'Build ':.<39} {version.build_number}")
 
         logger.info("")

diff --git a/tools/benchmark_tool/openvino/tools/benchmark/main.py b/tools/benchmark_tool/openvino/tools/benchmark/main.py
@@ -62,7 +62,7 @@ def main():
         next_step()
         logger.info("Parsing input parameters")
         args, is_network_compiled = parse_and_check_command_line()
-
+        logger.info(f"Input command: {args_string}")
 
         command_line_arguments = get_command_line_arguments(sys.argv)
         if args.report_type: