Skip to content

Commit 1e3039f

Browse files
authored
Remove ngraph_visibility.hpp / deprecated.hpp / check.hpp (openvinotoolkit#22520)
* Remove ngraph visibility * Remove ngraph deprecated * Remove ngraph check * Fix clang-format
1 parent 8225e79 commit 1e3039f

25 files changed

+339
-264
lines changed

samples/cpp/common/utils/include/samples/common.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static constexpr char pcSimpleSort[] = "simple_sort";
4444
/**
4545
* @brief Unicode string wrappers
4646
*/
47-
#if defined(ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32)
47+
#if defined(OPENVINO_ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32)
4848
# define tchar wchar_t
4949
# define tstring std::wstring
5050
# define tmain wmain
@@ -56,7 +56,7 @@ static constexpr char pcSimpleSort[] = "simple_sort";
5656
# define TSTRING2STRING(tstr) tstr
5757
#endif
5858

59-
#if defined(ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32)
59+
#if defined(OPENVINO_ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32)
6060

6161
/**
6262
* @brief Convert wstring to string

src/core/include/ngraph/axis_set.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <set>
2020
#include <vector>
2121

22-
#include "ngraph/ngraph_visibility.hpp"
2322
#include "openvino/core/axis_set.hpp"
2423

2524
namespace ngraph {

src/core/include/ngraph/axis_vector.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <ostream>
1919
#include <vector>
2020

21-
#include "ngraph/ngraph_visibility.hpp"
2221
#include "openvino/core/axis_vector.hpp"
2322

2423
namespace ngraph {

src/core/include/ngraph/check.hpp

-36
This file was deleted.

src/core/include/ngraph/coordinate_diff.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <ostream>
1919
#include <vector>
2020

21-
#include "ngraph/ngraph_visibility.hpp"
2221
#include "openvino/core/coordinate_diff.hpp"
2322

2423
namespace ngraph {

src/core/include/ngraph/deprecated.hpp

-26
This file was deleted.

src/core/include/ngraph/enum_names.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# endif
1515
#endif
1616

17-
#include "ngraph/check.hpp"
1817
#include "openvino/core/enum_names.hpp"
1918

2019
namespace ngraph {

src/core/include/ngraph/env_util.hpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,30 @@
1515
#endif
1616

1717
#include <cstdint>
18-
#include <ngraph/ngraph_visibility.hpp>
1918
#include <string>
2019

21-
#include "ngraph/deprecated.hpp"
20+
#include "openvino/core/core_visibility.hpp"
21+
#include "openvino/core/deprecated.hpp"
2222

2323
namespace ngraph {
2424
/// \brief Get the names environment variable as a string.
2525
/// \param env_var The string name of the environment variable to get.
2626
/// \return Returns string by value or an empty string if the environment
2727
/// variable is not set.
28-
NGRAPH_API_DEPRECATED NGRAPH_API std::string getenv_string(const char* env_var);
28+
OPENVINO_DEPRECATED("The nGraph API is deprecated and will be removed in the 2024.0 release. "
29+
"For instructions on transitioning to the new API, please refer to "
30+
"https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html")
31+
OPENVINO_API std::string getenv_string(const char* env_var);
2932

3033
/// \brief Get the names environment variable as an integer. If the value is not a
3134
/// valid integer then an exception is thrown.
3235
/// \param env_var The string name of the environment variable to get.
3336
/// \param default_value The value to return if the environment variable is not set.
3437
/// \return Returns value or default_value if the environment variable is not set.
35-
NGRAPH_API_DEPRECATED NGRAPH_API int32_t getenv_int(const char* env_var, int32_t default_value = -1);
38+
OPENVINO_DEPRECATED("The nGraph API is deprecated and will be removed in the 2024.0 release. "
39+
"For instructions on transitioning to the new API, please refer to "
40+
"https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html")
41+
OPENVINO_API int32_t getenv_int(const char* env_var, int32_t default_value = -1);
3642

3743
/// \brief Get the names environment variable as a boolean. If the value is not a
3844
/// valid boolean then an exception is thrown. Valid booleans are one of
@@ -42,5 +48,8 @@ NGRAPH_API_DEPRECATED NGRAPH_API int32_t getenv_int(const char* env_var, int32_t
4248
/// \param env_var The string name of the environment variable to get.
4349
/// \param default_value The value to return if the environment variable is not set.
4450
/// \return Returns the boolean value of the environment variable.
45-
NGRAPH_API_DEPRECATED NGRAPH_API bool getenv_bool(const char* env_var, bool default_value = false);
51+
OPENVINO_DEPRECATED("The nGraph API is deprecated and will be removed in the 2024.0 release. "
52+
"For instructions on transitioning to the new API, please refer to "
53+
"https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html")
54+
OPENVINO_API bool getenv_bool(const char* env_var, bool default_value = false);
4655
} // namespace ngraph

src/core/include/ngraph/evaluator.hpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <stack>
1919
#include <utility>
2020

21-
#include "ngraph/deprecated.hpp"
2221
#include "ngraph/shape.hpp"
22+
#include "openvino/core/deprecated.hpp"
2323
#include "openvino/core/node.hpp"
2424
#include "openvino/core/type/element_type_traits.hpp"
2525

@@ -28,8 +28,10 @@ namespace ngraph {
2828
///
2929
///
3030
template <typename V>
31-
class NGRAPH_API_DEPRECATED Evaluator {
32-
NGRAPH_SUPPRESS_DEPRECATED_START
31+
class OPENVINO_DEPRECATED("The nGraph API is deprecated and will be removed in the 2024.0 release. "
32+
"For instructions on transitioning to the new API, please refer to "
33+
"https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") Evaluator {
34+
OPENVINO_SUPPRESS_DEPRECATED_START
3335
public:
3436
/// \brief values we compute for outputs
3537
using value_map = std::map<ov::RawNodeOutput, V>;
@@ -184,6 +186,6 @@ class NGRAPH_API_DEPRECATED Evaluator {
184186
op_handler_map m_handlers;
185187
op_handler m_default_handler;
186188
value_map& m_value_map;
187-
NGRAPH_SUPPRESS_DEPRECATED_END
189+
OPENVINO_SUPPRESS_DEPRECATED_END
188190
};
189191
} // namespace ngraph

0 commit comments

Comments
 (0)