[don't review] OV file path migration to std lib interface

src/common/util/CMakeLists.txt

@@ -37,7 +37,9 @@ add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
 add_library(openvino::util ALIAS ${TARGET_NAME})
 set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME util)
 
-target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS} PUBLIC openvino::pugixml)
+# TODO: make lib linkage portable e.g.: openvino/src/bindings/python/thirdparty/pybind11/tests/CMakeLists.txt
+target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS} PUBLIC openvino::pugixml stdc++fs )
+set(STD_FS_LIB stdc++fs)
 if (WIN32)
     target_link_libraries(${TARGET_NAME} PRIVATE Shlwapi)
 endif()

src/common/util/include/openvino/util/file_path.hpp

@@ -0,0 +1,23 @@
+// Copyright (C) 2018-2024 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <memory>
+#include <experimental/filesystem>
+
+namespace ov {
+namespace util {
+
+namespace fs = std::experimental::filesystem;
+using Path = fs::path;
+
+
+auto File = [](std::FILE* file) {
+    auto deleter = [](std::FILE* file){ std::fclose(file); };
+    return std::unique_ptr<std::FILE, decltype(deleter)> { file, deleter };
+};
+
+}  // namespace util
+}  // namespace ov

src/common/util/include/openvino/util/file_util.hpp

@@ -11,6 +11,8 @@
 #include <vector>
 
 #include "openvino/util/util.hpp"
+#include "openvino/util/file_path.hpp"
+
 
 namespace ov {
 namespace util {
@@ -87,6 +89,11 @@ template <class Path,
 const std::string& path_to_string(const Path& path) {
     return path;
 }
+template <class Path,
+          typename std::enable_if<std::is_same<typename std::decay<Path>::type, ov::util::Path>::value>::type* = nullptr>
+std::string path_to_string(const Path& path) {
+    return path.string();
+}
 
 #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
 /**
@@ -122,7 +129,7 @@ std::string sanitize_path(const std::string& path);
 
 /// \brief Returns the name with extension for a given path
 /// \param path The path to the output file
-std::string get_file_name(const std::string& path);
+ov::util::Path get_file_name(const ov::util::Path& path);
 
 /**
  * @brief Interface function to get absolute path of file
@@ -161,7 +168,7 @@ void create_directory_recursive(const std::wstring& path);
  * @param path - path to directory
  * @return true if directory exists, false otherwise
  */
-bool directory_exists(const std::string& path);
+bool directory_exists(const ov::util::Path& path);
 
 #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
 /**
@@ -255,12 +262,16 @@ inline bool file_exists(const std::string& path) {
     return file_exists(path.c_str());
 }
 
-std::string get_file_ext(const std::string& path);
+inline bool file_exists(const ov::util::Path& path) {
+    return ov::util::fs::exists(path);
+}
+
+ov::util::Path get_file_ext(const ov::util::Path& path);
 std::string get_directory(const std::string& path);
-std::string path_join(const std::vector<std::string>& paths);
+ov::util::Path path_join(const std::vector<ov::util::Path>& paths);
 
-void iterate_files(const std::string& path,
-                   const std::function<void(const std::string& file, bool is_dir)>& func,
+void iterate_files(const ov::util::Path& path,
+                   const std::function<void(const ov::util::Path& file, bool is_dir)>& func,
                    bool recurse = false,
                    bool include_links = false);
 

src/common/util/src/file_util.cpp

@@ -64,31 +64,12 @@
 #    endif
 #endif
 
-std::string ov::util::get_file_name(const std::string& s) {
-    std::string rc = s;
-    // Linux-style separator
-    auto pos = s.find_last_of('/');
-    if (pos != std::string::npos) {
-        rc = s.substr(pos + 1);
-        return rc;
-    }
-    // Windows-style separator
-    pos = s.find_last_of('\\');
-    if (pos != std::string::npos) {
-        rc = s.substr(pos + 1);
-    }
-    return rc;
+ov::util::Path ov::util::get_file_name(const ov::util::Path& s) {
+    return s.filename();
 }
 
-std::string ov::util::get_file_ext(const std::string& s) {
-    std::string rc = get_file_name(s);
-    auto pos = rc.find_last_of('.');
-    if (pos != std::string::npos) {
-        rc = rc.substr(pos);
-    } else {
-        rc = "";
-    }
-    return rc;
+ov::util::Path ov::util::get_file_ext(const ov::util::Path& s) {
+    return s.extension();
 }
 
 std::string ov::util::get_directory(const std::string& s) {
@@ -122,60 +103,13 @@ std::wstring ov::util::get_directory(const std::wstring& s) {
 #endif
 
 namespace {
-
-std::string join_paths(const std::string& s1, const std::string& s2) {
-    std::string rc;
-    if (s2.size() > 0) {
-        if (s2[0] == '/') {
-            rc = s2;
-        } else if (s1.size() > 0) {
-            rc = s1;
-            if (rc[rc.size() - 1] != '/') {
-#ifndef _WIN32
-                rc += '/';
-#else
-                rc += '\\';
-#endif
-            }
-            rc += s2;
-        } else {
-            rc = s2;
-        }
-    } else {
-        rc = s1;
-    }
-    return rc;
+ov::util::Path join_paths(const ov::util::Path& s1, const ov::util::Path& s2) {
+    return s1 / s2;
 }
-
-#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
-std::wstring join_paths(const std::wstring& s1, const std::wstring& s2) {
-    std::wstring rc;
-    if (s2.size() > 0) {
-        if (s2[0] == '/') {
-            rc = s2;
-        } else if (s1.size() > 0) {
-            rc = s1;
-            if (rc[rc.size() - 1] != '/') {
-#    ifndef _WIN32
-                rc += '/';
-#    else
-                rc += '\\';
-#    endif
-            }
-            rc += s2;
-        } else {
-            rc = s2;
-        }
-    } else {
-        rc = s1;
-    }
-    return rc;
-}
-#endif
 }  // namespace
 
-std::string ov::util::path_join(const std::vector<std::string>& paths) {
-    std::string result;
+ov::util::Path ov::util::path_join(const std::vector<ov::util::Path>& paths) {
+    ov::util::Path result{};
     if (paths.empty()) {
         return result;
     }
@@ -194,7 +128,7 @@ std::wstring ov::util::path_join_w(const std::vector<std::wstring>& paths) {
     }
     result = paths[0];
     for (size_t i = 1; i < paths.size(); i++) {
-        result = join_paths(result, paths[i]);
+        result = join_paths(result, paths[i]).wstring();
     }
     return result;
 }
@@ -249,12 +183,12 @@ static void iterate_files_worker(const std::string& path,
 }
 #endif
 
-void ov::util::iterate_files(const std::string& path,
-                             const std::function<void(const std::string& file, bool is_dir)>& func,
+void ov::util::iterate_files(const ov::util::Path& path,
+                             const std::function<void(const ov::util::Path& file, bool is_dir)>& func,
                              bool recurse,
                              bool include_links) {
-    std::vector<std::string> files;
-    std::vector<std::string> dirs;
+    std::vector<ov::util::Path> files;
+    std::vector<ov::util::Path> dirs;
 #ifdef _WIN32
 #    ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
     std::wstring pathw = string_to_wstring(path);
@@ -307,7 +241,7 @@ void ov::util::iterate_files(const std::string& path,
 #else
     iterate_files_worker(
         path,
-        [&files, &dirs](const std::string& file, bool is_dir) {
+        [&files, &dirs](const ov::util::Path& file, bool is_dir) {
             if (is_dir) {
                 dirs.push_back(file);
             } else {
@@ -319,10 +253,10 @@ void ov::util::iterate_files(const std::string& path,
 #endif
 
     for (const auto& f : files) {
-        func(f, false);
+        func(f.native(), false);
     }
     for (const auto& f : dirs) {
-        func(f, true);
+        func(f.native(), true);
     }
 }
 
@@ -443,13 +377,8 @@ void ov::util::create_directory_recursive(const std::string& path) {
     }
 }
 
-bool ov::util::directory_exists(const std::string& path) {
-    struct stat sb;
-
-    if (stat(path.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) {
-        return true;
-    }
-    return false;
+bool ov::util::directory_exists(const ov::util::Path& path) {
+    return ov::util::fs::is_directory(path);
 }
 
 #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT

src/core/tests/check.cpp

@@ -55,7 +55,7 @@ TEST(check, ov_throw_exception_check_relative_path_to_source) {
     }
     using namespace testing;
     const auto path = ov::util::path_join({"src", "core", "tests", "check.cpp"});
-    const auto exp_native_slash = "Exception from " + path + ":";
+    const auto exp_native_slash = "Exception from " + path.native() + ":";
     const auto exp_fwd_slash = "Exception from src/core/tests/check.cpp:";
     OV_EXPECT_THROW(OPENVINO_THROW("Test message"),
                     ov::Exception,

src/frontends/common/src/plugin_loader.cpp

@@ -76,19 +76,18 @@ void load_static_plugins(std::vector<PluginInfo>& res) {
 
 #endif  // OPENVINO_STATIC_LIBRARY
 
-// TODO: change to std::filesystem for C++17
-static std::vector<std::string> list_files(const std::string& path) {
-    std::vector<std::string> res;
+static std::vector<ov::util::Path> list_files(const ov::util::Path& path) {
+    std::vector<ov::util::Path> res{};
     try {
-        const auto prefix = std::string(FRONTEND_LIB_PREFIX);
-        const auto suffix = std::string(FRONTEND_LIB_SUFFIX);
+    const auto prefix = ov::util::Path{FRONTEND_LIB_PREFIX};
+    const auto suffix = ov::util::Path{FRONTEND_LIB_SUFFIX};
         ov::util::iterate_files(
             path,
-            [&res, &prefix, &suffix](const std::string& file_path, bool is_dir) {
+            [&res, &prefix, &suffix](const ov::util::Path& file_path, bool is_dir) {
                 auto file = ov::util::get_file_name(file_path);
-                if (!is_dir && (prefix.empty() || file.compare(0, prefix.length(), prefix) == 0) &&
-                    file.length() > suffix.length() &&
-                    file.rfind(suffix) == (file.length() - std::string(suffix).length())) {
+                if (!is_dir && (prefix.empty() || file.native().compare(0, prefix.native().length(), prefix) == 0) &&
+                    file.native().length() > suffix.native().length() &&
+                    file.native().rfind(suffix) == (file.native().length() - suffix.native().length())) {
                     res.push_back(file_path);
                 }
             },
@@ -100,7 +99,7 @@ static std::vector<std::string> list_files(const std::string& path) {
     return res;
 }
 
-void ov::frontend::find_plugins(const std::string& dir_name, std::vector<PluginInfo>& res) {
+void ov::frontend::find_plugins(const ov::util::Path& dir_name, std::vector<PluginInfo>& res) {
 #ifdef OPENVINO_STATIC_LIBRARY
     load_static_plugins(res);
 #endif  // OPENVINO_STATIC_LIBRARY
@@ -120,13 +119,14 @@ void ov::frontend::find_plugins(const std::string& dir_name, std::vector<PluginI
 }
 
 /////////////////////////
-std::string PluginInfo::get_name_from_file() const {
-    const auto prefix = std::string(FRONTEND_LIB_PREFIX);
-    const auto suffix = std::string(FRONTEND_LIB_SUFFIX);
-    auto prefix_pos = m_file_name.find(prefix);
-    auto suffix_pos = m_file_name.rfind(suffix);
-    if (prefix_pos == 0 && suffix_pos + suffix.length() == m_file_name.length()) {
-        return m_file_name.substr(prefix_pos + prefix.length(), suffix_pos - prefix_pos - prefix.length());
+ov::util::Path PluginInfo::get_name_from_file() const {
+    const ov::util::Path prefix {FRONTEND_LIB_PREFIX};
+    const ov::util::Path suffix {FRONTEND_LIB_SUFFIX};
+    auto prefix_pos = m_file_name.native().find(prefix.native());
+    auto suffix_pos = m_file_name.native().rfind(suffix.native());
+    const auto prefix_length = prefix.native().length();
+    if (prefix_pos == 0 && suffix_pos + suffix.native().length() == m_file_name.native().length()) {
+        return m_file_name.native().substr(prefix_pos + prefix_length, suffix_pos - prefix_pos - prefix_length);
     }
     return m_file_name;
 }

src/frontends/common/src/plugin_loader.hpp

@@ -44,8 +44,8 @@ class PluginInfo {
     bool load_internal();
 
 public:
-    std::string m_file_name;  // Plugin file name, e.g. "libopenvino_ir_frontend.so"
-    std::string m_file_path;  // Plugin file full path
+    ov::util::Path m_file_name;  // Plugin file name, e.g. "libopenvino_ir_frontend.so"
+    ov::util::Path m_file_path;  // Plugin file full path
 
     PluginInfo() = default;
 
@@ -68,7 +68,7 @@ class PluginInfo {
         return m_loaded;
     }
 
-    std::string get_name_from_file() const;
+    ov::util::Path get_name_from_file() const;
 
     bool is_file_name_match(const std::string& name) const;
 
@@ -77,7 +77,7 @@ class PluginInfo {
 
 // Searches for available plugins in a specified directory
 // Appends found plugins to existing list
-void find_plugins(const std::string& dir_name, std::vector<PluginInfo>& res);
+void find_plugins(const ov::util::Path& dir_name, std::vector<PluginInfo>& res);
 
 }  // namespace frontend
 }  // namespace ov

src/frontends/paddle/tests/read_paddle_model_test.cpp

@@ -24,17 +24,16 @@ TEST(Paddle_Reader_Tests, LoadModelMemoryToCore) {
                                                     "conv2d_relu/conv2d_relu.pdiparams");
 
     ov::Core core;
-    auto read_file = [&](const std::string& file_name, size_t& size) {
-        FILE* sFile = fopen(file_name.c_str(), "r");
-        fseek(sFile, 0, SEEK_END);
-        size = ftell(sFile);
+    auto read_file = [&](const ov::util::Path& file_name, size_t& size) {
+        auto sFile = ov::util::File(fopen(file_name.c_str(), "r"));
+        fseek(sFile.get(), 0, SEEK_END);
+        size = ftell(sFile.get());
         uint8_t* ss = (uint8_t*)malloc(size);
-        rewind(sFile);
-        const size_t length = fread(&ss[0], 1, size, sFile);
+        rewind(sFile.get());
+        const size_t length = fread(&ss[0], 1, size, sFile.get());
         if (size != length) {
             std::cerr << "file size is not correct\n";
         }
-        fclose(sFile);
         return ss;
     };