Dropped old macro usage (#24453)
### Details: - *item1* - *...* ### Tickets: - *ticket-id*
This commit is contained in:
Ilya Lavrenov
GitHub
parent
003c540c72
commit
6f046e5e1b
|
|
@ -179,10 +179,6 @@ else()
|
|||
endif()
|
||||
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_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
|
||||
ov_set_if_not_defined(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
|
||||
|
|
|
|||
|
|
@ -941,87 +941,41 @@ EXCLUDE_PATTERNS = */temp/* \
|
|||
# Note that the wildcards are matched against the file with absolute path, so to
|
||||
# exclude all test directories use the pattern */test/*
|
||||
|
||||
EXCLUDE_SYMBOLS = InferenceEngine::details \
|
||||
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 \
|
||||
EXCLUDE_SYMBOLS = TBB_PREVIEW_LOCAL_OBSERVER \
|
||||
PARTITIONING \
|
||||
__PRETTY_FUNCTION__ \
|
||||
PRINT_COLOR_FORMAT \
|
||||
PRINT_LAYOUT \
|
||||
INFERENCE_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 \
|
||||
OPENVINO_EXTERN_C \
|
||||
OPENVINO_CORE_IMPORTS \
|
||||
OPENVINO_CORE_EXPORTS \
|
||||
INFERENCE_ENGINE_DEPRECATED \
|
||||
OPENVINO_DEPRECATED \
|
||||
OPENVINO_CDECL \
|
||||
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 \
|
||||
parallel_* \
|
||||
for_* \
|
||||
splitter \
|
||||
InferenceEngine::parallel_* \
|
||||
NOMINMAX \
|
||||
TBB_PREVIEW_NUMA_SUPPORT \
|
||||
TBB_PREVIEW_TASK_ARENA_CONSTRAINTS_EXTENSION \
|
||||
_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* \
|
||||
*device_name* \
|
||||
*exec_net* \
|
||||
*c_config* \
|
||||
*ie_core_impl* \
|
||||
*plugin_impl* \
|
||||
*extension_str* \
|
||||
*buffer* \
|
||||
*__cinit__* \
|
||||
ngraph::utils \
|
||||
ie_core_version \
|
||||
ie_core_versions \
|
||||
ie_available_devices \
|
||||
ie_core_versions \
|
||||
input_shapes \
|
||||
colorformat_e \
|
||||
layout_e \
|
||||
dimensions \
|
||||
ie_param_config \
|
||||
struct_desc \
|
||||
ie_param \
|
||||
ie_complete_call_back \
|
||||
IEStatusCode \
|
||||
input_shape \
|
||||
struct_desc
|
||||
|
||||
|
|
@ -2303,12 +2257,7 @@ INCLUDE_FILE_PATTERNS =
|
|||
# recursively expanded use the := operator instead of the = operator.
|
||||
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
|
||||
|
||||
PREDEFINED = "INFERENCE_ENGINE_API_CLASS=" \
|
||||
"INFERENCE_ENGINE_API_CPP=" \
|
||||
"INFERENCE_ENGINE_API=" \
|
||||
"INFERENCE_ENGINE_DEPRECATED(x)=" \
|
||||
"OPENVINO_DEPRECATED(x)=" \
|
||||
"IE_SUPPRESS_DEPRECATED_START=" \
|
||||
PREDEFINED = "OPENVINO_DEPRECATED(x)=" \
|
||||
"OPENVINO_CDECL=" \
|
||||
"OPENVINO_STDCALL=" \
|
||||
"OPENVINO_EXTERN_C=" \
|
||||
|
|
@ -2317,43 +2266,15 @@ PREDEFINED = "INFERENCE_ENGINE_API_CLASS=" \
|
|||
"OPENVINO_RUNTIME_API_C=" \
|
||||
"OPENVINO_RUNTIME_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)=" \
|
||||
"__VA_ARGS__=" \
|
||||
"INFERENCE_ENGINE_C_API_EXTERN=" \
|
||||
"INFERENCE_ENGINE_C_API_CALLBACK=" \
|
||||
"INFERENCE_ENGINE_C_API=" \
|
||||
"IE_NODISCARD=" \
|
||||
"__cdecl=" \
|
||||
"__declspec(x)=" \
|
||||
"_WIN32" \
|
||||
"INFERENCE_ENGINE_API=" \
|
||||
"INFERENCE_ENGINE_API_CPP=" \
|
||||
"INFERENCE_ENGINE_API_CLASS=" \
|
||||
"INFERENCE_ENGINE_DEPRECATED=" \
|
||||
"IMPLEMENT_OPENVINO_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)=" \
|
||||
"__VA_ARGS__=" \
|
||||
"INFERENCE_ENGINE_C_API_EXTERN=" \
|
||||
"INFERENCE_ENGINE_C_API=" \
|
||||
"IE_NODISCARD=" \
|
||||
"__cdecl=" \
|
||||
"__declspec(x)=" \
|
||||
"__GNUC__=" \
|
||||
|
|
|
|||
|
|
@ -314,12 +314,10 @@ function(ov_set_threading_interface_for TARGET_NAME)
|
|||
endif()
|
||||
endfunction()
|
||||
|
||||
set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
|
||||
set(OV_THREAD_DEFINE "OV_THREAD_SEQ")
|
||||
|
||||
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
|
||||
if (TBB_FOUND)
|
||||
set(IE_THREAD_DEFINE "IE_THREAD_TBB")
|
||||
set(OV_THREAD_DEFINE "OV_THREAD_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)
|
||||
|
|
@ -363,10 +361,9 @@ function(ov_set_threading_interface_for TARGET_NAME)
|
|||
endif ()
|
||||
|
||||
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)
|
||||
else ()
|
||||
set(IE_THREAD_DEFINE "IE_THREAD_OMP")
|
||||
set(OV_THREAD_DEFINE "OV_THREAD_OMP")
|
||||
|
||||
if (WIN32)
|
||||
|
|
@ -396,7 +393,6 @@ function(ov_set_threading_interface_for TARGET_NAME)
|
|||
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})
|
||||
|
||||
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)
|
||||
endif()
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ set(SRC identity.cpp ov_extension.cpp)
|
|||
|
||||
add_library(${TARGET_NAME} MODULE ${SRC})
|
||||
|
||||
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_OPENVINO_EXTENSION_API)
|
||||
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)
|
||||
|
||||
# [cmake:extension]
|
||||
|
|
|
|||
Loading…
Reference in New Issue