natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dropped old macro usage (#24453) 

### Details:
 - *item1*
 - *...*

### Tickets:
 - *ticket-id*
This commit is contained in:
Ilya Lavrenov 2024-05-10 01:44:55 +04:00 committed by GitHub
parent 003c540c72
commit 6f046e5e1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/developer_package/OpenVINODeveloperScriptsConfig.cmake
View File

@ -179,10 +179,6 @@ else()
endif() endif()
add_definitions(-DOV_BUILD_POSTFIX=\"${OV_BUILD_POSTFIX}\") add_definitions(-DOV_BUILD_POSTFIX=\"${OV_BUILD_POSTFIX}\")
# for BW compatibility; removed before 2024.0
set(IE_BUILD_POSTFIX ${OV_BUILD_POSTFIX})
add_definitions(-DIE_BUILD_POSTFIX=\"${IE_BUILD_POSTFIX}\")
ov_set_if_not_defined(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) ov_set_if_not_defined(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
ov_set_if_not_defined(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) ov_set_if_not_defined(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
ov_set_if_not_defined(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) ov_set_if_not_defined(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})

83
docs/Doxyfile.config
View File

@ -941,87 +941,41 @@ EXCLUDE_PATTERNS = */temp/* \
# Note that the wildcards are matched against the file with absolute path, so to # Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories use the pattern */test/* # exclude all test directories use the pattern */test/*
EXCLUDE_SYMBOLS = InferenceEngine::details \ EXCLUDE_SYMBOLS = TBB_PREVIEW_LOCAL_OBSERVER \
InferenceEngine::gpu::details \
PRECISION_NAME \
CASE \
CASE2 \
_CONFIG_KEY \
DECLARE_METRIC_KEY_IMPL \
DECLARE_*METRIC \
DECLARE_*METRIC_KEY \
DECLARE_*METRIC_VALUE \
DECLARE_*CONFIG_KEY \
DECLARE_VPU_CONFIG \
VPU_CONFIG_KEY \
VPU_CONFIG_VALUE \
VPU_METRIC \
DECLARE_*CONFIG_VALUE \
DECLARE_PARAM_KEY_IMPL \
TBB_PREVIEW_LOCAL_OBSERVER \
PARTITIONING \ PARTITIONING \
__PRETTY_FUNCTION__ \ __PRETTY_FUNCTION__ \
PRINT_COLOR_FORMAT \ PRINT_COLOR_FORMAT \
PRINT_LAYOUT \ PRINT_LAYOUT \
INFERENCE_PLUGIN_API \
OPENVINO_PLUGIN_API \ OPENVINO_PLUGIN_API \
INFERENCE_EXTENSION_API \
INFERENCE_ENGINE_API \
INFERENCE_ENGINE_API_CPP \
INFERENCE_ENGINE_API_CLASS \
OPENVINO_RUNTIME_API_C \ OPENVINO_RUNTIME_API_C \
OPENVINO_RUNTIME_API \ OPENVINO_RUNTIME_API \
OPENVINO_EXTERN_C \ OPENVINO_EXTERN_C \
OPENVINO_CORE_IMPORTS \ OPENVINO_CORE_IMPORTS \
OPENVINO_CORE_EXPORTS \ OPENVINO_CORE_EXPORTS \
INFERENCE_ENGINE_DEPRECATED \
OPENVINO_DEPRECATED \ OPENVINO_DEPRECATED \
OPENVINO_CDECL \ OPENVINO_CDECL \
OPENVINO_STDCALL \ OPENVINO_STDCALL \
IE_SUPPRESS_DEPRECATED_START \
IE_SUPPRESS_DEPRECATED_END \
_IE_SUPPRESS_DEPRECATED_START_GCC \
_IE_SUPPRESS_DEPRECATED_END_GCC \
IE_DO_PRAGMA \
OPENVINO_DO_PRAGMA \ OPENVINO_DO_PRAGMA \
parallel_* \ parallel_* \
for_* \ for_* \
splitter \ splitter \
InferenceEngine::parallel_* \
NOMINMAX \ NOMINMAX \
TBB_PREVIEW_NUMA_SUPPORT \ TBB_PREVIEW_NUMA_SUPPORT \
TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION \ TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION \
_TBB_REDUCE_FUNC \ _TBB_REDUCE_FUNC \
IE_THREAD_* \
INFERENCE_ENGINE_C_API_EXTERN \
INFERENCE_ENGINE_C_API \
INFERENCE_ENGINE_C_API_CALLBACK \
IE_NODISCARD \
InferenceEngine::details \
ie_api::BlobBuffer \
*impl* \ *impl* \
*device_name* \ *device_name* \
*exec_net* \ *exec_net* \
*c_config* \ *c_config* \
*ie_core_impl* \
*plugin_impl* \ *plugin_impl* \
*extension_str* \ *extension_str* \
*buffer* \ *buffer* \
*__cinit__* \ *__cinit__* \
ngraph::utils \
ie_core_version \
ie_core_versions \
ie_available_devices \
ie_core_versions \
input_shapes \ input_shapes \
colorformat_e \ colorformat_e \
layout_e \ layout_e \
dimensions \ dimensions \
ie_param_config \
struct_desc \ struct_desc \
ie_param \
ie_complete_call_back \
IEStatusCode \
input_shape \ input_shape \
struct_desc struct_desc
@ -2303,12 +2257,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator. # recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = "INFERENCE_ENGINE_API_CLASS=" \ PREDEFINED = "OPENVINO_DEPRECATED(x)=" \
"INFERENCE_ENGINE_API_CPP=" \
"INFERENCE_ENGINE_API=" \
"INFERENCE_ENGINE_DEPRECATED(x)=" \
"OPENVINO_DEPRECATED(x)=" \
"IE_SUPPRESS_DEPRECATED_START=" \
"OPENVINO_CDECL=" \ "OPENVINO_CDECL=" \
"OPENVINO_STDCALL=" \ "OPENVINO_STDCALL=" \
"OPENVINO_EXTERN_C=" \ "OPENVINO_EXTERN_C=" \
@ -2317,43 +2266,15 @@ PREDEFINED = "INFERENCE_ENGINE_API_CLASS=" \
"OPENVINO_RUNTIME_API_C=" \ "OPENVINO_RUNTIME_API_C=" \
"OPENVINO_RUNTIME_API=" \ "OPENVINO_RUNTIME_API=" \
"OPENVINO_PLUGIN_API=" \ "OPENVINO_PLUGIN_API=" \
"IE_SUPPRESS_DEPRECATED_END=" \
"_IE_SUPPRESS_DEPRECATED_START_GCC=" \
"_IE_SUPPRESS_DEPRECATED_END_GCC=" \
"INFERENCE_ENGINE_NN_BUILDER_API_CLASS=" \
"INFERENCE_ENGINE_NN_BUILDER_DEPRECATED(x)=" \
"INFERENCE_ENGINE_INTERNAL(x)=" \
"INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(x)=" \
"__attribute__(x)=" \ "__attribute__(x)=" \
"__VA_ARGS__=" \ "__VA_ARGS__=" \
"INFERENCE_ENGINE_C_API_EXTERN=" \
"INFERENCE_ENGINE_C_API_CALLBACK=" \
"INFERENCE_ENGINE_C_API=" \
"IE_NODISCARD=" \
"__cdecl=" \ "__cdecl=" \
"__declspec(x)=" \ "__declspec(x)=" \
"_WIN32" \ "_WIN32" \
"INFERENCE_ENGINE_API=" \
"INFERENCE_ENGINE_API_CPP=" \
"INFERENCE_ENGINE_API_CLASS=" \
"INFERENCE_ENGINE_DEPRECATED=" \
"IMPLEMENT_OPENVINO_API" \ "IMPLEMENT_OPENVINO_API" \
"TRANSFORMATIONS_API=" \ "TRANSFORMATIONS_API=" \
"NGRAPH_HELPER_DLL_EXPORT=" \
"NGRAPH_HELPER_DLL_IMPORT=" \
"IE_SUPPRESS_DEPRECATED_START=" \
"IE_SUPPRESS_DEPRECATED_END=" \
"_IE_SUPPRESS_DEPRECATED_START_MSVC=" \
"_IE_SUPPRESS_DEPRECATED_END_MSVC=" \
"_IE_SUPPRESS_DEPRECATED_START_GCC=" \
"_IE_SUPPRESS_DEPRECATED_END_GCC=" \
"IE_THREAD=IE_THREAD_TBB" \
"NGRAPH_RTTI_DECLARATION=" \
"__attribute__(x)=" \ "__attribute__(x)=" \
"__VA_ARGS__=" \ "__VA_ARGS__=" \
"INFERENCE_ENGINE_C_API_EXTERN=" \
"INFERENCE_ENGINE_C_API=" \
"IE_NODISCARD=" \
"__cdecl=" \ "__cdecl=" \
"__declspec(x)=" \ "__declspec(x)=" \
"__GNUC__=" \ "__GNUC__=" \

13
src/cmake/ov_parallel.cmake
View File

@ -314,12 +314,10 @@ function(ov_set_threading_interface_for TARGET_NAME)
endif() endif()
endfunction() endfunction()
set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
set(OV_THREAD_DEFINE "OV_THREAD_SEQ") set(OV_THREAD_DEFINE "OV_THREAD_SEQ")
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
if (TBB_FOUND) if (TBB_FOUND)
set(IE_THREAD_DEFINE "IE_THREAD_TBB")
set(OV_THREAD_DEFINE "OV_THREAD_TBB") set(OV_THREAD_DEFINE "OV_THREAD_TBB")
_ov_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} TBB::tbb) _ov_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} TBB::tbb)
target_compile_definitions(${TARGET_NAME} ${COMPILE_DEF_TYPE} TBB_PREVIEW_WAITING_FOR_WORKERS=1) target_compile_definitions(${TARGET_NAME} ${COMPILE_DEF_TYPE} TBB_PREVIEW_WAITING_FOR_WORKERS=1)
@ -363,10 +361,9 @@ function(ov_set_threading_interface_for TARGET_NAME)
endif () endif ()
if (NOT OMP_LIBRARIES_RELEASE) if (NOT OMP_LIBRARIES_RELEASE)
message(WARNING "Intel OpenMP not found. Intel OpenMP support will be disabled. ${IE_THREAD_DEFINE} is defined") message(WARNING "Intel OpenMP not found. Intel OpenMP support will be disabled. ${OV_THREAD_DEFINE} is defined")
set(THREADING "SEQ" PARENT_SCOPE) set(THREADING "SEQ" PARENT_SCOPE)
else () else ()
set(IE_THREAD_DEFINE "IE_THREAD_OMP")
set(OV_THREAD_DEFINE "OV_THREAD_OMP") set(OV_THREAD_DEFINE "OV_THREAD_OMP")
if (WIN32) if (WIN32)
@ -396,7 +393,6 @@ function(ov_set_threading_interface_for TARGET_NAME)
endif () endif ()
endif () endif ()
target_compile_definitions(${TARGET_NAME} ${COMPILE_DEF_TYPE} -DIE_THREAD=${IE_THREAD_DEFINE})
target_compile_definitions(${TARGET_NAME} ${COMPILE_DEF_TYPE} -DOV_THREAD=${OV_THREAD_DEFINE}) target_compile_definitions(${TARGET_NAME} ${COMPILE_DEF_TYPE} -DOV_THREAD=${OV_THREAD_DEFINE})
if (NOT THREADING STREQUAL "SEQ") if (NOT THREADING STREQUAL "SEQ")
@ -404,10 +400,3 @@ function(ov_set_threading_interface_for TARGET_NAME)
_ov_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} Threads::Threads) _ov_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} Threads::Threads)
endif() endif()
endfunction(ov_set_threading_interface_for) endfunction(ov_set_threading_interface_for)
# deprecated
function(set_ie_threading_interface_for TARGET_NAME)
message(WARNING "'set_ie_threading_interface_for' is deprecated. Please use 'ov_set_threading_interface_for' instead.")
ov_set_threading_interface_for(${TARGET_NAME})
endfunction(set_ie_threading_interface_for)

1
src/core/template_extension/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(SRC identity.cpp ov_extension.cpp)
add_library(${TARGET_NAME} MODULE ${SRC}) add_library(${TARGET_NAME} MODULE ${SRC})
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_OPENVINO_EXTENSION_API)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
# [cmake:extension] # [cmake:extension]