diff --git a/src/bindings/python/src/compatibility/pyngraph/coordinate.cpp b/src/bindings/python/src/compatibility/pyngraph/coordinate.cpp index 05ebaf9fa631a4..faa965d63de808 100644 --- a/src/bindings/python/src/compatibility/pyngraph/coordinate.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/coordinate.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph/coordinate.hpp" // ngraph::Coordinate +#include "openvino/core/coordinate.hpp" // ov::Coordinate #include #include +#include "openvino/core/shape.hpp" #include "pyngraph/coordinate.hpp" namespace py = pybind11; void regclass_pyngraph_Coordinate(py::module m) { - py::class_> coordinate(m, "Coordinate", py::module_local()); - coordinate.doc() = "ngraph.impl.Coordinate wraps ngraph::Coordinate"; + py::class_> coordinate(m, "Coordinate", py::module_local()); + coordinate.doc() = "ngraph.impl.Coordinate wraps ov::Coordinate"; coordinate.def(py::init&>()); - coordinate.def(py::init()); + coordinate.def(py::init()); coordinate.def(py::init&>()); - coordinate.def(py::init()); + coordinate.def(py::init()); } diff --git a/src/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp b/src/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp index 538d75611c75af..e83206afde05d6 100644 --- a/src/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp @@ -23,7 +23,7 @@ util::DictAttributeDeserializer::DictAttributeDeserializer( void util::DictAttributeDeserializer::on_adapter(const std::string& name, ngraph::ValueAccessor& adapter) { if (m_attributes.contains(name)) { - if (const auto& a = ngraph::as_type< + if (const auto& a = ov::as_type< ngraph::AttributeAdapter>>>( &adapter)) { std::vector> input_descs; @@ -65,7 +65,7 @@ void util::DictAttributeDeserializer::on_adapter(const std::string& name, ngraph } } a->set(input_descs); - } else if (const auto& a = ngraph::as_type>>>(&adapter)) { std::vector> output_descs; const py::dict& output_desc = m_attributes[name.c_str()].cast(); @@ -96,7 +96,7 @@ void util::DictAttributeDeserializer::on_adapter(const std::string& name, ngraph } a->set(output_descs); } else if (const auto& a = - ngraph::as_type>(&adapter)) { + ov::as_type>(&adapter)) { ngraph::op::v5::Loop::SpecialBodyPorts special_body_ports; const py::dict& special_ports_dict = m_attributes[name.c_str()].cast(); special_body_ports.body_condition_output_idx = @@ -104,8 +104,7 @@ void util::DictAttributeDeserializer::on_adapter(const std::string& name, ngraph special_body_ports.current_iteration_input_idx = special_ports_dict["current_iteration_input_idx"].cast(); a->set(special_body_ports); - } else if (const auto& a = - ngraph::as_type>>(&adapter)) { + } else if (const auto& a = ov::as_type>>(&adapter)) { std::string variable_id = m_attributes[name.c_str()].cast(); if (!m_variables.count(variable_id)) { m_variables[variable_id] = std::make_shared( diff --git a/src/bindings/python/src/compatibility/pyngraph/dimension.cpp b/src/bindings/python/src/compatibility/pyngraph/dimension.cpp index 1d6b9c14386d47..37b7210644eef6 100644 --- a/src/bindings/python/src/compatibility/pyngraph/dimension.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/dimension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph/dimension.hpp" // ngraph::Dimension +#include "openvino/core/dimension.hpp" // ov::Dimension #include #include @@ -16,10 +16,10 @@ namespace py = pybind11; void regclass_pyngraph_Dimension(py::module m) { - using value_type = ngraph::Dimension::value_type; + using value_type = ov::Dimension::value_type; - py::class_> dim(m, "Dimension", py::module_local()); - dim.doc() = "ngraph.impl.Dimension wraps ngraph::Dimension"; + py::class_> dim(m, "Dimension", py::module_local()); + dim.doc() = "ngraph.impl.Dimension wraps ov::Dimension"; dim.def(py::init<>()); dim.def(py::init(), py::arg("dimension"), @@ -41,10 +41,10 @@ void regclass_pyngraph_Dimension(py::module m) { :type max_dimension: The upper inclusive limit for the dimension. )"); - dim.def_static("dynamic", &ngraph::Dimension::dynamic); + dim.def_static("dynamic", &ov::Dimension::dynamic); dim.def_property_readonly("is_dynamic", - &ngraph::Dimension::is_dynamic, + &ov::Dimension::is_dynamic, R"( Check if Dimension is dynamic. @@ -52,7 +52,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: bool )"); dim.def_property_readonly("is_static", - &ngraph::Dimension::is_static, + &ov::Dimension::is_static, R"( Check if Dimension is static. @@ -62,20 +62,20 @@ void regclass_pyngraph_Dimension(py::module m) { dim.def( "__eq__", - [](const ngraph::Dimension& a, const ngraph::Dimension& b) { + [](const ov::Dimension& a, const ov::Dimension& b) { return a == b; }, py::is_operator()); dim.def( "__eq__", - [](const ngraph::Dimension& a, const int64_t& b) { + [](const ov::Dimension& a, const int64_t& b) { return a == b; }, py::is_operator()); - dim.def("__len__", &ngraph::Dimension::get_length); + dim.def("__len__", &ov::Dimension::get_length); dim.def("get_length", - &ngraph::Dimension::get_length, + &ov::Dimension::get_length, R"( Return this dimension as integer. This dimension must be static and non-negative. @@ -84,7 +84,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: int )"); dim.def("get_min_length", - &ngraph::Dimension::get_min_length, + &ov::Dimension::get_min_length, R"( Return this dimension's min_dimension as integer. This dimension must be dynamic and non-negative. @@ -93,7 +93,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: int )"); dim.def("get_max_length", - &ngraph::Dimension::get_max_length, + &ov::Dimension::get_max_length, R"( Return this dimension's max_dimension as integer. This dimension must be dynamic and non-negative. @@ -103,7 +103,7 @@ void regclass_pyngraph_Dimension(py::module m) { )"); dim.def("same_scheme", - &ngraph::Dimension::same_scheme, + &ov::Dimension::same_scheme, py::arg("dim"), R"( Return this dimension's max_dimension as integer. @@ -116,7 +116,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: bool )"); dim.def("compatible", - &ngraph::Dimension::compatible, + &ov::Dimension::compatible, py::arg("d"), R"( Check whether this dimension is capable of being merged @@ -128,7 +128,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: bool )"); dim.def("relaxes", - &ngraph::Dimension::relaxes, + &ov::Dimension::relaxes, py::arg("d"), R"( Check whether this dimension is a relaxation of the argument. @@ -145,7 +145,7 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: bool )"); dim.def("refines", - &ngraph::Dimension::refines, + &ov::Dimension::refines, py::arg("d"), R"( Check whether this dimension is a refinement of the argument. @@ -162,13 +162,13 @@ void regclass_pyngraph_Dimension(py::module m) { :rtype: bool )"); - dim.def("__str__", [](const ngraph::Dimension& self) -> std::string { + dim.def("__str__", [](const ov::Dimension& self) -> std::string { std::stringstream ss; ss << self; return ss.str(); }); - dim.def("__repr__", [](const ngraph::Dimension& self) -> std::string { + dim.def("__repr__", [](const ov::Dimension& self) -> std::string { return "() + ">"; }); } diff --git a/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp b/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp index 49f8bb97953ebf..9c7df295f0a39d 100644 --- a/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp @@ -8,16 +8,15 @@ #include #include -#include "ngraph/type.hpp" +#include "openvino/core/type.hpp" namespace py = pybind11; void regclass_pyngraph_DiscreteTypeInfo(py::module m) { - py::class_> discrete_type_info( - m, - "DiscreteTypeInfo", - py::module_local()); - discrete_type_info.doc() = "ngraph.impl.DiscreteTypeInfo wraps ngraph::DiscreteTypeInfo"; + py::class_> discrete_type_info(m, + "DiscreteTypeInfo", + py::module_local()); + discrete_type_info.doc() = "ngraph.impl.DiscreteTypeInfo wraps ov::DiscreteTypeInfo"; // operator overloading discrete_type_info.def(py::self < py::self); @@ -27,11 +26,11 @@ void regclass_pyngraph_DiscreteTypeInfo(py::module m) { discrete_type_info.def(py::self == py::self); discrete_type_info.def(py::self != py::self); - discrete_type_info.def_readonly("name", &ngraph::DiscreteTypeInfo::name); - discrete_type_info.def_readonly("version_id", &ngraph::DiscreteTypeInfo::version_id); - discrete_type_info.def_readonly("parent", &ngraph::DiscreteTypeInfo::parent); + discrete_type_info.def_readonly("name", &ov::DiscreteTypeInfo::name); + discrete_type_info.def_readonly("version_id", &ov::DiscreteTypeInfo::version_id); + discrete_type_info.def_readonly("parent", &ov::DiscreteTypeInfo::parent); - discrete_type_info.def("__repr__", [](const ngraph::DiscreteTypeInfo& self) { + discrete_type_info.def("__repr__", [](const ov::DiscreteTypeInfo& self) { std::string name = std::string(self.name); std::string version = std::string(self.version_id); if (self.parent != nullptr) { diff --git a/src/bindings/python/src/compatibility/pyngraph/node_factory.cpp b/src/bindings/python/src/compatibility/pyngraph/node_factory.cpp index f061e43f73893a..65e1646f742ae4 100644 --- a/src/bindings/python/src/compatibility/pyngraph/node_factory.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/node_factory.cpp @@ -19,7 +19,6 @@ #include "dict_attribute_visitor.hpp" #include "ngraph/check.hpp" #include "ngraph/except.hpp" -#include "ngraph/log.hpp" #include "ngraph/node.hpp" #include "ngraph/op/util/op_types.hpp" #include "ngraph/op/util/variable.hpp" @@ -61,8 +60,6 @@ class NodeFactory { "Currently NodeFactory doesn't support Constant node: ", op_type_name); - NGRAPH_WARN << "Empty op created! Please assign inputs and attributes and run validate() before op is used."; - return op_node; } diff --git a/src/bindings/python/src/compatibility/pyngraph/partial_shape.cpp b/src/bindings/python/src/compatibility/pyngraph/partial_shape.cpp index d5312cb480c2d7..69c333d729bb30 100644 --- a/src/bindings/python/src/compatibility/pyngraph/partial_shape.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/partial_shape.cpp @@ -11,8 +11,8 @@ #include #include -#include "ngraph/dimension.hpp" // ngraph::Dimension -#include "ngraph/shape.hpp" // ngraph::Shape +#include "ngraph/shape.hpp" // ngraph::Shape +#include "openvino/core/dimension.hpp" // ov::Dimension #include "pyngraph/partial_shape.hpp" namespace py = pybind11; @@ -26,16 +26,16 @@ void regclass_pyngraph_PartialShape(py::module m) { shape.doc() = "ngraph.impl.PartialShape wraps ngraph::PartialShape"; shape.def(py::init([](const std::vector& dimensions) { - return ngraph::PartialShape(std::vector(dimensions.begin(), dimensions.end())); + return ngraph::PartialShape(std::vector(dimensions.begin(), dimensions.end())); })); shape.def(py::init&>()); shape.def(py::init&>()); - shape.def(py::init&>()); - shape.def(py::init&>()); + shape.def(py::init&>()); + shape.def(py::init&>()); shape.def(py::init()); shape.def(py::init()); - shape.def_static("dynamic", &ngraph::PartialShape::dynamic, py::arg("r") = ngraph::Dimension()); + shape.def_static("dynamic", &ngraph::PartialShape::dynamic, py::arg("r") = ov::Dimension()); shape.def_property_readonly("is_dynamic", &ngraph::PartialShape::is_dynamic, @@ -163,7 +163,7 @@ void regclass_pyngraph_PartialShape(py::module m) { )"); shape.def( "get_dimension", - [](const ngraph::PartialShape& self, size_t index) -> ngraph::Dimension { + [](const ngraph::PartialShape& self, size_t index) -> ov::Dimension { return self[index]; }, py::arg("index"), diff --git a/src/core/include/ngraph/attribute_adapter.hpp b/src/core/include/ngraph/attribute_adapter.hpp index 80dd071420de5c..0994d9907ced29 100644 --- a/src/core/include/ngraph/attribute_adapter.hpp +++ b/src/core/include/ngraph/attribute_adapter.hpp @@ -19,7 +19,6 @@ #include #include "ngraph/enum_names.hpp" -#include "ngraph/type.hpp" #include "openvino/core/attribute_adapter.hpp" /// diff --git a/src/core/include/ngraph/attribute_visitor.hpp b/src/core/include/ngraph/attribute_visitor.hpp index b1b6d37956fe98..33a80aaeeefb6a 100644 --- a/src/core/include/ngraph/attribute_visitor.hpp +++ b/src/core/include/ngraph/attribute_visitor.hpp @@ -19,7 +19,6 @@ #include #include "ngraph/partial_shape.hpp" -#include "ngraph/type.hpp" #include "ngraph/type/element_type.hpp" #include "openvino/core/attribute_visitor.hpp" diff --git a/src/core/include/ngraph/coordinate.hpp b/src/core/include/ngraph/coordinate.hpp deleted file mode 100644 index ea280a63b37eda..00000000000000 --- a/src/core/include/ngraph/coordinate.hpp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include -#include - -#include "ngraph/attribute_adapter.hpp" -#include "ngraph/axis_set.hpp" -#include "ngraph/shape.hpp" -#include "openvino/core/coordinate.hpp" - -namespace ngraph { -/// \brief Coordinates for a tensor element -using ov::Coordinate; -} // namespace ngraph diff --git a/src/core/include/ngraph/dimension.hpp b/src/core/include/ngraph/dimension.hpp deleted file mode 100644 index 2c87e3377febc8..00000000000000 --- a/src/core/include/ngraph/dimension.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include "ngraph/attribute_adapter.hpp" -#include "ngraph/interval.hpp" -#include "openvino/core/dimension.hpp" - -namespace ngraph { -using ov::Dimension; -} // namespace ngraph diff --git a/src/core/include/ngraph/distributed.hpp b/src/core/include/ngraph/distributed.hpp index 6a07b09882e4fe..7a6a1e10f480d7 100644 --- a/src/core/include/ngraph/distributed.hpp +++ b/src/core/include/ngraph/distributed.hpp @@ -20,7 +20,6 @@ #include "ngraph/attribute_visitor.hpp" #include "ngraph/deprecated.hpp" -#include "ngraph/type.hpp" #include "ngraph/type/element_type.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/file_util.hpp b/src/core/include/ngraph/file_util.hpp deleted file mode 100644 index 17dca7d13223b4..00000000000000 --- a/src/core/include/ngraph/file_util.hpp +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include -#include -#include - -#include "ngraph/deprecated.hpp" -#include "ngraph/ngraph_visibility.hpp" - -namespace ngraph { -namespace file_util { -/// \brief Returns the name with extension for a given path -/// \param path The path to the output file -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string get_file_name(const std::string& path); - -/// \brief Returns the file extension -/// \param path The path to the output file -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string get_file_ext(const std::string& path); - -/// \brief Returns the directory portion of the given path -/// \param path The path to the output file -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string get_directory(const std::string& path); - -/// \brief Joins multiple paths into a single path -/// \param s1 Left side of path -/// \param s2 Right side of path -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string path_join(const std::string& s1, const std::string& s2); -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string path_join(const std::string& s1, const std::string& s2, const std::string& s3); -NGRAPH_API_DEPRECATED -NGRAPH_API -std::string path_join(const std::string& s1, const std::string& s2, const std::string& s3, const std::string& s4); - -/// \brief Iterate through files and optionally directories. Symbolic links are skipped. -/// \param path The path to iterate over -/// \param func A callback function called with each file or directory encountered -/// \param recurse Optional parameter to enable recursing through path -NGRAPH_API_DEPRECATED -NGRAPH_API -void iterate_files(const std::string& path, - std::function func, - bool recurse = false, - bool include_links = false); - -/// \brief Change Linux-style path ('/') to Windows-style ('\\') -/// \param path The path to change file separator -NGRAPH_API_DEPRECATED -NGRAPH_API void convert_path_win_style(std::string& path); - -/// \brief Conversion from wide character string to a single-byte chain. -/// \param wstr A wide-char string -/// \return A multi-byte string -NGRAPH_API_DEPRECATED -NGRAPH_API std::string wstring_to_string(const std::wstring& wstr); - -/// \brief Conversion from single-byte chain to wide character string. -/// \param str A null-terminated string -/// \return A wide-char string -NGRAPH_API_DEPRECATED -NGRAPH_API std::wstring multi_byte_char_to_wstring(const char* str); - -/// \brief Remove path components which would allow traversing up a directory tree. -/// \param path A path to file -/// \return A sanitiazed path -NGRAPH_API_DEPRECATED -NGRAPH_API std::string sanitize_path(const std::string& path); -} // namespace file_util -} // namespace ngraph diff --git a/src/core/include/ngraph/log.hpp b/src/core/include/ngraph/log.hpp deleted file mode 100644 index 596c4a4a6da5a1..00000000000000 --- a/src/core/include/ngraph/log.hpp +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#if defined(__linux) || defined(__APPLE__) -# include -# include -#endif -#include -#include - -#include "ngraph/deprecated.hpp" - -NGRAPH_SUPPRESS_DEPRECATED_START -namespace ngraph { -class NGRAPH_API_DEPRECATED ConstString { -public: - template - constexpr ConstString(const char (&p)[SIZE]) : m_string(p), - m_size(SIZE) {} - - constexpr char operator[](size_t i) const { - return i < m_size ? m_string[i] : throw std::out_of_range(""); - } - constexpr const char* get_ptr(size_t offset) const { - return offset < m_size ? &m_string[offset] : m_string; - } - constexpr size_t size() const { - return m_size; - } - -private: - const char* m_string; - size_t m_size; -}; - -NGRAPH_API_DEPRECATED -constexpr const char* find_last(ConstString s, size_t offset, char ch) { - return offset == 0 ? s.get_ptr(0) : (s[offset] == ch ? s.get_ptr(offset + 1) : find_last(s, offset - 1, ch)); -} - -NGRAPH_API_DEPRECATED -constexpr const char* find_last(ConstString s, char ch) { - return find_last(s, s.size() - 1, ch); -} - -NGRAPH_API_DEPRECATED -constexpr const char* get_file_name(ConstString s) { - return find_last(s, '/'); -} -NGRAPH_API_DEPRECATED -NGRAPH_API -const char* trim_file_name(const char* const fname); - -enum class LOG_TYPE { - _LOG_TYPE_ERROR, - _LOG_TYPE_WARNING, - _LOG_TYPE_INFO, - _LOG_TYPE_DEBUG, -}; - -class NGRAPH_API_DEPRECATED NGRAPH_API LogHelper { -public: - LogHelper(LOG_TYPE, const char* file, int line, std::function m_handler_func); - ~LogHelper(); - - std::ostream& stream() { - return m_stream; - } - -private: - std::function m_handler_func; - std::stringstream m_stream; -}; - -class NGRAPH_API_DEPRECATED Logger { - friend class LogHelper; - -public: - static void set_log_path(const std::string& path); - static void start(); - static void stop(); - -private: - static void log_item(const std::string& s); - static void process_event(const std::string& s); - static void thread_entry(void* param); - static std::string m_log_path; - static std::deque m_queue; -}; - -NGRAPH_API_DEPRECATED -NGRAPH_API -void default_logger_handler_func(const std::string& s); - -NGRAPH_SUPPRESS_DEPRECATED_END - -#define NGRAPH_ERR \ - ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_ERROR, \ - ngraph::trim_file_name(__FILE__), \ - __LINE__, \ - ngraph::default_logger_handler_func) \ - .stream() - -#define NGRAPH_WARN \ - ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_WARNING, \ - ngraph::trim_file_name(__FILE__), \ - __LINE__, \ - ngraph::default_logger_handler_func) \ - .stream() - -#define NGRAPH_INFO \ - ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_INFO, \ - ngraph::trim_file_name(__FILE__), \ - __LINE__, \ - ngraph::default_logger_handler_func) \ - .stream() - -#define NGRAPH_DEBUG \ - ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_DEBUG, \ - ngraph::trim_file_name(__FILE__), \ - __LINE__, \ - ngraph::default_logger_handler_func) \ - .stream() -} // namespace ngraph diff --git a/src/core/include/ngraph/ngraph.hpp b/src/core/include/ngraph/ngraph.hpp index 4d51c440783a63..a916781e28ec9d 100644 --- a/src/core/include/ngraph/ngraph.hpp +++ b/src/core/include/ngraph/ngraph.hpp @@ -53,7 +53,6 @@ #include "ngraph/descriptor/input.hpp" #include "ngraph/descriptor/output.hpp" #include "ngraph/descriptor/tensor.hpp" -#include "ngraph/dimension.hpp" #include "ngraph/evaluator.hpp" #include "ngraph/except.hpp" #include "ngraph/factory.hpp" @@ -65,7 +64,6 @@ #include "ngraph/shape.hpp" #include "ngraph/shape_util.hpp" #include "ngraph/specialize_function.hpp" -#include "ngraph/type.hpp" #include "ngraph/type/element_type.hpp" #include "ngraph/validation_util.hpp" diff --git a/src/core/include/ngraph/ngraph_visibility.hpp b/src/core/include/ngraph/ngraph_visibility.hpp index f2b2e18b344ad1..2a2c26f79be901 100644 --- a/src/core/include/ngraph/ngraph_visibility.hpp +++ b/src/core/include/ngraph/ngraph_visibility.hpp @@ -13,7 +13,6 @@ # endif #endif -#include "ngraph/visibility.hpp" #include "openvino/core/core_visibility.hpp" #define NGRAPH_API OPENVINO_API diff --git a/src/core/include/ngraph/node.hpp b/src/core/include/ngraph/node.hpp index 64a03e739a29c8..7b5da7e6eb0285 100644 --- a/src/core/include/ngraph/node.hpp +++ b/src/core/include/ngraph/node.hpp @@ -30,7 +30,6 @@ #include "ngraph/attribute_visitor.hpp" #include "ngraph/check.hpp" -#include "ngraph/coordinate.hpp" #include "ngraph/coordinate_diff.hpp" #include "ngraph/deprecated.hpp" #include "ngraph/descriptor/input.hpp" @@ -44,7 +43,6 @@ #include "ngraph/op/util/variable_value.hpp" #include "ngraph/output_vector.hpp" #include "ngraph/strides.hpp" -#include "ngraph/type.hpp" #include "openvino/core/any.hpp" #include "openvino/core/node.hpp" diff --git a/src/core/include/ngraph/op/util/attr_types.hpp b/src/core/include/ngraph/op/util/attr_types.hpp index 1d18f416695626..2c3f77289e64ec 100644 --- a/src/core/include/ngraph/op/util/attr_types.hpp +++ b/src/core/include/ngraph/op/util/attr_types.hpp @@ -19,7 +19,6 @@ #include "ngraph/attribute_adapter.hpp" #include "ngraph/ngraph_visibility.hpp" -#include "ngraph/type.hpp" #include "openvino/op/util/attr_types.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/op/util/variable.hpp b/src/core/include/ngraph/op/util/variable.hpp index 6bebe43b5fed6c..6093d69d247783 100644 --- a/src/core/include/ngraph/op/util/variable.hpp +++ b/src/core/include/ngraph/op/util/variable.hpp @@ -18,7 +18,6 @@ #include #include "ngraph/partial_shape.hpp" -#include "ngraph/type.hpp" #include "ngraph/type/element_type.hpp" #include "openvino/op/util/variable.hpp" diff --git a/src/core/include/ngraph/partial_shape.hpp b/src/core/include/ngraph/partial_shape.hpp index df5af7bce08de3..1803e35419bad1 100644 --- a/src/core/include/ngraph/partial_shape.hpp +++ b/src/core/include/ngraph/partial_shape.hpp @@ -15,7 +15,6 @@ #endif #include "ngraph/attribute_adapter.hpp" -#include "ngraph/dimension.hpp" #include "ngraph/op/util/attr_types.hpp" #include "ngraph/rank.hpp" #include "ngraph/shape.hpp" diff --git a/src/core/include/ngraph/pass/graph_rewrite.hpp b/src/core/include/ngraph/pass/graph_rewrite.hpp index 19e69e1db6538e..0931a9c704f7a0 100644 --- a/src/core/include/ngraph/pass/graph_rewrite.hpp +++ b/src/core/include/ngraph/pass/graph_rewrite.hpp @@ -16,7 +16,6 @@ #include #include -#include #include #include "ngraph/pass/pass.hpp" diff --git a/src/core/include/ngraph/rank.hpp b/src/core/include/ngraph/rank.hpp index 24b0775f871dd4..f33600e8e3c074 100644 --- a/src/core/include/ngraph/rank.hpp +++ b/src/core/include/ngraph/rank.hpp @@ -14,7 +14,6 @@ # endif #endif -#include "ngraph/dimension.hpp" #include "openvino/core/rank.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/rt_info.hpp b/src/core/include/ngraph/rt_info.hpp index 5219856e42cda6..aceb4736702662 100644 --- a/src/core/include/ngraph/rt_info.hpp +++ b/src/core/include/ngraph/rt_info.hpp @@ -18,7 +18,6 @@ #include "ngraph/ngraph_visibility.hpp" #include "ngraph/node.hpp" -#include "ngraph/type.hpp" #include "openvino/core/rt_info.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/shape_util.hpp b/src/core/include/ngraph/shape_util.hpp index 4720d5b7719936..e0b3dd6b66fcb8 100644 --- a/src/core/include/ngraph/shape_util.hpp +++ b/src/core/include/ngraph/shape_util.hpp @@ -89,7 +89,7 @@ NGRAPH_API_DEPRECATED AXIS_VALUES inject_pairs(const AXIS_VALUES& axis_values, template <> NGRAPH_API_DEPRECATED NGRAPH_API PartialShape -inject_pairs(const PartialShape& shape, std::vector> new_axis_pos_value_pairs); +inject_pairs(const PartialShape& shape, std::vector> new_axis_pos_value_pairs); // Add a new value at a particular axis position template diff --git a/src/core/include/ngraph/type.hpp b/src/core/include/ngraph/type.hpp deleted file mode 100644 index aa659c5b2f6314..00000000000000 --- a/src/core/include/ngraph/type.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include "openvino/core/type.hpp" - -namespace ngraph { -using ov::DiscreteTypeInfo; - -using ov::as_type; -using ov::as_type_ptr; -using ov::is_type; -} // namespace ngraph diff --git a/src/core/include/ngraph/visibility.hpp b/src/core/include/ngraph/visibility.hpp deleted file mode 100644 index cdfadee74e9bcd..00000000000000 --- a/src/core/include/ngraph/visibility.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include - -#define NGRAPH_HELPER_DLL_IMPORT OPENVINO_CORE_IMPORTS -#define NGRAPH_HELPER_DLL_EXPORT OPENVINO_CORE_EXPORTS diff --git a/src/core/src/distributed.cpp b/src/core/src/distributed.cpp index 7ab8ac3e04957a..54108cee9e16dd 100644 --- a/src/core/src/distributed.cpp +++ b/src/core/src/distributed.cpp @@ -4,9 +4,6 @@ #include "ngraph/distributed.hpp" -#include "ngraph/log.hpp" -#include "ngraph/type.hpp" - NGRAPH_SUPPRESS_DEPRECATED_START using namespace ngraph; diff --git a/src/core/src/file_util.cpp b/src/core/src/file_util.cpp deleted file mode 100644 index 1809311c49b38d..00000000000000 --- a/src/core/src/file_util.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "ngraph/file_util.hpp" - -#include "openvino/util/file_util.hpp" - -NGRAPH_SUPPRESS_DEPRECATED_START - -using namespace std; -using namespace ngraph; - -string file_util::get_file_name(const string& s) { - return ov::util::get_file_name(s); -} - -string file_util::get_file_ext(const string& s) { - return ov::util::get_file_ext(s); -} - -string file_util::get_directory(const string& s) { - return ov::util::get_directory(s); -} - -string file_util::path_join(const string& s1, const string& s2, const string& s3) { - return ov::util::path_join({s1, s2, s3}); -} - -string file_util::path_join(const string& s1, const string& s2, const string& s3, const string& s4) { - return ov::util::path_join({s1, s2, s3, s4}); -} - -string file_util::path_join(const string& s1, const string& s2) { - return ov::util::path_join({s1, s2}); -} - -void file_util::iterate_files(const string& path, - function func, - bool recurse, - bool include_links) { - ov::util::iterate_files(path, func, recurse, include_links); -} - -std::string file_util::sanitize_path(const std::string& path) { - return ov::util::sanitize_path(path); -} - -void file_util::convert_path_win_style(std::string& path) { - ov::util::convert_path_win_style(path); -} - -#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT - -std::string file_util::wstring_to_string(const std::wstring& wstr) { - return ov::util::wstring_to_string(wstr); -} - -std::wstring file_util::multi_byte_char_to_wstring(const char* str) { - return ov::util::string_to_wstring(str); -} -#endif // OPENVINO_ENABLE_UNICODE_PATH_SUPPORT diff --git a/src/core/src/log.cpp b/src/core/src/log.cpp deleted file mode 100644 index 105cc6cb6e64ed..00000000000000 --- a/src/core/src/log.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "ngraph/log.hpp" - -#include -#include -#include -#include -#include -#include -#include - -#include "ngraph/distributed.hpp" -#include "ngraph/env_util.hpp" -#include "openvino/util/file_util.hpp" - -using namespace std; -using namespace ngraph; - -void ngraph::default_logger_handler_func(const string& s) { - cout << s + "\n"; -} - -LogHelper::LogHelper(LOG_TYPE type, const char* file, int line, function handler_func) - : m_handler_func(handler_func) { - switch (type) { - case LOG_TYPE::_LOG_TYPE_ERROR: - m_stream << "[ERR] "; - break; - case LOG_TYPE::_LOG_TYPE_WARNING: - m_stream << "[WARN] "; - break; - case LOG_TYPE::_LOG_TYPE_INFO: - m_stream << "[INFO] "; - break; - case LOG_TYPE::_LOG_TYPE_DEBUG: - m_stream << "[DEBUG] "; - break; - } - - time_t tt = chrono::system_clock::to_time_t(chrono::system_clock::now()); - auto tm = gmtime(&tt); - if (tm) { - char buffer[256]; - strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%Sz", tm); - m_stream << buffer << " "; - } - - m_stream << file; - m_stream << " " << line; - m_stream << "\t"; -} - -LogHelper::~LogHelper() { -#ifdef ENABLE_OPENVINO_DEBUG - if (m_handler_func) { - m_handler_func(m_stream.str()); - } - // Logger::log_item(m_stream.str()); -#endif -} - -NGRAPH_SUPPRESS_DEPRECATED_START -const char* ngraph::trim_file_name(const char* const fname) { - return ov::util::trim_file_name(fname); -} -NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/src/core/src/opsets/opset.cpp b/src/core/src/opsets/opset.cpp index 9adcd22a43cc35..3f9104a1011fcb 100644 --- a/src/core/src/opsets/opset.cpp +++ b/src/core/src/opsets/opset.cpp @@ -5,7 +5,6 @@ #include "ngraph/opsets/opset.hpp" #include "itt.hpp" -#include "ngraph/log.hpp" #include "openvino/op/ops.hpp" #include "openvino/opsets/opset.hpp" #include "openvino/util/log.hpp" diff --git a/src/core/src/shape_util.cpp b/src/core/src/shape_util.cpp index 1d6b8e1c49d165..810686c9c7f88c 100644 --- a/src/core/src/shape_util.cpp +++ b/src/core/src/shape_util.cpp @@ -15,7 +15,7 @@ PartialShape project(const PartialShape& shape, const AxisSet& axes) { if (shape.rank().is_dynamic()) { return shape; } else { - std::vector result_dims; + std::vector result_dims; for (int64_t i = 0; i < shape.rank().get_length(); i++) { if (axes.find(i) != axes.end()) { @@ -32,7 +32,7 @@ PartialShape reduce(const PartialShape& shape, const AxisSet& deleted_axes, bool if (shape.rank().is_dynamic()) { return shape; } else { - std::vector result_dims; + std::vector result_dims; for (int64_t i = 0; i < shape.rank().get_length(); i++) { if (deleted_axes.find(i) == deleted_axes.end()) { @@ -49,11 +49,11 @@ PartialShape reduce(const PartialShape& shape, const AxisSet& deleted_axes, bool template <> PartialShape inject_pairs(const PartialShape& shape, - std::vector> new_axis_pos_value_pairs) { + std::vector> new_axis_pos_value_pairs) { if (shape.rank().is_dynamic()) { return shape; } else { - std::vector result_dims; + std::vector result_dims; size_t original_pos = 0; @@ -61,7 +61,7 @@ PartialShape inject_pairs(const PartialShape& shape, result_pos++) { auto search_it = std::find_if(new_axis_pos_value_pairs.begin(), new_axis_pos_value_pairs.end(), - [result_pos](std::pair p) { + [result_pos](std::pair p) { return p.first == result_pos; }); diff --git a/src/core/src/validation_util.cpp b/src/core/src/validation_util.cpp index 5a4f9dce1c08dc..aa71e2122ede58 100644 --- a/src/core/src/validation_util.cpp +++ b/src/core/src/validation_util.cpp @@ -21,6 +21,7 @@ OPENVINO_SUPPRESS_DEPRECATED_START namespace ngraph { +using ov::Dimension; Strides conv_default_strides(const Node* /* node */, const PartialShape& data_batch_shape, diff --git a/src/core/tests/specialize_function.cpp b/src/core/tests/specialize_function.cpp index e39bb8646f2868..9bbbf83ed591fd 100644 --- a/src/core/tests/specialize_function.cpp +++ b/src/core/tests/specialize_function.cpp @@ -214,7 +214,7 @@ TEST(specialize_function, et_static_shape_rank_static_dynamic_rank_mismatch) { // reconstruct the graph.) TEST(specialize_function, et_static_shape_rank_static_dynamic_dim_mismatch) { auto p0 = std::make_shared(element::f32, PartialShape{1, 2, 3}); - auto p1 = std::make_shared(element::i32, PartialShape{1, Dimension::dynamic(), 3}); + auto p1 = std::make_shared(element::i32, PartialShape{1, ov::Dimension::dynamic(), 3}); auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); diff --git a/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp b/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp index d0c6cf7cfde915..3d3ae61319696b 100644 --- a/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp +++ b/src/frontends/onnx/frontend/include/onnx_import/onnx_importer_visibility.hpp @@ -12,8 +12,6 @@ # endif #endif -#include "ngraph/visibility.hpp" - #ifdef OPENVINO_STATIC_LIBRARY # define ONNX_IMPORTER_API #else diff --git a/src/frontends/onnx/frontend/src/editor.cpp b/src/frontends/onnx/frontend/src/editor.cpp index 9e1e0fd3fb7473..f16f3ea00648eb 100644 --- a/src/frontends/onnx/frontend/src/editor.cpp +++ b/src/frontends/onnx/frontend/src/editor.cpp @@ -11,7 +11,6 @@ #include "detail/subgraph_extraction.hpp" #include "edge_mapper.hpp" -#include "ngraph/file_util.hpp" #include "onnx_common/parser.hpp" #include "onnx_common/utils.hpp" #include "openvino/util/file_util.hpp" diff --git a/src/frontends/onnx/frontend/src/onnx_framework_node.hpp b/src/frontends/onnx/frontend/src/onnx_framework_node.hpp index e4f48fc1515c5e..6489b17868543c 100644 --- a/src/frontends/onnx/frontend/src/onnx_framework_node.hpp +++ b/src/frontends/onnx/frontend/src/onnx_framework_node.hpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/src/frontends/onnx/frontend/src/op/com.microsoft/attention.cpp b/src/frontends/onnx/frontend/src/op/com.microsoft/attention.cpp index dfbba7d82303b1..80032c74a515ab 100644 --- a/src/frontends/onnx/frontend/src/op/com.microsoft/attention.cpp +++ b/src/frontends/onnx/frontend/src/op/com.microsoft/attention.cpp @@ -355,7 +355,7 @@ NodeTuple unidirectional_mask(const element::Type_t& type, // Shape (batch_size, 1, max_sequence_length, max_sequence_length) is not supported in onnxruntime: // https://github.com/microsoft/onnxruntime/blob/851554536ca8185b3413ee57449ea5ac93370193/onnxruntime/contrib_ops/cpu/bert/attention_helper.h#L78 std::shared_ptr raw_mask(const Output& mask_index, - Dimension::value_type mask_rank, + ov::Dimension::value_type mask_rank, const element::Type_t& type) { std::shared_ptr mask = std::make_shared(mask_index, type); mask = std::make_shared(mask, type); diff --git a/src/frontends/onnx/frontend/src/op/pad.cpp b/src/frontends/onnx/frontend/src/op/pad.cpp index 0431c6fbadd1fd..1f7368e70c9340 100644 --- a/src/frontends/onnx/frontend/src/op/pad.cpp +++ b/src/frontends/onnx/frontend/src/op/pad.cpp @@ -82,7 +82,7 @@ OutputVector pad(const Node& node) { if (ngraph::op::is_constant(pads.get_node())) { std::vector pads_vector = - ngraph::as_type_ptr(pads.get_node_shared_ptr())->get_vector(); + ov::as_type_ptr(pads.get_node_shared_ptr())->get_vector(); std::size_t const half_size = pads_vector.size() / 2; std::vector padding_begin_values(pads_vector.begin(), pads_vector.begin() + half_size); diff --git a/src/frontends/onnx/frontend/src/utils/onnx_internal.cpp b/src/frontends/onnx/frontend/src/utils/onnx_internal.cpp index 841750b7545fe2..9f53aa6e41430f 100644 --- a/src/frontends/onnx/frontend/src/utils/onnx_internal.cpp +++ b/src/frontends/onnx/frontend/src/utils/onnx_internal.cpp @@ -9,7 +9,6 @@ #include "core/graph.hpp" #include "core/model.hpp" #include "core/transform.hpp" -#include "ngraph/file_util.hpp" #include "onnx_framework_node.hpp" #include "onnx_import/core/null_node.hpp" #include "openvino/util/file_util.hpp" @@ -95,7 +94,7 @@ std::shared_ptr import_onnx_model(std::shared_ptr decode_to_framework_nodes(std::shared_ptr(file_util::get_directory(ov::util::get_absolute_file_path(model_path)), + auto graph = std::make_shared(ov::util::get_directory(ov::util::get_absolute_file_path(model_path)), model_proto, mmap_cache, extensions); diff --git a/src/frontends/onnx/frontend/src/utils/reshape.cpp b/src/frontends/onnx/frontend/src/utils/reshape.cpp index d1fad12c8fade9..33c5023a864fba 100644 --- a/src/frontends/onnx/frontend/src/utils/reshape.cpp +++ b/src/frontends/onnx/frontend/src/utils/reshape.cpp @@ -74,7 +74,7 @@ Output interpret_as_scalar(const Output& node) { // If node is a Constant, recreate as Constant with Shape{} if (ngraph::op::is_constant(node.get_node())) { - const auto value = ngraph::as_type_ptr(node.get_node_shared_ptr())->get_data_ptr(); + const auto value = ov::as_type_ptr(node.get_node_shared_ptr())->get_data_ptr(); return std::make_shared(node.get_element_type(), ngraph::Shape{}, value); } diff --git a/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp b/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp index 9a40d1fc6d7595..96dd0a4e0380f5 100644 --- a/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp +++ b/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp @@ -8,7 +8,6 @@ #include #include "exceptions.hpp" -#include "ngraph/file_util.hpp" #include "openvino/util/file_util.hpp" #include "openvino/util/log.hpp" @@ -60,7 +59,7 @@ Buffer TensorExternalData::load_external_data(const std::stri auto full_path = ov::util::path_join({model_dir, m_data_location}); #if defined(OPENVINO_ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32) NGRAPH_SUPPRESS_DEPRECATED_START - file_util::convert_path_win_style(full_path); + ov::util::convert_path_win_style(full_path); NGRAPH_SUPPRESS_DEPRECATED_END std::ifstream external_data_stream(ov::util::string_to_wstring(full_path).c_str(), std::ios::binary | std::ios::in | std::ios::ate); diff --git a/src/frontends/onnx/onnx_common/src/utils.cpp b/src/frontends/onnx/onnx_common/src/utils.cpp index 5c98d98499e336..07ab68f2d6084b 100644 --- a/src/frontends/onnx/onnx_common/src/utils.cpp +++ b/src/frontends/onnx/onnx_common/src/utils.cpp @@ -93,13 +93,13 @@ PartialShape onnx_to_ov_shape(const TensorShapeProto& onnx_shape) { return Shape{}; // empty list of dimensions denotes a scalar } - std::vector dims; + std::vector dims; for (const auto& onnx_dim : onnx_shape.dim()) { if (onnx_dim.has_dim_value()) { dims.emplace_back(onnx_dim.dim_value()); } else // has_dim_param() == true or it is empty dim { - dims.push_back(Dimension::dynamic()); + dims.push_back(ov::Dimension::dynamic()); } } return PartialShape{dims}; diff --git a/src/tests/ov_helpers/ov_lpt_models/src/assign_and_read_value.cpp b/src/tests/ov_helpers/ov_lpt_models/src/assign_and_read_value.cpp index c40aec2fc86f26..21edaeb9c81522 100644 --- a/src/tests/ov_helpers/ov_lpt_models/src/assign_and_read_value.cpp +++ b/src/tests/ov_helpers/ov_lpt_models/src/assign_and_read_value.cpp @@ -66,7 +66,7 @@ std::shared_ptr AssignAndReadValueFunction::getOriginal( add->set_friendly_name("output"); ov::ResultVector results{ std::make_shared(add) }; - ov::SinkVector sinks{ as_type_ptr(assign) }; + ov::SinkVector sinks{ ov::as_type_ptr(assign) }; return std::make_shared(results, sinks, ov::ParameterVector{ input }, "AssignAndReadValueFunction"); } @@ -112,7 +112,7 @@ std::shared_ptr AssignAndReadValueFunction::getOriginal( add->set_friendly_name("output"); ov::ResultVector results{ std::make_shared(add) }; - ov::SinkVector sinks{ as_type_ptr(assign) }; + ov::SinkVector sinks{ ov::as_type_ptr(assign) }; return std::make_shared(results, sinks, ov::ParameterVector{ input }, "AssignAndReadValueFunction"); } @@ -178,7 +178,7 @@ std::shared_ptr AssignAndReadValueFunction::getReference( add->set_friendly_name("output"); ov::ResultVector results{ std::make_shared(add) }; - ov::SinkVector sinks{ as_type_ptr(assign) }; + ov::SinkVector sinks{ ov::as_type_ptr(assign) }; return std::make_shared(results, sinks, ov::ParameterVector{ input }, "AssignAndReadValueFunction"); } diff --git a/src/tests/ov_helpers/ov_lpt_models/src/multiply.cpp b/src/tests/ov_helpers/ov_lpt_models/src/multiply.cpp index 6dbdd101aef262..5a3f9cb452eba0 100644 --- a/src/tests/ov_helpers/ov_lpt_models/src/multiply.cpp +++ b/src/tests/ov_helpers/ov_lpt_models/src/multiply.cpp @@ -68,10 +68,10 @@ std::shared_ptr MultiplyFunction::get(const element::Type model_preci ov::ResultVector results{ std::make_shared(parent) }; ov::ParameterVector inputs; - if (is_type(branchNodes1.input)) { + if (ov::is_type(branchNodes1.input)) { inputs.push_back(std::dynamic_pointer_cast(branchNodes1.input)); } - if (is_type(branchNodes2.input)) { + if (ov::is_type(branchNodes2.input)) { inputs.push_back(std::dynamic_pointer_cast(branchNodes2.input)); } diff --git a/src/tests/ov_helpers/ov_lpt_models/src/multiply_partial_function.cpp b/src/tests/ov_helpers/ov_lpt_models/src/multiply_partial_function.cpp index 111eecb084968f..78e36353987272 100644 --- a/src/tests/ov_helpers/ov_lpt_models/src/multiply_partial_function.cpp +++ b/src/tests/ov_helpers/ov_lpt_models/src/multiply_partial_function.cpp @@ -69,10 +69,10 @@ std::shared_ptr MultiplyPartialFunction::get( ov::ResultVector results{ std::make_shared(multiply) }; ov::ParameterVector inputs; - if (is_type(branchNodes1.input)) { + if (ov::is_type(branchNodes1.input)) { inputs.push_back(std::dynamic_pointer_cast(branchNodes1.input)); } - if (is_type(branchNodes2.input)) { + if (ov::is_type(branchNodes2.input)) { inputs.push_back(std::dynamic_pointer_cast(branchNodes2.input)); }