diff --git a/cmake/developer_package/add_ie_target.cmake b/cmake/developer_package/add_ie_target.cmake index 1aa8b57954e..b52e8b15dcf 100644 --- a/cmake/developer_package/add_ie_target.cmake +++ b/cmake/developer_package/add_ie_target.cmake @@ -120,7 +120,7 @@ function(addIeTarget) endif() if (ARG_ADD_CLANG_FORMAT) # code style - add_clang_format_target(${ARG_NAME}_clang FOR_TARGETS ${ARG_NAME}) + ov_add_clang_format_target(${ARG_NAME}_clang FOR_TARGETS ${ARG_NAME}) endif() if (ARG_DEVELOPER_PACKAGE) # developer package diff --git a/cmake/developer_package/api_validator/api_validator.cmake b/cmake/developer_package/api_validator/api_validator.cmake index 68693fb7b54..a92c766bca2 100644 --- a/cmake/developer_package/api_validator/api_validator.cmake +++ b/cmake/developer_package/api_validator/api_validator.cmake @@ -193,6 +193,11 @@ endfunction() # # ie_add_api_validator_post_build_step(TARGET ) # -macro(ie_add_api_validator_post_build_step) +macro(ov_add_api_validator_post_build_step) + _ov_add_api_validator_post_build_step(${ARGV}) +endmacro() + +macro(ie_add_api_validator_post_build_step) + message(WARNING "ie_add_api_validator_post_build_step is deprecated, use ov_add_api_validator_post_build_step instead") _ov_add_api_validator_post_build_step(${ARGV}) endmacro() diff --git a/cmake/developer_package/clang_format/clang_format.cmake b/cmake/developer_package/clang_format/clang_format.cmake index d75a4535932..e8286ed2e9c 100644 --- a/cmake/developer_package/clang_format/clang_format.cmake +++ b/cmake/developer_package/clang_format/clang_format.cmake @@ -32,10 +32,10 @@ if(ENABLE_CLANG_FORMAT AND NOT TARGET clang_format_check_all) endif() # -# add_clang_format_target(FOR_TARGETS | FOR_SOURCES -# [EXCLUDE_PATTERNS ]) +# ov_add_clang_format_target(FOR_TARGETS | FOR_SOURCES +# [EXCLUDE_PATTERNS ]) # -function(add_clang_format_target TARGET_NAME) +function(ov_add_clang_format_target TARGET_NAME) if(NOT ENABLE_CLANG_FORMAT) return() endif() @@ -130,3 +130,8 @@ function(add_clang_format_target TARGET_NAME) add_dependencies(clang_format_check_all ${TARGET_NAME}) add_dependencies(clang_format_fix_all ${TARGET_NAME}_fix) endfunction() + +function(add_clang_format_target) + message(WARNING "add_clang_format_target is deprecated, use ov_add_clang_format_target instead") + ov_add_clang_format_target(${ARGV}) +endfunction() diff --git a/cmake/developer_package/compile_flags/os_flags.cmake b/cmake/developer_package/compile_flags/os_flags.cmake index 7d34c308f38..77754076907 100644 --- a/cmake/developer_package/compile_flags/os_flags.cmake +++ b/cmake/developer_package/compile_flags/os_flags.cmake @@ -218,24 +218,26 @@ endfunction() # Enables Link Time Optimization compilation # macro(ie_enable_lto) + message(WARNING "ie_add_compiler_flags is deprecated, set INTERPROCEDURAL_OPTIMIZATION_RELEASE target property instead") set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) endmacro() # -# ie_add_compiler_flags(]) +# ov_add_compiler_flags(]) # # Adds compiler flags to C / C++ sources # -macro(ie_add_compiler_flags) +macro(ov_add_compiler_flags) foreach(flag ${ARGN}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") endforeach() endmacro() -function(ov_add_compiler_flags) - ie_add_compiler_flags(${ARGN}) -endfunction() +macro(ie_add_compiler_flags) + message(WARNING "ie_add_compiler_flags is deprecated, use ov_add_compiler_flags instead") + ov_add_compiler_flags(${ARGN}) +endmacro() # # ov_force_include(
) @@ -267,11 +269,11 @@ function(ov_abi_free_target target) endfunction() # -# ie_python_minimal_api() +# ov_python_minimal_api() # # Set options to use only Python Limited API # -function(ie_python_minimal_api target) +function(ov_python_minimal_api target) # pybind11 uses a lot of API which is not a part of minimal python API subset # Ref 1: https://docs.python.org/3.11/c-api/stable.html # Ref 2: https://github.com/pybind/pybind11/issues/1755 @@ -301,7 +303,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD) endif() if(ENABLE_COVERAGE) - ie_add_compiler_flags(--coverage) + ov_add_compiler_flags(--coverage) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") endif() @@ -313,9 +315,9 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) if(CMAKE_CL_64) # Default char Type Is unsigned - # ie_add_compiler_flags(/J) + # ov_add_compiler_flags(/J) elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-fsigned-char) + ov_add_compiler_flags(-fsigned-char) endif() file(RELATIVE_PATH OV_RELATIVE_BIN_PATH ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) @@ -335,22 +337,22 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # Common options / warnings enabled # - ie_add_compiler_flags(/D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS) + ov_add_compiler_flags(/D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS) # no asynchronous structured exception handling - ie_add_compiler_flags(/EHsc) + ov_add_compiler_flags(/EHsc) # Allows the compiler to package individual functions in the form of packaged functions (COMDATs). - ie_add_compiler_flags(/Gy) + ov_add_compiler_flags(/Gy) # This option helps ensure the fewest possible hard-to-find code defects. Similar to -Wall on GNU / Clang - ie_add_compiler_flags(/W3) + ov_add_compiler_flags(/W3) # Increase Number of Sections in .Obj file - ie_add_compiler_flags(/bigobj) + ov_add_compiler_flags(/bigobj) # Build with multiple processes - ie_add_compiler_flags(/MP) + ov_add_compiler_flags(/MP) if(AARCH64 AND NOT MSVC_VERSION LESS 1930) # otherwise, _ARM64_EXTENDED_INTRINSICS is defined, which defines 'mvn' macro - ie_add_compiler_flags(/D_ARM64_DISTINCT_NEON_TYPES) + ov_add_compiler_flags(/D_ARM64_DISTINCT_NEON_TYPES) endif() # Handle Large Addresses @@ -362,7 +364,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(CMAKE_COMPILE_WARNING_AS_ERROR) if(CMAKE_VERSION VERSION_LESS 3.24) - ie_add_compiler_flags(/WX) + ov_add_compiler_flags(/WX) endif() set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /WX") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /WX") @@ -374,9 +376,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # # C4251 needs to have dll-interface to be used by clients of class - ie_add_compiler_flags(/wd4251) + ov_add_compiler_flags(/wd4251) # C4275 non dll-interface class used as base for dll-interface class - ie_add_compiler_flags(/wd4275) + ov_add_compiler_flags(/wd4275) # Enable __FILE__ trim, use path with forward and backward slash as directory separator add_compile_options( @@ -400,7 +402,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND WIN32) # if(CMAKE_COMPILE_WARNING_AS_ERROR AND CMAKE_VERSION VERSION_LESS 3.24) - ie_add_compiler_flags(/Qdiag-warning:47,1740,1786) + ov_add_compiler_flags(/Qdiag-warning:47,1740,1786) endif() # @@ -408,40 +410,40 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND WIN32) # # 161: unrecognized pragma - ie_add_compiler_flags(/Qdiag-disable:161) + ov_add_compiler_flags(/Qdiag-disable:161) # 177: variable was declared but never referenced - ie_add_compiler_flags(/Qdiag-disable:177) + ov_add_compiler_flags(/Qdiag-disable:177) # 556: not matched type of assigned function pointer - ie_add_compiler_flags(/Qdiag-disable:556) + ov_add_compiler_flags(/Qdiag-disable:556) # 1744: field of class type without a DLL interface used in a class with a DLL interface - ie_add_compiler_flags(/Qdiag-disable:1744) + ov_add_compiler_flags(/Qdiag-disable:1744) # 1879: unimplemented pragma ignored - ie_add_compiler_flags(/Qdiag-disable:1879) + ov_add_compiler_flags(/Qdiag-disable:1879) # 2586: decorated name length exceeded, name was truncated - ie_add_compiler_flags(/Qdiag-disable:2586) + ov_add_compiler_flags(/Qdiag-disable:2586) # 2651: attribute does not apply to any entity - ie_add_compiler_flags(/Qdiag-disable:2651) + ov_add_compiler_flags(/Qdiag-disable:2651) # 3180: unrecognized OpenMP pragma - ie_add_compiler_flags(/Qdiag-disable:3180) + ov_add_compiler_flags(/Qdiag-disable:3180) # 11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo - ie_add_compiler_flags(/Qdiag-disable:11075) + ov_add_compiler_flags(/Qdiag-disable:11075) # 15335: was not vectorized: vectorization possible but seems inefficient. # Use vector always directive or /Qvec-threshold0 to override - ie_add_compiler_flags(/Qdiag-disable:15335) + ov_add_compiler_flags(/Qdiag-disable:15335) else() # # Common enabled warnings # # allow linker eliminating the unused code and data from the final executable - ie_add_compiler_flags(-ffunction-sections -fdata-sections) + ov_add_compiler_flags(-ffunction-sections -fdata-sections) # emits text showing the command-line option controlling a diagnostic - ie_add_compiler_flags(-fdiagnostics-show-option) + ov_add_compiler_flags(-fdiagnostics-show-option) # This enables all the warnings about constructions that some users consider questionable, and that are easy to avoid - ie_add_compiler_flags(-Wall) + ov_add_compiler_flags(-Wall) # Warn if an undefined identifier is evaluated in an #if directive. Such identifiers are replaced with zero. - ie_add_compiler_flags(-Wundef) + ov_add_compiler_flags(-Wundef) # To guarantee OpenVINO can be used with gcc versions 7 through 12 # - https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html @@ -468,7 +470,7 @@ else() # if(CMAKE_COMPILE_WARNING_AS_ERROR AND CMAKE_VERSION VERSION_LESS 3.24) - ie_add_compiler_flags(-Werror) + ov_add_compiler_flags(-Werror) endif() # @@ -477,7 +479,7 @@ else() if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") # 177: function "XXX" was declared but never referenced - ie_add_compiler_flags(-diag-disable=remark,177,2196) + ov_add_compiler_flags(-diag-disable=remark,177,2196) endif() # @@ -493,8 +495,8 @@ else() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ERROR_ON_MISSING_LIBRARIES=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1") # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=4") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1") - ie_add_compiler_flags(-sDISABLE_EXCEPTION_CATCHING=0) - # ie_add_compiler_flags(-sUSE_PTHREADS=1) + ov_add_compiler_flags(-sDISABLE_EXCEPTION_CATCHING=0) + # ov_add_compiler_flags(-sUSE_PTHREADS=1) else() set(exclude_libs "-Wl,--exclude-libs,ALL") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections ${exclude_libs}") @@ -507,7 +509,6 @@ else() endif() add_compile_definitions( - # Defines to trim check of __FILE__ macro in case if not done by compiler. OV_NATIVE_PARENT_PROJECT_ROOT_DIR="${OV_NATIVE_PARENT_PROJECT_ROOT_DIR}") @@ -519,11 +520,11 @@ endif() check_cxx_compiler_flag("-Wunused-but-set-variable" UNUSED_BUT_SET_VARIABLE_SUPPORTED) # -# link_system_libraries(target ) +# ov_link_system_libraries(target ) # # Links provided libraries and include their INTERFACE_INCLUDE_DIRECTORIES as SYSTEM # -function(link_system_libraries TARGET_NAME) +function(ov_link_system_libraries TARGET_NAME) set(MODE PRIVATE) foreach(arg IN LISTS ARGN) diff --git a/cmake/developer_package/faster_build.cmake b/cmake/developer_package/faster_build.cmake index 2b036c61f91..b0f6a6c8b7b 100644 --- a/cmake/developer_package/faster_build.cmake +++ b/cmake/developer_package/faster_build.cmake @@ -4,23 +4,23 @@ include(CMakeParseArguments) -function(ie_faster_build TARGET_NAME) +function(ov_build_target_faster TARGET_NAME) if(NOT ENABLE_FASTER_BUILD) return() endif() - cmake_parse_arguments(IE_FASTER_BUILD "UNITY" "" "PCH" ${ARGN}) + cmake_parse_arguments(FASTER_BUILD "UNITY" "" "PCH" ${ARGN}) - if(IE_FASTER_BUILD_UNITY) - set_target_properties(${TARGET_NAME} - PROPERTIES - UNITY_BUILD ON - ) + if(FASTER_BUILD_UNITY) + set_target_properties(${TARGET_NAME} PROPERTIES UNITY_BUILD ON) endif() - if(IE_FASTER_BUILD_PCH) - target_precompile_headers(${TARGET_NAME} - ${IE_FASTER_BUILD_PCH} - ) + if(FASTER_BUILD_PCH) + target_precompile_headers(${TARGET_NAME} ${FASTER_BUILD_PCH}) endif() endfunction() + +function(ie_faster_build) + message(WARNING "ie_faster_build is deprecated, use ov_build_target_faster instead") + ov_build_target_faster(${ARGV}) +endfunction() diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index df3586474b0..c772ed706b7 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -183,6 +183,11 @@ macro(ov_add_frontend) "-Dget_api_version=get_api_version_${OV_FRONTEND_NAME}") endif() + # remove -Wmissing-declarations warning, because of frontends implementation specific + if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) + target_compile_options(${TARGET_NAME} PRIVATE -Wno-missing-declarations) + endif() + target_include_directories(${TARGET_NAME} PUBLIC $ @@ -219,7 +224,7 @@ macro(ov_add_frontend) set(protobuf_target_name "protobuf::${protobuf_target_name}") endif() - link_system_libraries(${TARGET_NAME} PRIVATE ${protobuf_target_name}) + ov_link_system_libraries(${TARGET_NAME} PRIVATE ${protobuf_target_name}) # protobuf generated code emits -Wsuggest-override error if(SUGGEST_OVERRIDE_SUPPORTED) @@ -242,8 +247,8 @@ macro(ov_add_frontend) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${flatbuffers_INCLUDE_DIRECTORIES}) endif() - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} - EXCLUDE_PATTERNS ${PROTO_SRCS} ${PROTO_HDRS} ${proto_files} ${flatbuffers_schema_files}) + ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} + EXCLUDE_PATTERNS ${PROTO_SRCS} ${PROTO_HDRS} ${proto_files} ${flatbuffers_schema_files}) # enable LTO set_target_properties(${TARGET_NAME} PROPERTIES @@ -263,7 +268,7 @@ macro(ov_add_frontend) add_dependencies(ov_frontends ${TARGET_NAME}) # must be called after all target_link_libraries - ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) + ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) # since frontends are user-facing component which can be linked against, # then we need to mark it to be CXX ABI free diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index 436685355a8..4138aed19f4 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -103,7 +103,7 @@ function(ov_add_plugin) endforeach() if (OV_PLUGIN_ADD_CLANG_FORMAT) - add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_SOURCES ${OV_PLUGIN_SOURCES}) + ov_add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_SOURCES ${OV_PLUGIN_SOURCES}) else() add_cpplint_target(${OV_PLUGIN_NAME}_cpplint FOR_TARGETS ${OV_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter}) endif() diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake index 039824c34e4..c0a5e2288f5 100644 --- a/cmake/extra_modules.cmake +++ b/cmake/extra_modules.cmake @@ -134,8 +134,8 @@ endif()\n") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # 'argument': conversion from 'size_t' to 'int', possible loss of data - ie_add_compiler_flags(/wd4267) - ie_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4244) endif() # add each extra module diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt index 9ddc278fd57..273f5a4ffae 100644 --- a/docs/snippets/CMakeLists.txt +++ b/docs/snippets/CMakeLists.txt @@ -5,14 +5,14 @@ set(TARGET_NAME ie_docs_snippets) if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wall) + ov_add_compiler_flags(-Wall) endif() if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-unused-variable) + ov_add_compiler_flags(-Wno-unused-variable) endif() if(UNUSED_BUT_SET_VARIABLE_SUPPORTED) - ie_add_compiler_flags(-Wno-unused-but-set-variable) + ov_add_compiler_flags(-Wno-unused-but-set-variable) endif() file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt index 58107f9f6da..1f2eea3bebc 100644 --- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt +++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt @@ -28,6 +28,6 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/in set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) -if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +if(COMMAND ov_add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) + ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) endif() diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 8849aaf47d1..714cc0a3016 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -233,8 +233,8 @@ macro(ie_add_sample) endif() add_dependencies(ie_samples ${IE_SAMPLE_NAME}) - if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) + if(COMMAND ov_add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) + ov_add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) endif() if(COMMAND ov_ncc_naming_style AND NOT c_sample) ov_ncc_naming_style(FOR_TARGET "${IE_SAMPLE_NAME}" diff --git a/samples/cpp/common/format_reader/CMakeLists.txt b/samples/cpp/common/format_reader/CMakeLists.txt index b2af885de82..89732ca039a 100644 --- a/samples/cpp/common/format_reader/CMakeLists.txt +++ b/samples/cpp/common/format_reader/CMakeLists.txt @@ -35,6 +35,6 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/in set_target_properties(${TARGET_NAME} PROPERTIES FOLDER cpp_samples) -if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +if(COMMAND ov_add_clang_format_target) + ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) endif() diff --git a/samples/cpp/common/utils/CMakeLists.txt b/samples/cpp/common/utils/CMakeLists.txt index 77ec7c2d17d..108818b94c0 100644 --- a/samples/cpp/common/utils/CMakeLists.txt +++ b/samples/cpp/common/utils/CMakeLists.txt @@ -17,6 +17,6 @@ find_package(OpenVINO REQUIRED COMPONENTS Runtime) target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime PRIVATE ${GFLAGS_TARGET}) -if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +if(COMMAND ov_add_clang_format_target) + ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 610a208953b..41551270393 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,20 +4,16 @@ add_definitions(-DIN_OV_COMPONENT) +if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) + ov_add_compiler_flags(-Wmissing-declarations) +endif() + include(cmake/install_tbb.cmake) # CC library should be registered before other cc targets add_subdirectory(common) add_subdirectory(core) add_subdirectory(frontends) -# TODO: remove ngraph/ngraph.hpp usage -if(ENABLE_TESTS) - add_subdirectory(core/tests) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wmissing-declarations) -endif() add_subdirectory(plugins) add_subdirectory(inference) @@ -27,5 +23,6 @@ add_subdirectory(common/preprocessing) add_subdirectory(bindings) if(ENABLE_TESTS) + add_subdirectory(core/tests) add_subdirectory(tests) endif() diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt index 063b248a4bc..737dcc3d272 100644 --- a/src/bindings/c/src/CMakeLists.txt +++ b/src/bindings/c/src/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY) endif() -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/bindings/c/tests/CMakeLists.txt b/src/bindings/c/tests/CMakeLists.txt index 2f18cd010cf..072d0e314dd 100644 --- a/src/bindings/c/tests/CMakeLists.txt +++ b/src/bindings/c/tests/CMakeLists.txt @@ -45,7 +45,7 @@ endif() add_dependencies(${TARGET_NAME} mock_engine) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION tests diff --git a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt index a8816b290f3..8fcfa90e662 100644 --- a/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt @@ -19,18 +19,18 @@ set_source_files_properties(${PYX_SOURCES} PROPERTIES CYTHON_IS_CXX ON) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # 'argument': conversion from 'size_t' to 'int', possible loss of data - ie_add_compiler_flags(/wd4267) - ie_add_compiler_flags(/wd4244) - ie_add_compiler_flags(/wd4551) + ov_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4551) endif() if(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-undef) + ov_add_compiler_flags(-Wno-undef) if(OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-parentheses-equality) + ov_add_compiler_flags(-Wno-parentheses-equality) endif() endif() if(UNUSED_BUT_SET_VARIABLE_SUPPORTED) - ie_add_compiler_flags(-Wno-unused-but-set-variable) + ov_add_compiler_flags(-Wno-unused-but-set-variable) endif() # create target @@ -50,7 +50,7 @@ foreach(PYX_FILE IN LISTS PYX_SOURCES) target_include_directories(${PYX_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") target_link_libraries(${PYX_NAME} PRIVATE openvino::runtime) list(APPEND INSTALLED_TARGETS ${PYX_NAME}) - ie_python_minimal_api(${PYX_NAME}) + ov_python_minimal_api(${PYX_NAME}) set_target_properties(${PYX_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) endforeach() @@ -68,7 +68,7 @@ function(python_ov_disable_deprecated_warnings) endfunction() python_ov_disable_deprecated_warnings() -ie_python_minimal_api(${TARGET_NAME}) +ov_python_minimal_api(${TARGET_NAME}) target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) @@ -97,5 +97,5 @@ install(PROGRAMS __init__.py COMPONENT ${PYTHON_COMPONENT} ${OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} - EXCLUDE_PATTERNS ".*\\.cxx;.*\\.pxd;.*\\.pyx") +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} + EXCLUDE_PATTERNS ".*\\.cxx;.*\\.pxd;.*\\.pyx") diff --git a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt index ea17ddc9680..0ca34d0230f 100644 --- a/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt +++ b/src/bindings/python/src/compatibility/pyngraph/CMakeLists.txt @@ -71,8 +71,8 @@ endif() # Install if(OpenVINO_SOURCE_DIR OR OpenVINODeveloperPackage_FOUND) - ie_python_minimal_api(_${PROJECT_NAME}) - add_clang_format_target(_${PROJECT_NAME}_clang FOR_TARGETS _${PROJECT_NAME}) + ov_python_minimal_api(_${PROJECT_NAME}) + ov_add_clang_format_target(_${PROJECT_NAME}_clang FOR_TARGETS _${PROJECT_NAME}) ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} HIDDEN) diff --git a/src/bindings/python/src/pyopenvino/CMakeLists.txt b/src/bindings/python/src/pyopenvino/CMakeLists.txt index 988d3f703be..c3b5ddad465 100644 --- a/src/bindings/python/src/pyopenvino/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/CMakeLists.txt @@ -105,8 +105,8 @@ if(OpenVINO_SOURCE_DIR) endif() if(OpenVINO_SOURCE_DIR OR OpenVINODeveloperPackage_FOUND) - ie_python_minimal_api(${PROJECT_NAME}) - add_clang_format_target(${PROJECT_NAME}_clang FOR_TARGETS ${PROJECT_NAME}) + ov_python_minimal_api(${PROJECT_NAME}) + ov_add_clang_format_target(${PROJECT_NAME}_clang FOR_TARGETS ${PROJECT_NAME}) ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_${pyversion} HIDDEN) diff --git a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt index accf683d23a..4b0c8df9c24 100644 --- a/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt +++ b/src/bindings/python/src/pyopenvino/test_utils/CMakeLists.txt @@ -42,8 +42,8 @@ add_custom_command(TARGET ${TARGET_NAME} COMMAND ${CMAKE_COMMAND} -E copy ${OpenVINOPython_SOURCE_DIR}/src/openvino/test_utils/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py ) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} - EXCLUDE_PATTERNS ".*\\.cxx") +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} + EXCLUDE_PATTERNS ".*\\.cxx") # install diff --git a/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt b/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt index eee094305e5..af638f15f20 100644 --- a/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt +++ b/src/bindings/python/tests/mock/mock_py_frontend/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(${TARGET_NAME} PUBLIC $<$:openvino::frontend::paddle>) ov_add_library_version(${TARGET_NAME}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL diff --git a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt index f5737190744..0eafc5000b6 100644 --- a/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt +++ b/src/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt @@ -12,6 +12,6 @@ pybind11_add_module(${PYBIND_FE_NAME} MODULE NO_EXTRAS ${PYBIND_FE_SRC}) target_link_libraries(${PYBIND_FE_NAME} PRIVATE openvino::frontend::mock_py) -add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME}) +ov_add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME}) install(TARGETS ${PYBIND_FE_NAME} DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 685a5e50051..14eb6515d27 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -68,7 +68,7 @@ ov_set_threading_interface_for(${TARGET_NAME}) ov_mark_target_as_cc(${TARGET_NAME}) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME} EXTRA ${TBB_IMPORTED_TARGETS}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME} EXTRA ${TBB_IMPORTED_TARGETS}) # LTO set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/common/conditional_compilation/CMakeLists.txt b/src/common/conditional_compilation/CMakeLists.txt index af2e1e1724a..af732f35fe6 100644 --- a/src/common/conditional_compilation/CMakeLists.txt +++ b/src/common/conditional_compilation/CMakeLists.txt @@ -53,7 +53,7 @@ endif() ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) file(GLOB_RECURSE hdrs ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) -add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${hdrs}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${hdrs}) openvino_developer_export_targets(COMPONENT openvino_common TARGETS openvino::conditional_compilation) if(ENABLE_TESTS) diff --git a/src/common/itt/CMakeLists.txt b/src/common/itt/CMakeLists.txt index 54be2bda78a..512574fd89b 100644 --- a/src/common/itt/CMakeLists.txt +++ b/src/common/itt/CMakeLists.txt @@ -38,5 +38,5 @@ target_include_directories(${TARGET_NAME} PUBLIC ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) openvino_developer_export_targets(COMPONENT openvino_common TARGETS openvino::itt) diff --git a/src/common/low_precision_transformations/CMakeLists.txt b/src/common/low_precision_transformations/CMakeLists.txt index bacf03ce3b8..54a5bf6da7f 100644 --- a/src/common/low_precision_transformations/CMakeLists.txt +++ b/src/common/low_precision_transformations/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(${TARGET_NAME}_obj OBJECT target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_OPENVINO_API) -ie_faster_build(${TARGET_NAME}_obj UNITY) +ov_build_target_faster(${TARGET_NAME}_obj UNITY) target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt) diff --git a/src/common/low_precision_transformations/src/fake_quantize.cpp b/src/common/low_precision_transformations/src/fake_quantize.cpp index 0be352ce3b2..28e32076181 100644 --- a/src/common/low_precision_transformations/src/fake_quantize.cpp +++ b/src/common/low_precision_transformations/src/fake_quantize.cpp @@ -51,8 +51,9 @@ bool FakeQuantizeTransformation::transform(TransformationContext& context, ov::p } namespace fq { +namespace { -static std::shared_ptr updateShape(std::shared_ptr constantOp, const PartialShape& targetShape) { +std::shared_ptr updateShape(std::shared_ptr constantOp, const PartialShape& targetShape) { assert(constantOp->get_output_partial_shape(0).is_static()); const Shape shape = constantOp->get_output_shape(0); @@ -64,7 +65,7 @@ static std::shared_ptr updateShape(std::shared_ptr constantOp, const return constantOp; } -static std::shared_ptr getDataNode(const std::shared_ptr& eltwise) { +std::shared_ptr getDataNode(const std::shared_ptr& eltwise) { if (!ov::is_type(eltwise->get_input_node_shared_ptr(0))) { return eltwise->get_input_node_shared_ptr(0); } @@ -76,7 +77,7 @@ static std::shared_ptr getDataNode(const std::shared_ptr& eltwise) { return nullptr; } -static std::shared_ptr getConstant(const std::shared_ptr& eltwise) { +std::shared_ptr getConstant(const std::shared_ptr& eltwise) { if (eltwise->get_input_size() != 2) { return nullptr; } @@ -124,6 +125,7 @@ bool all_precisions_equal(const std::shared_ptr& node) { return true; } +} // namespace } // namespace fq bool FakeQuantizeTransformation::checkElementwise(const std::shared_ptr& eltwise) { diff --git a/src/common/low_precision_transformations/src/gather.cpp b/src/common/low_precision_transformations/src/gather.cpp index caacd0b8311..d02146b6471 100644 --- a/src/common/low_precision_transformations/src/gather.cpp +++ b/src/common/low_precision_transformations/src/gather.cpp @@ -21,6 +21,8 @@ namespace ov { namespace pass { namespace low_precision { +namespace { + std::shared_ptr gatherDeqConstant( const std::shared_ptr &gather, const std::shared_ptr &dequantizationConstant) { @@ -81,6 +83,8 @@ std::shared_ptr gatherDeqConstant( return constant; } +} // namespace + GatherTransformation::GatherTransformation(const Params& params) : LayerTransformation(params) { MATCHER_SCOPE(GatherTransformation); auto gather = pattern::wrap_type({ pattern::wrap_type(), diff --git a/src/common/offline_transformations/CMakeLists.txt b/src/common/offline_transformations/CMakeLists.txt index 3bdbc8b2f1a..ccd11c7eb3b 100644 --- a/src/common/offline_transformations/CMakeLists.txt +++ b/src/common/offline_transformations/CMakeLists.txt @@ -30,7 +30,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) # developer package diff --git a/src/common/preprocessing/src/CMakeLists.txt b/src/common/preprocessing/src/CMakeLists.txt index 4b47dbe5eaf..dbc3a06369e 100644 --- a/src/common/preprocessing/src/CMakeLists.txt +++ b/src/common/preprocessing/src/CMakeLists.txt @@ -96,7 +96,7 @@ if(ENABLE_GAPI_PREPROCESSING) add_library(${TARGET_NAME}_obj OBJECT ${LIBRARY_SRC} ${LIBRARY_HEADERS}) - ie_faster_build(${TARGET_NAME}_obj UNITY) + ov_build_target_faster(${TARGET_NAME}_obj UNITY) target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN @@ -166,7 +166,7 @@ if(ENABLE_GAPI_PREPROCESSING) endif() # must be called after all target_link_libraries - ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) + ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) ov_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "OpenVINO Preprocessing plugin") diff --git a/src/common/snippets/CMakeLists.txt b/src/common/snippets/CMakeLists.txt index ceb0374e085..fdc1c838894 100644 --- a/src/common/snippets/CMakeLists.txt +++ b/src/common/snippets/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(${TARGET_NAME} STATIC add_library(openvino::snippets ALIAS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME snippets) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY ) diff --git a/src/common/snippets/tests/CMakeLists.txt b/src/common/snippets/tests/CMakeLists.txt index dd82825fc7b..64e99a3642e 100644 --- a/src/common/snippets/tests/CMakeLists.txt +++ b/src/common/snippets/tests/CMakeLists.txt @@ -22,7 +22,7 @@ addIeTargetTest( # LTO set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/common/transformations/CMakeLists.txt b/src/common/transformations/CMakeLists.txt index 589bb0c7584..164daec54c2 100644 --- a/src/common/transformations/CMakeLists.txt +++ b/src/common/transformations/CMakeLists.txt @@ -20,7 +20,7 @@ source_group("include" FILES ${PUBLIC_HEADERS}) add_library(${TARGET_NAME}_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS}) target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_OPENVINO_API) -ie_faster_build(${TARGET_NAME}_obj +ov_build_target_faster(${TARGET_NAME}_obj UNITY PCH PRIVATE "src/precomp.hpp" ) @@ -30,7 +30,7 @@ target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::reference openvino::i target_include_directories(${TARGET_NAME}_obj PRIVATE $ "${CMAKE_CURRENT_SOURCE_DIR}/src") -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}_obj) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}_obj) ov_mark_target_as_cc(${TARGET_NAME}_obj) diff --git a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp index abf43343613..18f03bd99e1 100644 --- a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp @@ -278,6 +278,8 @@ bool ov::batch_util::detach_detection_output(const std::shared_ptr& f return !new_outputs.empty() || !outputs_to_delete.empty(); } +namespace { + std::map, ov::PartialShape> collect_original_input_shapes( const std::shared_ptr& m) { const auto& parameters = m->get_parameters(); @@ -291,6 +293,8 @@ std::map, ov::PartialShape> collect_origi return parameter_to_shape; } +} // namespace + bool ov::pass::FindBatch::run_on_model(const std::shared_ptr& m) { RUN_ON_MODEL_SCOPE(FindBatch); auto te = std::make_shared(); diff --git a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp index 3f9b62f75f6..020470e5a2d 100644 --- a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp @@ -64,7 +64,7 @@ ov::pass::EliminateUnsqueezeGather::EliminateUnsqueezeGather() { register_matcher(m, callback); } -bool scalar_with_one_consumer(const Output& out) { +inline bool scalar_with_one_consumer(const Output& out) { return rank_equals(0)(out) && consumers_count(1)(out); } diff --git a/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp b/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp index 2bd46f3cccd..7abffbd7b24 100644 --- a/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp @@ -264,6 +264,8 @@ bool ov::pass::GroupedStridedSliceOptimizer::run_on_model(const std::shared_ptr< return graph_rewritten; } +namespace { + struct SliceAttrs { int64_t start, stop, axis; }; @@ -318,6 +320,8 @@ bool slice_is_suitable_for_optimization(const std::shared_ptr return true; } +} // namespace + bool ov::pass::GroupedSliceToVSplitOptimization::run_on_model(const std::shared_ptr& model) { RUN_ON_FUNCTION_SCOPE(GroupedSliceToVSplitOptimization); bool graph_rewritten = false; diff --git a/src/common/transformations/src/transformations/convert_precision.cpp b/src/common/transformations/src/transformations/convert_precision.cpp index 29ef79c3124..d9d506bbd06 100644 --- a/src/common/transformations/src/transformations/convert_precision.cpp +++ b/src/common/transformations/src/transformations/convert_precision.cpp @@ -689,6 +689,8 @@ bool fuse_type_to_nms9(const std::shared_ptr& node, const precisions_m return res; } +namespace { + bool update_type(size_t idx, const std::shared_ptr& node, const precisions_map& precisions, @@ -704,6 +706,8 @@ bool update_type(size_t idx, return false; } +} // namespace + bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const precisions_map& precisions) { auto nms = ov::as_type_ptr(node); if (!nms) { diff --git a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp index 30f03222c48..ff873eba035 100644 --- a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp +++ b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp @@ -52,6 +52,8 @@ using namespace std; namespace ov { namespace pass { +namespace { + void mark_reduceop_path(const std::shared_ptr& node) { node->get_rt_info().emplace("reduceop_path", true); } @@ -77,7 +79,7 @@ void erase_fq_path(const std::shared_ptr& node) { } // Marking continues to propagate through these ops. -std::shared_ptr propagate_through_ops = +const std::shared_ptr propagate_through_ops = pattern::wrap_type propagate_through_ops = ov::op::v0::Constant, ov::op::v0::Tile>(); +} // namespace + /* After PropagateDownMark we need to go also once up to include side branches of ops with several args: * Elementwise, Concat and so. E.g. if one of the argument of Concat was marked * during PropagateDownMark we need also mark its other inputs and this is done in this PropagateUpMark pass. @@ -367,30 +371,30 @@ public: MATCHER_SCOPE(PropagateDownDisableSensitivityForQuantized); // through this nodes - std::shared_ptr quantization_propagating_nodes = pattern::wrap_type(); + const std::shared_ptr quantization_propagating_nodes = pattern::wrap_type(); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& node = m.get_match_root(); diff --git a/src/common/transformations/src/transformations/op_conversions/eye_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/eye_decomposition.cpp index 9dc6bc9dccf..9011dd47ca5 100644 --- a/src/common/transformations/src/transformations/op_conversions/eye_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/eye_decomposition.cpp @@ -27,6 +27,8 @@ namespace ov { namespace pass { +namespace { + /** \brief Check if output is rank one and data type can be i32 or i64. */ const auto is_rank_one_int_shape = [](const Output& output) -> bool { return pattern::type_matches_any({element::i32, element::i64})(output) && pattern::has_static_shape()(output) && @@ -109,6 +111,8 @@ std::shared_ptr make_eye_batches(NodeRegistry& reg, const Output& ey return reg.make(eye, batch_repeats); } +} // namespace + EyeDecomposition::EyeDecomposition() { MATCHER_SCOPE(EyeDecomposition); diff --git a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp index d539f52beb7..0a2340d4620 100644 --- a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp @@ -22,6 +22,8 @@ using namespace std; +namespace { + ov::Input get_outer_input_of_ti_by_parameter(const shared_ptr& parameter, const shared_ptr& ti) { int64_t parameter_index = ti->get_body()->get_parameter_index(parameter); @@ -154,6 +156,8 @@ bool relax_batch_for_initial_states_of_lstm(const shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(LSTMStatesBroadcast); bool rewritten = false; diff --git a/src/common/transformations/src/transformations/transpose_sinking/ts_utils.cpp b/src/common/transformations/src/transformations/transpose_sinking/ts_utils.cpp index 522882e162e..177267581eb 100644 --- a/src/common/transformations/src/transformations/transpose_sinking/ts_utils.cpp +++ b/src/common/transformations/src/transformations/transpose_sinking/ts_utils.cpp @@ -175,6 +175,9 @@ ov::Output FixInputNodeRank(ov::Output input_node, } // namespace namespace sink_forward { + +namespace { + AxisVector AlignTransposeOrder(const Output& output, const TransposeInputsInfo& transpose_input_info) { if (transpose_input_info.isEmpty()) { return {}; @@ -197,6 +200,8 @@ AxisVector AlignTransposeOrder(const Output& output, const TransposeInputs return new_transpose_order; } +} // namespace + bool UpdateInputTransposes(const NodePtr& main_node, const TransposeInputsInfo& transpose_input_info, std::vector input_indexes) { diff --git a/src/common/transformations/tests/CMakeLists.txt b/src/common/transformations/tests/CMakeLists.txt index 15716e83b72..b66bcd9314c 100644 --- a/src/common/transformations/tests/CMakeLists.txt +++ b/src/common/transformations/tests/CMakeLists.txt @@ -4,6 +4,10 @@ set(TARGET_NAME ov_transformations_tests) +if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) + ov_add_compiler_flags(-Wno-missing-declarations) +endif() + ov_add_test_target( NAME ${TARGET_NAME} ROOT ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/common/util/CMakeLists.txt b/src/common/util/CMakeLists.txt index 0ba88a74717..faaab5c26d2 100644 --- a/src/common/util/CMakeLists.txt +++ b/src/common/util/CMakeLists.txt @@ -46,7 +46,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} SOURCE_DIRECTORIES ${UTIL_INCLUDE_DIR}) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 024581b1d10..4d8545a5a21 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -9,10 +9,6 @@ add_definitions(-DIN_OV_CORE_LIBRARY) set(OV_CORE_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include) -if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wmissing-declarations) -endif() - file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) @@ -80,7 +76,7 @@ endif() target_compile_definitions(ngraph_obj PRIVATE IMPLEMENT_OPENVINO_API) -ie_faster_build(ngraph_obj +ov_build_target_faster(ngraph_obj UNITY PCH PRIVATE "src/precomp.hpp") @@ -97,7 +93,7 @@ ov_abi_free_target(ngraph_obj) ov_ncc_naming_style(FOR_TARGET ngraph_obj SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include") -add_clang_format_target(ngraph_clang FOR_TARGETS ngraph_obj) +ov_add_clang_format_target(ngraph_clang FOR_TARGETS ngraph_obj) if(NOT BUILD_SHARED_LIBS) target_compile_definitions(ngraph_obj PUBLIC OPENVINO_STATIC_LIBRARY) diff --git a/src/core/builder/CMakeLists.txt b/src/core/builder/CMakeLists.txt index 144bceb5878..64ce45a4870 100644 --- a/src/core/builder/CMakeLists.txt +++ b/src/core/builder/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(openvino::builders ALIAS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME builders) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp") @@ -33,7 +33,7 @@ if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY) endif() -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_install_static_lib(openvino_builders ${OV_CPACK_COMP_CORE}) diff --git a/src/core/reference/CMakeLists.txt b/src/core/reference/CMakeLists.txt index 3e42d75747c..dbd126d84a4 100644 --- a/src/core/reference/CMakeLists.txt +++ b/src/core/reference/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS}) add_library(openvino::reference ALIAS ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME reference) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp") @@ -43,7 +43,7 @@ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE find_package(Threads REQUIRED) target_link_libraries(${TARGET_NAME} PRIVATE Threads::Threads) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) diff --git a/src/core/shape_inference/CMakeLists.txt b/src/core/shape_inference/CMakeLists.txt index d2c66a21a60..611d118dd31 100644 --- a/src/core/shape_inference/CMakeLists.txt +++ b/src/core/shape_inference/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(${TARGET_NAME} PUBLIC $ $) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY) diff --git a/src/core/template_extension/CMakeLists.txt b/src/core/template_extension/CMakeLists.txt index d2f01488d04..6d759918ded 100644 --- a/src/core/template_extension/CMakeLists.txt +++ b/src/core/template_extension/CMakeLists.txt @@ -8,4 +8,4 @@ add_subdirectory(new) # Enable code style check file(GLOB_RECURSE template_extension_src "${CMAKE_CURRENT_SOURCE_DIR}/new/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/new/*.hpp") -add_clang_format_target(openvino_template_extension_clang FOR_SOURCES ${template_extension_src}) +ov_add_clang_format_target(openvino_template_extension_clang FOR_SOURCES ${template_extension_src}) diff --git a/src/core/template_extension/old/CMakeLists.txt b/src/core/template_extension/old/CMakeLists.txt index f43d1b75778..e93b371f7b7 100644 --- a/src/core/template_extension/old/CMakeLists.txt +++ b/src/core/template_extension/old/CMakeLists.txt @@ -37,7 +37,7 @@ endif() # Enable code style check file(GLOB_RECURSE template_extension_src "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp") -add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${template_extension_src}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${template_extension_src}) install(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) + LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/src/core/tests/any.cpp b/src/core/tests/any.cpp index f164347ce13..8cd84407859 100644 --- a/src/core/tests/any.cpp +++ b/src/core/tests/any.cpp @@ -497,6 +497,7 @@ TEST_F(AnyTests, AnyRemovedRealObjectPointerWithDuplication) { ASSERT_EQ(1, DestructorTest::destructorCount); } +void PrintTo(const Any& object, std::ostream* stream); void PrintTo(const Any& object, std::ostream* stream) { if (object.empty() || !stream) { return; diff --git a/src/core/tests/control_dependencies.cpp b/src/core/tests/control_dependencies.cpp index ba7d5ae8b3c..03d22a1619f 100644 --- a/src/core/tests/control_dependencies.cpp +++ b/src/core/tests/control_dependencies.cpp @@ -50,7 +50,8 @@ public: } }; -::testing::AssertionResult test_ordered_ops(const std::shared_ptr& m, const ov::NodeVector& required_ops) { +static ::testing::AssertionResult test_ordered_ops(const std::shared_ptr& m, + const ov::NodeVector& required_ops) { std::unordered_set seen; for (auto& node_ptr : m->get_ordered_ops()) { ov::Node* node = node_ptr.get(); diff --git a/src/core/tests/frontend/CMakeLists.txt b/src/core/tests/frontend/CMakeLists.txt index 4b5e317680a..8f6d2a17b40 100644 --- a/src/core/tests/frontend/CMakeLists.txt +++ b/src/core/tests/frontend/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(${MOCK1_FE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(${MOCK1_FE_NAME} PRIVATE frontend_common) add_dependencies(ov_core_unit_tests ${MOCK1_FE_NAME}) -add_clang_format_target(${MOCK1_FE_NAME}_clang FOR_TARGETS ${MOCK1_FE_NAME}) +ov_add_clang_format_target(${MOCK1_FE_NAME}_clang FOR_TARGETS ${MOCK1_FE_NAME}) install(TARGETS ${MOCK1_FE_NAME} RUNTIME DESTINATION tests COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index ed9f74388b4..39f97f51a8a 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -63,14 +63,14 @@ public: Anchor() : GraphRewrite() {} }; -std::shared_ptr get_model() { +inline std::shared_ptr get_model() { auto data = std::make_shared(ov::element::f32, ov::Shape{3, 1, 2}); auto divide_constant = ov::op::v0::Constant::create(ov::element::f32, ov::Shape{1}, {1.5}); auto divide = std::make_shared(data, divide_constant); return std::make_shared(ov::NodeVector{divide}, ov::ParameterVector{data}); } -ov::pass::param_callback get_callback() { +inline ov::pass::param_callback get_callback() { return [](const std::shared_ptr& node) -> bool { if (std::dynamic_pointer_cast(node)) { return true; @@ -169,7 +169,7 @@ public: using ov::op::v1::Divide::Divide; }; -std::shared_ptr get_derived_model() { +static std::shared_ptr get_derived_model() { auto data = std::make_shared(ov::element::f32, ov::Shape{3, 1, 2}); auto divide_constant = ov::op::v0::Constant::create(ov::element::f32, ov::Shape{1}, {1.5}); auto divide = std::make_shared(data, divide_constant); diff --git a/src/core/tests/pass/constant_folding.cpp b/src/core/tests/pass/constant_folding.cpp index 848d57f26bf..672f272d794 100644 --- a/src/core/tests/pass/constant_folding.cpp +++ b/src/core/tests/pass/constant_folding.cpp @@ -18,12 +18,14 @@ using namespace ov; using namespace std; -static std::shared_ptr get_result_constant(std::shared_ptr m, size_t pos = 0) { +namespace { + +std::shared_ptr get_result_constant(std::shared_ptr m, size_t pos = 0) { return ov::as_type_ptr(m->get_results().at(pos)->input_value(0).get_node_shared_ptr()); } template -static std::vector get_result_constant_data(std::shared_ptr m, size_t pos) { +std::vector get_result_constant_data(std::shared_ptr m, size_t pos) { auto new_const = get_result_constant(m, pos); return new_const->cast_vector(); } @@ -62,10 +64,10 @@ void run_constant_folding(std::shared_ptr& model) { pass_manager.run_passes(model); } -static void check_names(const std::shared_ptr& node, - const std::vector& expected_fused_names, - const std::string expected_name = "test", - bool exact = true) { +void check_names(const std::shared_ptr& node, + const std::vector& expected_fused_names, + const std::string expected_name = "test", + bool exact = true) { EXPECT_TRUE(node); // Check node name @@ -102,6 +104,8 @@ static void check_names(const std::shared_ptr& node, } } +} // namespace + TEST(constant_folding, acosh) { Shape shape_in{2, 4, 1}; @@ -848,7 +852,7 @@ TEST(constant_folding, shape_of_rank_dynamic_v3) { check_names(result_shape_of, {"test"}); } -void const_reverse(const element::Type& axes_elem_type) { +static void const_reverse(const element::Type& axes_elem_type) { Shape input_shape{3, 3}; vector values_in{1, 2, 3, 4, 5, 6, 7, 8, 9}; @@ -3559,11 +3563,11 @@ TEST(constant_folding, constant_scatter_elements_update_one_elem) { range_test_check(result_node->cast_vector(), expected); } -void test_constant_folding_reshape_v1(Shape& shape_in, - vector& values_in, - Shape shape_shape, - vector values_shape, - bool zero_flag = false) { +static void test_constant_folding_reshape_v1(Shape& shape_in, + vector& values_in, + Shape shape_shape, + vector values_shape, + bool zero_flag = false) { auto constant_in = make_shared(element::f32, shape_in, values_in); constant_in->set_friendly_name("constant_in"); auto constant_shape = make_shared(element::i64, shape_shape, values_shape); @@ -3584,6 +3588,7 @@ void test_constant_folding_reshape_v1(Shape& shape_in, ASSERT_TRUE(ov::test::utils::all_close_f(values_in, values_out, MIN_FLOAT_TOLERANCE_BITS)); } + TEST(constant_folding, constant_dyn_reshape_v1_2d) { Shape shape_in{2, 5}; vector values_in{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; diff --git a/src/core/tests/pass_config.cpp b/src/core/tests/pass_config.cpp index 9d39d029d9f..9b495e67c11 100644 --- a/src/core/tests/pass_config.cpp +++ b/src/core/tests/pass_config.cpp @@ -73,7 +73,7 @@ public: } }; -std::tuple, std::shared_ptr, std::shared_ptr> get_test_function() { +static std::tuple, std::shared_ptr, std::shared_ptr> get_test_function() { auto data = std::make_shared(ov::element::f32, ov::Shape{3, 1, 2}); auto relu = std::make_shared(data); relu->set_friendly_name("relu"); diff --git a/src/core/tests/pass_manager.cpp b/src/core/tests/pass_manager.cpp index 14c3222c897..c1c53ec52a3 100644 --- a/src/core/tests/pass_manager.cpp +++ b/src/core/tests/pass_manager.cpp @@ -22,6 +22,8 @@ using namespace ov; using namespace std; +namespace { + std::shared_ptr make_test_graph() { auto arg_0 = std::make_shared(ov::element::f32, ov::Shape{2, 2}); auto arg_1 = std::make_shared(ov::element::f32, ov::Shape{2, 2}); @@ -73,6 +75,8 @@ bool validate_list(const std::vector>& nodes) { return rc; } +} // namespace + TEST(pass_manager, add) { pass::Manager pass_manager; diff --git a/src/core/tests/threading.cpp b/src/core/tests/threading.cpp index a43e252ff74..fdd50df25fc 100644 --- a/src/core/tests/threading.cpp +++ b/src/core/tests/threading.cpp @@ -20,7 +20,7 @@ using namespace ov; using namespace std; -std::shared_ptr create_complex_function(size_t wide = 50) { +static std::shared_ptr create_complex_function(size_t wide = 50) { const auto& split_subgraph = [](const ov::Output& input) -> ov::OutputVector { auto relu = std::make_shared(input); auto type_relaxed = diff --git a/src/core/tests/type_prop/augru_sequence.cpp b/src/core/tests/type_prop/augru_sequence.cpp index fe3ef4ba3ed..9c6c9bec2da 100644 --- a/src/core/tests/type_prop/augru_sequence.cpp +++ b/src/core/tests/type_prop/augru_sequence.cpp @@ -25,7 +25,7 @@ struct augru_sequence_parameters { element::Type et = element::f32; }; -shared_ptr augru_seq_init(const augru_sequence_parameters& params) { +static shared_ptr augru_seq_init(const augru_sequence_parameters& params) { auto batch_size = params.batch_size; auto seq_length = params.seq_length; auto input_size = params.input_size; diff --git a/src/core/tests/type_prop/binary_elementwise.cpp b/src/core/tests/type_prop/binary_elementwise.cpp index cd66d736a1a..6e57be0bf24 100644 --- a/src/core/tests/type_prop/binary_elementwise.cpp +++ b/src/core/tests/type_prop/binary_elementwise.cpp @@ -31,8 +31,8 @@ using namespace testing; // // Tests for binary elementwise ops. // -void test_binary(std::string /* node_type */, - shared_ptr(f)(const shared_ptr& x, const shared_ptr& y)) { +static void test_binary(std::string /* node_type */, + shared_ptr(f)(const shared_ptr& x, const shared_ptr& y)) { // Check for bad arguments auto tv0_2_4_param_0 = make_shared(ov::element::f32, ov::Shape{2, 4}); auto tv0_2_4_param_1 = make_shared(ov::element::f32, ov::Shape{2, 4}); diff --git a/src/core/tests/type_prop/detection_output.cpp b/src/core/tests/type_prop/detection_output.cpp index ea73870dfdc..786747b56c2 100644 --- a/src/core/tests/type_prop/detection_output.cpp +++ b/src/core/tests/type_prop/detection_output.cpp @@ -18,15 +18,16 @@ using namespace ov; using namespace testing; // ------------------------------ V0 ------------------------------ -std::shared_ptr create_detection_output(PartialShape box_logits_shape, - PartialShape class_preds_shape, - PartialShape proposals_shape, - PartialShape aux_class_preds_shape, - PartialShape aux_box_preds_shape, - const ov::op::v0::DetectionOutput::Attributes& attrs, - element::Type input_type, - element::Type proposals_type, - bool set_labels = false) { +static std::shared_ptr create_detection_output( + PartialShape box_logits_shape, + PartialShape class_preds_shape, + PartialShape proposals_shape, + PartialShape aux_class_preds_shape, + PartialShape aux_box_preds_shape, + const ov::op::v0::DetectionOutput::Attributes& attrs, + element::Type input_type, + element::Type proposals_type, + bool set_labels = false) { if (set_labels) { // The labels are set for all of the shapes, // but the output dimension is always a product of multiplication, so labels are not preserved @@ -325,12 +326,12 @@ TEST(type_prop_layers, detection_output_v0_dynamic_batch) { EXPECT_EQ(op->get_element_type(), element::f32); } -void detection_output_invalid_data_type_test(element::Type box_logits_et, - element::Type class_preds_et, - element::Type proposals_et, - element::Type aux_class_preds_et, - element::Type aux_box_preds_et, - const std::string& expected_msg) { +static void detection_output_invalid_data_type_test(element::Type box_logits_et, + element::Type class_preds_et, + element::Type proposals_et, + element::Type aux_class_preds_et, + element::Type aux_box_preds_et, + const std::string& expected_msg) { try { auto box_logits = make_shared(box_logits_et, Shape{4, 20}); auto class_preds = make_shared(class_preds_et, Shape{4, 10}); diff --git a/src/core/tests/type_prop/gru_sequence.cpp b/src/core/tests/type_prop/gru_sequence.cpp index 1571183c1e3..8e133c4a71e 100644 --- a/src/core/tests/type_prop/gru_sequence.cpp +++ b/src/core/tests/type_prop/gru_sequence.cpp @@ -13,6 +13,8 @@ using namespace std; using namespace ov; +namespace { + struct gru_sequence_parameters { Dimension batch_size = 8; Dimension num_directions = 1; @@ -80,6 +82,8 @@ shared_ptr gru_seq_direction_initialization(const gru_s return gru_sequence; } +} // namespace + TEST(type_prop, gru_sequence_forward) { const size_t batch_size = 8; const size_t num_directions = 1; diff --git a/src/core/tests/type_prop/lstm_sequence.cpp b/src/core/tests/type_prop/lstm_sequence.cpp index 4b86a4024ce..31907b5fd45 100644 --- a/src/core/tests/type_prop/lstm_sequence.cpp +++ b/src/core/tests/type_prop/lstm_sequence.cpp @@ -9,6 +9,8 @@ using namespace std; using namespace ov; +namespace { + // // RNN sequence parameters // @@ -121,6 +123,8 @@ shared_ptr lstm_seq_v0_tensor_initialization(const recurre return lstm_sequence; } +} // namespace + TEST(type_prop, lstm_sequence_forward) { const size_t batch_size = 8; const size_t num_directions = 1; diff --git a/src/frontends/common/CMakeLists.txt b/src/frontends/common/CMakeLists.txt index 11ec9827631..1cb86907921 100644 --- a/src/frontends/common/CMakeLists.txt +++ b/src/frontends/common/CMakeLists.txt @@ -4,10 +4,6 @@ set(TARGET_NAME "frontend_common") -if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wmissing-declarations) -endif() - file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp) file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp) @@ -54,7 +50,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE FRONTEND_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}${FRONTEND_NAME_PREFIX}" FRONTEND_LIB_SUFFIX="${FRONTEND_LIB_SUFFIX}") -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}_obj) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}_obj) # FEM is public API => need to mark this library as important for ABI free ov_abi_free_target(${TARGET_NAME}_obj) diff --git a/src/frontends/common/include/openvino/frontend/extension/conversion.hpp b/src/frontends/common/include/openvino/frontend/extension/conversion.hpp index 8619012d8f3..fb3ca3c201a 100644 --- a/src/frontends/common/include/openvino/frontend/extension/conversion.hpp +++ b/src/frontends/common/include/openvino/frontend/extension/conversion.hpp @@ -20,7 +20,7 @@ public: return m_op_type; } - virtual ~ConversionExtensionBase(); + ~ConversionExtensionBase() override = default; private: std::string m_op_type; diff --git a/src/frontends/common/src/extension/conversion.cpp b/src/frontends/common/src/extension/conversion.cpp index 0c176e64ccc..81c3a5ceb75 100644 --- a/src/frontends/common/src/extension/conversion.cpp +++ b/src/frontends/common/src/extension/conversion.cpp @@ -5,6 +5,5 @@ #include "openvino/frontend/extension/conversion.hpp" using namespace ov::frontend; -ConversionExtensionBase::~ConversionExtensionBase() = default; ConversionExtension::~ConversionExtension() = default; diff --git a/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp b/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp index 0fe8597f6f1..4e2377947f3 100644 --- a/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp +++ b/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp @@ -7,9 +7,9 @@ #include #include -#include "legacy_conversion_extension.hpp" #include "ngraph/function.hpp" #include "openvino/frontend/extension/holder.hpp" +#include "utils/legacy_conversion_extension.hpp" #include "utils/tensor_external_data.hpp" namespace ONNX_NAMESPACE { 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 2961da9763a..53e83e5d714 100644 --- a/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp +++ b/src/frontends/onnx/frontend/src/utils/tensor_external_data.cpp @@ -19,9 +19,7 @@ namespace detail { TensorExternalData::TensorExternalData(const ONNX_NAMESPACE::TensorProto& tensor) { for (const auto& entry : tensor.external_data()) { if (entry.key() == "location") { - NGRAPH_SUPPRESS_DEPRECATED_START - m_data_location = file_util::sanitize_path(entry.value()); - NGRAPH_SUPPRESS_DEPRECATED_END + m_data_location = ov::util::sanitize_path(entry.value()); } else if (entry.key() == "offset") { m_offset = std::stoull(entry.value()); } else if (entry.key() == "length") { @@ -37,9 +35,7 @@ TensorExternalData::TensorExternalData(const ONNX_NAMESPACE::TensorProto& tensor Buffer TensorExternalData::load_external_mmap_data(const std::string& model_dir, MappedMemoryHandles cache) const { - NGRAPH_SUPPRESS_DEPRECATED_START - auto full_path = file_util::path_join(model_dir, m_data_location); - NGRAPH_SUPPRESS_DEPRECATED_END + auto full_path = ov::util::path_join({model_dir, m_data_location}); const int64_t file_size = ov::util::file_size(full_path); if (file_size <= 0 || m_offset + m_data_length > static_cast(file_size)) { throw error::invalid_external_data{*this}; @@ -62,17 +58,16 @@ Buffer TensorExternalData::load_external_mmap_data(const std:: } Buffer TensorExternalData::load_external_data(const std::string& model_dir) const { - NGRAPH_SUPPRESS_DEPRECATED_START - - auto full_path = file_util::path_join(model_dir, m_data_location); + 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); + 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); #else std::ifstream external_data_stream(full_path, std::ios::binary | std::ios::in | std::ios::ate); #endif - NGRAPH_SUPPRESS_DEPRECATED_END if (external_data_stream.fail()) { throw error::invalid_external_data{*this}; diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt index 682f53439e1..7e27aab9f02 100644 --- a/src/frontends/onnx/onnx_common/CMakeLists.txt +++ b/src/frontends/onnx/onnx_common/CMakeLists.txt @@ -30,8 +30,8 @@ target_include_directories(${TARGET_NAME} target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime) -link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx) +ov_link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) diff --git a/src/frontends/onnx/tests/CMakeLists.txt b/src/frontends/onnx/tests/CMakeLists.txt index dcd8577b536..5337060c290 100644 --- a/src/frontends/onnx/tests/CMakeLists.txt +++ b/src/frontends/onnx/tests/CMakeLists.txt @@ -100,7 +100,7 @@ foreach(src IN LISTS SRC MULTI_TEST_SRC) list(APPEND full_src_names "${CMAKE_CURRENT_SOURCE_DIR}/${src}") endif() endforeach() -add_clang_format_target(ov_onnx_frontend_tests_clang FOR_SOURCES ${full_src_names}) +ov_add_clang_format_target(ov_onnx_frontend_tests_clang FOR_SOURCES ${full_src_names}) foreach(BACKEND_NAME ${ACTIVE_BACKEND_LIST}) string(TOLOWER ${BACKEND_NAME} BACKEND_DIR) diff --git a/src/frontends/onnx/tests/standalone_build/CMakeLists.txt b/src/frontends/onnx/tests/standalone_build/CMakeLists.txt index 127c2a9728e..8e9aa15a5c4 100644 --- a/src/frontends/onnx/tests/standalone_build/CMakeLists.txt +++ b/src/frontends/onnx/tests/standalone_build/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright (C) 2018-2023 Intel Corporation # SPDX-License-Identifier: Apache-2.0 # + set(TARGET_NAME "onnx_fe_standalone_build_test") add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) @@ -10,4 +11,4 @@ add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) target_link_libraries(${TARGET_NAME} PUBLIC openvino::frontend::onnx) # Enable code style check -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/onnx/tests/standalone_build/standalone_build_test.cpp b/src/frontends/onnx/tests/standalone_build/standalone_build_test.cpp index 02318feb75f..091cf43a736 100644 --- a/src/frontends/onnx/tests/standalone_build/standalone_build_test.cpp +++ b/src/frontends/onnx/tests/standalone_build/standalone_build_test.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include "openvino/frontend/onnx/frontend.hpp" -void test_load() { +inline void test_load() { ov::frontend::onnx::FrontEnd fe; fe.get_name(); } diff --git a/src/frontends/paddle/tests/standalone_build/CMakeLists.txt b/src/frontends/paddle/tests/standalone_build/CMakeLists.txt index 4bc372bc44f..7df2d3a9e83 100644 --- a/src/frontends/paddle/tests/standalone_build/CMakeLists.txt +++ b/src/frontends/paddle/tests/standalone_build/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) target_link_libraries(${TARGET_NAME} PUBLIC openvino::frontend::paddle) # Enable code style check -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/paddle/tests/standalone_build/standalone_build_test.cpp b/src/frontends/paddle/tests/standalone_build/standalone_build_test.cpp index 1851c629ec1..ee76a881c16 100644 --- a/src/frontends/paddle/tests/standalone_build/standalone_build_test.cpp +++ b/src/frontends/paddle/tests/standalone_build/standalone_build_test.cpp @@ -4,7 +4,7 @@ #include -void test_load() { +inline void test_load() { ov::frontend::paddle::FrontEnd fe; fe.get_name(); } diff --git a/src/frontends/tensorflow/tests/standalone_build/CMakeLists.txt b/src/frontends/tensorflow/tests/standalone_build/CMakeLists.txt index fbf9e731583..17fce28440e 100644 --- a/src/frontends/tensorflow/tests/standalone_build/CMakeLists.txt +++ b/src/frontends/tensorflow/tests/standalone_build/CMakeLists.txt @@ -10,4 +10,4 @@ add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) target_link_libraries(${TARGET_NAME} PUBLIC openvino_tensorflow_frontend) # Enable code style check -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/tensorflow/tests/standalone_build/standalone_build_test.cpp b/src/frontends/tensorflow/tests/standalone_build/standalone_build_test.cpp index a71bfbe6c56..9f0426db2fa 100644 --- a/src/frontends/tensorflow/tests/standalone_build/standalone_build_test.cpp +++ b/src/frontends/tensorflow/tests/standalone_build/standalone_build_test.cpp @@ -4,7 +4,7 @@ #include -void test_load() { +inline void test_load() { ov::frontend::tensorflow::FrontEnd fe; fe.get_name(); } diff --git a/src/frontends/tensorflow_common/src/CMakeLists.txt b/src/frontends/tensorflow_common/src/CMakeLists.txt index bc543ca11ee..1f0126bf138 100644 --- a/src/frontends/tensorflow_common/src/CMakeLists.txt +++ b/src/frontends/tensorflow_common/src/CMakeLists.txt @@ -15,6 +15,11 @@ if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME} PRIVATE OPENVINO_STATIC_LIBRARY) endif() +# remove -Wmissing-declarations warning, because of frontends implementation specific +if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) + target_compile_options(${TARGET_NAME} PRIVATE -Wno-missing-declarations) +endif() + set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) @@ -25,7 +30,7 @@ target_include_directories(${TARGET_NAME} PUBLIC $ PRIVATE ${root_dir}/src) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_install_static_lib(${TARGET_NAME} ${OV_CPACK_COMP_CORE}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} diff --git a/src/frontends/tensorflow_lite/tests/standalone_build/CMakeLists.txt b/src/frontends/tensorflow_lite/tests/standalone_build/CMakeLists.txt index e65ed73bcc0..419c02e9c8f 100644 --- a/src/frontends/tensorflow_lite/tests/standalone_build/CMakeLists.txt +++ b/src/frontends/tensorflow_lite/tests/standalone_build/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright (C) 2018-2023 Intel Corporation # SPDX-License-Identifier: Apache-2.0 # + set(TARGET_NAME "tensorflow_lite_fe_standalone_build_test") add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) @@ -10,4 +11,4 @@ add_library(${TARGET_NAME} STATIC standalone_build_test.cpp) target_link_libraries(${TARGET_NAME} PUBLIC openvino_tensorflow_lite_frontend) # Enable code style check -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/tensorflow_lite/tests/standalone_build/standalone_build_test.cpp b/src/frontends/tensorflow_lite/tests/standalone_build/standalone_build_test.cpp index 2c75df2476b..ad1693a2b04 100644 --- a/src/frontends/tensorflow_lite/tests/standalone_build/standalone_build_test.cpp +++ b/src/frontends/tensorflow_lite/tests/standalone_build/standalone_build_test.cpp @@ -4,7 +4,7 @@ #include -void test_load() { +inline void test_load() { ov::frontend::tensorflow_lite::FrontEnd fe; fe.get_name(); } \ No newline at end of file diff --git a/src/frontends/tests/frontend/shared/CMakeLists.txt b/src/frontends/tests/frontend/shared/CMakeLists.txt index 42b212a6af3..f99a3d82e9f 100644 --- a/src/frontends/tests/frontend/shared/CMakeLists.txt +++ b/src/frontends/tests/frontend/shared/CMakeLists.txt @@ -30,4 +30,4 @@ target_compile_definitions(${TARGET_NAME} SHARED_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}" SHARED_LIB_SUFFIX="${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}") -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) diff --git a/src/frontends/tests/frontend/shared/test_builtin_extensions/CMakeLists.txt b/src/frontends/tests/frontend/shared/test_builtin_extensions/CMakeLists.txt index 231ecfc5836..959834bbe0d 100644 --- a/src/frontends/tests/frontend/shared/test_builtin_extensions/CMakeLists.txt +++ b/src/frontends/tests/frontend/shared/test_builtin_extensions/CMakeLists.txt @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} MODULE ${LIBRARY_SRC} ${LIBRARY_HEADERS}) target_compile_definitions(${TARGET_NAME} PRIVATE ${DEFINITIONS}) target_link_libraries(${TARGET_NAME} PRIVATE ${DEPENDENCIES}) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/src/frontends/tests/frontend/shared/test_builtin_extensions/builtin_extensions.cpp b/src/frontends/tests/frontend/shared/test_builtin_extensions/builtin_extensions.cpp index a397af1345e..511e60a3e3c 100644 --- a/src/frontends/tests/frontend/shared/test_builtin_extensions/builtin_extensions.cpp +++ b/src/frontends/tests/frontend/shared/test_builtin_extensions/builtin_extensions.cpp @@ -45,6 +45,8 @@ # define TF_LITE_EXT #endif +namespace { + ov::OutputVector CustomTranslatorCommon_1(const ov::frontend::NodeContext& node) { return ov::OutputVector(); } @@ -80,6 +82,8 @@ std::map Relu6ToReluTranslatorPaddle(const ov::fr return ret; } +} // namespace + class CustomElu : public ov::op::Op { public: OPENVINO_OP("CustomElu"); diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 0234bbb51c3..99f3670e4fa 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -6,7 +6,7 @@ set (TARGET_NAME "inference_engine") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # TODO: Add IMPLEMENT_OPENVINO_API to inference_engine_obj - ie_add_compiler_flags(/wd4273) + ov_add_compiler_flags(/wd4273) endif() file (GLOB LIBRARY_SRC @@ -106,7 +106,7 @@ ov_set_threading_interface_for(${TARGET_NAME}_plugin_api) file(GLOB_RECURSE plugin_api_src "${CMAKE_CURRENT_SOURCE_DIR}/dev_api/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/dev_api/*.h") -add_clang_format_target(${TARGET_NAME}_plugin_api_clang FOR_SOURCES ${plugin_api_src}) +ov_add_clang_format_target(${TARGET_NAME}_plugin_api_clang FOR_SOURCES ${plugin_api_src}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_plugin_api SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/dev_api/openvino" @@ -126,7 +126,7 @@ if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${TARGET_NAME}_obj PUBLIC OPENVINO_STATIC_LIBRARY) endif() -ie_faster_build(${TARGET_NAME}_obj +ov_build_target_faster(${TARGET_NAME}_obj UNITY PCH PRIVATE "src/precomp.hpp" ) @@ -172,7 +172,7 @@ target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime) target_include_directories(${TARGET_NAME} INTERFACE $ $) -add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${IE_STATIC_DEPENDENT_FILES} ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${PUBLIC_HEADERS}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_SOURCES ${IE_STATIC_DEPENDENT_FILES} ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${PUBLIC_HEADERS}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj SOURCE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/openvino" diff --git a/src/inference/tests/functional/CMakeLists.txt b/src/inference/tests/functional/CMakeLists.txt index 45d9a561409..8ebd3f806bd 100644 --- a/src/inference/tests/functional/CMakeLists.txt +++ b/src/inference/tests/functional/CMakeLists.txt @@ -3,7 +3,7 @@ # if(SUGGEST_OVERRIDE_SUPPORTED) - ie_add_compiler_flags(-Wno-suggest-override) + ov_add_compiler_flags(-Wno-suggest-override) endif() set(TARGET_NAME ov_inference_functional_tests) diff --git a/src/inference/tests/unit/CMakeLists.txt b/src/inference/tests/unit/CMakeLists.txt index 69c933ea31d..575623073a1 100644 --- a/src/inference/tests/unit/CMakeLists.txt +++ b/src/inference/tests/unit/CMakeLists.txt @@ -17,6 +17,6 @@ ov_add_test_target( ) check_cxx_compiler_flag(-Wno-suggest-override SUPPORT_WNO_SUGGEST_OVERRIDE) -if (SUPPORT_WNO_SUGGEST_OVERRIDE) - ie_add_compiler_flags(-Wno-suggest-override) +if(SUPPORT_WNO_SUGGEST_OVERRIDE) + ov_add_compiler_flags(-Wno-suggest-override) endif() diff --git a/src/plugins/auto/CMakeLists.txt b/src/plugins/auto/CMakeLists.txt index 6eeb4ea4ef2..b3b60de0ab5 100644 --- a/src/plugins/auto/CMakeLists.txt +++ b/src/plugins/auto/CMakeLists.txt @@ -42,6 +42,6 @@ endif() ov_set_threading_interface_for(${TARGET_NAME}) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/plugins/auto_batch/CMakeLists.txt b/src/plugins/auto_batch/CMakeLists.txt index 5d10d6371d4..ffc873e5c6c 100644 --- a/src/plugins/auto_batch/CMakeLists.txt +++ b/src/plugins/auto_batch/CMakeLists.txt @@ -21,7 +21,7 @@ ov_add_plugin(NAME ${TARGET_NAME} target_link_libraries(${TARGET_NAME} PRIVATE Threads::Threads) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/src/plugins/hetero/CMakeLists.txt b/src/plugins/hetero/CMakeLists.txt index ca8b8b21a97..69b56cb79b3 100644 --- a/src/plugins/hetero/CMakeLists.txt +++ b/src/plugins/hetero/CMakeLists.txt @@ -18,14 +18,14 @@ ov_add_plugin(NAME ${TARGET_NAME} VERSION_DEFINES_FOR src/version.cpp ADD_CLANG_FORMAT) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY ) target_link_libraries(${TARGET_NAME} PRIVATE openvino::pugixml) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) @@ -33,7 +33,7 @@ if(BUILD_SHARED_LIBS) set(OBJ_NAME ${TARGET_NAME}_obj) add_library(${OBJ_NAME} OBJECT ${SOURCES} ${HEADERS}) - link_system_libraries(${OBJ_NAME} PUBLIC openvino::pugixml) + ov_link_system_libraries(${OBJ_NAME} PUBLIC openvino::pugixml) ov_add_version_defines(src/version.cpp ${OBJ_NAME}) @@ -45,7 +45,7 @@ if(BUILD_SHARED_LIBS) ${CMAKE_CURRENT_SOURCE_DIR}/src $) - set_ie_threading_interface_for(${OBJ_NAME}) + ov_set_threading_interface_for(${OBJ_NAME}) target_compile_definitions(${OBJ_NAME} PRIVATE @@ -63,4 +63,4 @@ endif() if(ENABLE_FUNCTIONAL_TESTS) add_subdirectory(tests/functional) -endif() \ No newline at end of file +endif() diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt index 1279bfd1269..e55f7777ee3 100644 --- a/src/plugins/intel_cpu/CMakeLists.txt +++ b/src/plugins/intel_cpu/CMakeLists.txt @@ -10,14 +10,14 @@ set(TARGET_NAME "openvino_intel_cpu_plugin") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # C4267, 4244 issues from oneDNN headers conversion from 'XXX' to 'YYY', possible loss of data - ie_add_compiler_flags(/wd4267) - ie_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4244) # mkldnn headers: '<<': result of 32-bit shift implicitly converted to 64 bits - ie_add_compiler_flags(/wd4334) + ov_add_compiler_flags(/wd4334) # oneDNN arm64: unary minus operator applied to unsigned type, result still unsigned - ie_add_compiler_flags(/wd4146) + ov_add_compiler_flags(/wd4146) elseif(OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor) + ov_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor) endif() if(ARM) @@ -142,7 +142,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE openvino::pugixml) ov_set_threading_interface_for(${TARGET_NAME}) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) # LTO set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) @@ -153,7 +153,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL if(BUILD_SHARED_LIBS) add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS}) - link_system_libraries(${TARGET_NAME}_obj PUBLIC dnnl openvino::pugixml) + ov_link_system_libraries(${TARGET_NAME}_obj PUBLIC dnnl openvino::pugixml) ov_add_version_defines(src/plugin.cpp ${TARGET_NAME}_obj) diff --git a/src/plugins/intel_cpu/tests/CMakeLists.txt b/src/plugins/intel_cpu/tests/CMakeLists.txt index 9d455f23ce5..b9a9473312e 100644 --- a/src/plugins/intel_cpu/tests/CMakeLists.txt +++ b/src/plugins/intel_cpu/tests/CMakeLists.txt @@ -7,15 +7,15 @@ add_subdirectory(unit) if(ENABLE_FUNCTIONAL_TESTS) function(ov_cpu_func_tests) if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-unused-function) - ie_add_compiler_flags(-Wno-parentheses) - ie_add_compiler_flags(-Wno-unused-local-typedefs) - ie_add_compiler_flags(-Wno-reorder) - ie_add_compiler_flags(-Wno-comment) - ie_add_compiler_flags(-Wno-unused-local-typedefs) + ov_add_compiler_flags(-Wno-unused-function) + ov_add_compiler_flags(-Wno-parentheses) + ov_add_compiler_flags(-Wno-unused-local-typedefs) + ov_add_compiler_flags(-Wno-reorder) + ov_add_compiler_flags(-Wno-comment) + ov_add_compiler_flags(-Wno-unused-local-typedefs) endif() if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0) - ie_add_compiler_flags(-Wno-unused-but-set-variable) + ov_add_compiler_flags(-Wno-unused-but-set-variable) endif() add_subdirectory(functional) diff --git a/src/plugins/intel_cpu/tests/unit/CMakeLists.txt b/src/plugins/intel_cpu/tests/unit/CMakeLists.txt index 7d16a7e464f..eed1959c799 100644 --- a/src/plugins/intel_cpu/tests/unit/CMakeLists.txt +++ b/src/plugins/intel_cpu/tests/unit/CMakeLists.txt @@ -9,7 +9,7 @@ if(BUILD_SHARED_LIBS) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - ie_add_compiler_flags(/wd5051) + ov_add_compiler_flags(/wd5051) endif() if (X86_64) @@ -77,7 +77,7 @@ if (WIN32) target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX) endif() -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY ) diff --git a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt index 98935a0792c..29c298acb10 100644 --- a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt +++ b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt @@ -78,30 +78,30 @@ function(ov_add_onednn) endif() if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-undef) - ie_add_compiler_flags(-Wno-missing-declarations) + ov_add_compiler_flags(-Wno-undef) + ov_add_compiler_flags(-Wno-missing-declarations) if(ARM OR AARCH64) - ie_add_compiler_flags(-Wno-macro-redefined) + ov_add_compiler_flags(-Wno-macro-redefined) endif() if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11 AND CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-array-bounds) - ie_add_compiler_flags(-Wno-stringop-overflow) + ov_add_compiler_flags(-Wno-array-bounds) + ov_add_compiler_flags(-Wno-stringop-overflow) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12) - ie_add_compiler_flags(-Wno-restrict) + ov_add_compiler_flags(-Wno-restrict) endif() endif() elseif(UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -diag-disable=10121") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # C4849 OpenMP 'reduction' clause ignored in 'simd' directive - ie_add_compiler_flags(/wd4849) + ov_add_compiler_flags(/wd4849) # C4661 no suitable definition provided for explicit template instantiation request - ie_add_compiler_flags(/wd4661) + ov_add_compiler_flags(/wd4661) # C4267, 4244 conversion from 'XXX' to 'YYY', possible loss of data - ie_add_compiler_flags(/wd4267) - ie_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4244) # C4334 '<<': result of 32-bit shift implicitly converted to 64 bits - ie_add_compiler_flags(/wd4334) + ov_add_compiler_flags(/wd4334) endif() if(SUGGEST_OVERRIDE_SUPPORTED) diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index f2befa4d323..566253a3c6a 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -58,7 +58,7 @@ target_compile_definitions(${TARGET_NAME} ) # must be called after all target_link_libraries -ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) +ov_add_api_validator_post_build_step(TARGET ${TARGET_NAME}) # # Static version for tests diff --git a/src/plugins/intel_gna/legacy/CMakeLists.txt b/src/plugins/intel_gna/legacy/CMakeLists.txt index ac53784b1e4..33915b9ccd4 100644 --- a/src/plugins/intel_gna/legacy/CMakeLists.txt +++ b/src/plugins/intel_gna/legacy/CMakeLists.txt @@ -28,7 +28,7 @@ add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS}) -ie_faster_build(${TARGET_NAME}_obj +ov_build_target_faster(${TARGET_NAME}_obj PCH PRIVATE "src/precomp.hpp") target_include_directories(${TARGET_NAME}_obj PRIVATE @@ -43,7 +43,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE $>) -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_mark_target_as_cc(${TARGET_NAME}) diff --git a/src/plugins/template/backend/CMakeLists.txt b/src/plugins/template/backend/CMakeLists.txt index 7530dd16881..7b945216c95 100644 --- a/src/plugins/template/backend/CMakeLists.txt +++ b/src/plugins/template/backend/CMakeLists.txt @@ -20,19 +20,18 @@ set (SRC ) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - ie_add_compiler_flags(/wd4244) - ie_add_compiler_flags(/wd4018) + ov_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4018) endif() - add_library(interpreter_backend STATIC EXCLUDE_FROM_ALL ${OPS_SRC} ${SRC}) add_library(openvino::interpreter_backend ALIAS interpreter_backend) if(CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-missing-declarations) + ov_add_compiler_flags(-Wno-missing-declarations) endif() -ie_faster_build(interpreter_backend UNITY) +ov_build_target_faster(interpreter_backend UNITY) target_compile_definitions(interpreter_backend PRIVATE @@ -44,7 +43,7 @@ target_link_libraries(interpreter_backend PRIVATE openvino::builders openvino::r target_include_directories(interpreter_backend PUBLIC $ $) file(GLOB_RECURSE all_backends_src "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp") -add_clang_format_target(interpreter_backend_clang FOR_SOURCES ${all_backends_src}) +ov_add_clang_format_target(interpreter_backend_clang FOR_SOURCES ${all_backends_src}) # developer package diff --git a/src/plugins/template/tests/functional/CMakeLists.txt b/src/plugins/template/tests/functional/CMakeLists.txt index 2aef6104d98..a4ba476c4c2 100644 --- a/src/plugins/template/tests/functional/CMakeLists.txt +++ b/src/plugins/template/tests/functional/CMakeLists.txt @@ -6,7 +6,7 @@ set(TARGET_NAME ov_template_func_tests) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - ie_add_compiler_flags(/wd4305) + ov_add_compiler_flags(/wd4305) endif() ov_add_test_target( diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 9b65c49bc7d..b86c0d8bfba 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -10,21 +10,21 @@ ie_option(ENABLE_CONFORMANCE_PGQL "Enables support of PostgreSQL-based reporting mark_as_advanced(FORCE ENABLE_CONFORMANCE_PGQL) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - ie_add_compiler_flags(/wd4244) - ie_add_compiler_flags(/wd4267) - ie_add_compiler_flags(/wd4305) - ie_add_compiler_flags(/wd4018) - ie_add_compiler_flags(/wd4050) - ie_add_compiler_flags(/wd4250) - ie_add_compiler_flags(/wd4334) - ie_add_compiler_flags(/wd4661) - ie_add_compiler_flags(/wd4273) - ie_add_compiler_flags(/wd4309) - ie_add_compiler_flags(/wd4804) + ov_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4305) + ov_add_compiler_flags(/wd4018) + ov_add_compiler_flags(/wd4050) + ov_add_compiler_flags(/wd4250) + ov_add_compiler_flags(/wd4334) + ov_add_compiler_flags(/wd4661) + ov_add_compiler_flags(/wd4273) + ov_add_compiler_flags(/wd4309) + ov_add_compiler_flags(/wd4804) else() - ie_add_compiler_flags(-Wno-missing-declarations) - ie_add_compiler_flags(-Wno-odr) - ie_add_compiler_flags(-Wno-all) + ov_add_compiler_flags(-Wno-missing-declarations) + ov_add_compiler_flags(-Wno-odr) + ov_add_compiler_flags(-Wno-all) endif() ov_deprecated_no_errors() diff --git a/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt b/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt index 005a534eb4a..fbe206c3633 100644 --- a/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/subgraphs_dumper/CMakeLists.txt @@ -25,4 +25,4 @@ addIeTargetTest( ADD_CPPLINT ) -ie_faster_build(${TARGET_NAME} UNITY) \ No newline at end of file +ov_build_target_faster(${TARGET_NAME} UNITY) \ No newline at end of file diff --git a/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt b/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt index c538d27fbdd..325504ff9a7 100644 --- a/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/subgraphs_dumper/tests/CMakeLists.txt @@ -22,4 +22,4 @@ addIeTargetTest( ADD_CPPLINT ) -ie_faster_build(${TARGET_NAME} UNITY) +ov_build_target_faster(${TARGET_NAME} UNITY) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt index 5f59949a088..e61718b5f66 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/CMakeLists.txt @@ -20,4 +20,4 @@ addIeTargetTest( API_CONFORMANCE ) -ie_faster_build(${TARGET_NAME} UNITY) +ov_build_target_faster(${TARGET_NAME} UNITY) diff --git a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/CMakeLists.txt b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/CMakeLists.txt index 11c5e2951a4..54330c5d427 100644 --- a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/CMakeLists.txt @@ -26,4 +26,4 @@ if(ENABLE_CONFORMANCE_PGQL) target_compile_definitions(${TARGET_NAME} PRIVATE ENABLE_CONFORMANCE_PGQL) endif() -ie_faster_build(${TARGET_NAME} UNITY) +ov_build_target_faster(${TARGET_NAME} UNITY) diff --git a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt index bc582494c8c..a4ee71c9ac0 100644 --- a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt +++ b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/CMakeLists.txt @@ -21,4 +21,4 @@ addIeTargetTest( OP_CONFORMANCE ) -ie_faster_build(${TARGET_NAME} UNITY) +ov_build_target_faster(${TARGET_NAME} UNITY) diff --git a/src/tests/functional/plugin/shared/CMakeLists.txt b/src/tests/functional/plugin/shared/CMakeLists.txt index f5bb32f5859..30892b44ec0 100644 --- a/src/tests/functional/plugin/shared/CMakeLists.txt +++ b/src/tests/functional/plugin/shared/CMakeLists.txt @@ -77,7 +77,7 @@ if(ENABLE_GAPI_PREPROCESSING) target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING) endif() -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/functional/shared_test_classes/CMakeLists.txt b/src/tests/functional/shared_test_classes/CMakeLists.txt index 1262ac1d26f..55f2f4e9a1e 100644 --- a/src/tests/functional/shared_test_classes/CMakeLists.txt +++ b/src/tests/functional/shared_test_classes/CMakeLists.txt @@ -22,6 +22,6 @@ addIeTarget( ngraphFunctions ) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt index 2150a80e8fa..72af7082629 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt @@ -26,7 +26,7 @@ addIeTarget( tests ) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt index 2700632939b..4b569ace8c9 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt @@ -27,7 +27,7 @@ addIeTarget( tests ) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/ngraph_helpers/snippets_ngraph_functions/CMakeLists.txt b/src/tests/ngraph_helpers/snippets_ngraph_functions/CMakeLists.txt index 5c6f37cf0eb..0c88fe6b4bc 100644 --- a/src/tests/ngraph_helpers/snippets_ngraph_functions/CMakeLists.txt +++ b/src/tests/ngraph_helpers/snippets_ngraph_functions/CMakeLists.txt @@ -31,7 +31,7 @@ addIeTarget( tests ) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/test_utils/common_test_utils/CMakeLists.txt b/src/tests/test_utils/common_test_utils/CMakeLists.txt index 86418a9f4fd..14db94d4736 100644 --- a/src/tests/test_utils/common_test_utils/CMakeLists.txt +++ b/src/tests/test_utils/common_test_utils/CMakeLists.txt @@ -53,7 +53,7 @@ function(add_common_utils ADD_TARGET_NAME) target_link_libraries(${ADD_TARGET_NAME} PRIVATE inference_engine_s) endif() - ie_faster_build(${ADD_TARGET_NAME} + ov_build_target_faster(${ADD_TARGET_NAME} UNITY PCH PRIVATE "src/precomp.hpp" ) diff --git a/src/tests/test_utils/functional_test_utils/CMakeLists.txt b/src/tests/test_utils/functional_test_utils/CMakeLists.txt index 414055027c3..3d3fb084ca5 100644 --- a/src/tests/test_utils/functional_test_utils/CMakeLists.txt +++ b/src/tests/test_utils/functional_test_utils/CMakeLists.txt @@ -33,6 +33,6 @@ install(PROGRAMS layer_tests_summary/run_parallel.py DESTINATION tests/functiona install(FILES layer_tests_summary/requirements.txt DESTINATION tests/functional_test_utils COMPONENT tests EXCLUDE_FROM_ALL) install(DIRECTORY layer_tests_summary/utils DESTINATION tests/functional_test_utils COMPONENT tests EXCLUDE_FROM_ALL) -ie_faster_build(${TARGET_NAME} +ov_build_target_faster(${TARGET_NAME} PCH PRIVATE "src/precomp.hpp" ) diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake index 7ef645c0b83..eb4cd25aaf5 100644 --- a/thirdparty/dependencies.cmake +++ b/thirdparty/dependencies.cmake @@ -533,20 +533,20 @@ if(ENABLE_SNAPPY_COMPRESSION) set(CMAKE_CXX_STANDARD 14) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # '<': signed/unsigned mismatch - ie_add_compiler_flags(/wd4018) + ov_add_compiler_flags(/wd4018) # conditional expression is constant - ie_add_compiler_flags(/wd4127) + ov_add_compiler_flags(/wd4127) # 'conversion' conversion from 'type1' to 'type2', possible loss of data - ie_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4244) # 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch - ie_add_compiler_flags(/wd4245) + ov_add_compiler_flags(/wd4245) # 'var' : conversion from 'size_t' to 'type', possible loss of data - ie_add_compiler_flags(/wd4267) + ov_add_compiler_flags(/wd4267) elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) # we need to pass -Wextra first, then -Wno-sign-compare # otherwise, snappy's CMakeLists.txt will do it for us - ie_add_compiler_flags(-Wextra) - ie_add_compiler_flags(-Wno-sign-compare) + ov_add_compiler_flags(-Wextra) + ov_add_compiler_flags(-Wno-sign-compare) endif() add_subdirectory(thirdparty/snappy EXCLUDE_FROM_ALL) diff --git a/thirdparty/itt_collector/sea_itt_lib/CMakeLists.txt b/thirdparty/itt_collector/sea_itt_lib/CMakeLists.txt index 82919fb64b5..23f2506d08d 100644 --- a/thirdparty/itt_collector/sea_itt_lib/CMakeLists.txt +++ b/thirdparty/itt_collector/sea_itt_lib/CMakeLists.txt @@ -39,7 +39,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR OV_COMPILER_IS_CLANG) target_compile_options(${TARGET_NAME} PRIVATE -Wno-undef -Wno-deprecated-declarations -Wno-multichar) endif() -add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} DESTINATION tests/sea_itt_lib COMPONENT itt_collector EXCLUDE_FROM_ALL) diff --git a/thirdparty/onnx/CMakeLists.txt b/thirdparty/onnx/CMakeLists.txt index 19d8aabd4ef..a87c4fc42b3 100644 --- a/thirdparty/onnx/CMakeLists.txt +++ b/thirdparty/onnx/CMakeLists.txt @@ -20,7 +20,7 @@ endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # 4244 conversion from 'XXX' to 'YYY', possible loss of data - ie_add_compiler_flags(/wd4244) + ov_add_compiler_flags(/wd4244) endif() set(ONNX_USE_PROTOBUF_SHARED_LIBS OFF CACHE BOOL "Use dynamic protobuf by ONNX library" FORCE) diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt index 1e782987d01..4b6d6da87f3 100644 --- a/thirdparty/protobuf/CMakeLists.txt +++ b/thirdparty/protobuf/CMakeLists.txt @@ -9,13 +9,13 @@ set(BUILD_SHARED_LIBS OFF) if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-all) + ov_add_compiler_flags(-Wno-all) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11 AND CMAKE_COMPILER_IS_GNUCXX) - ie_add_compiler_flags(-Wno-stringop-overflow) + ov_add_compiler_flags(-Wno-stringop-overflow) endif() elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # protobuf\src\google\protobuf\descriptor.cc(822) : error C4703: potentially uninitialized local pointer variable 'to_use' used - ie_add_compiler_flags(/wd4703) + ov_add_compiler_flags(/wd4703) endif() set(protobuf_VERBOSE ON) diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt index 208bba3a6d3..cb86b4016ee 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_frontend/CMakeLists.txt @@ -17,7 +17,7 @@ target_include_directories(${TARGET_FE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} target_link_libraries(${TARGET_FE_NAME} PUBLIC openvino::runtime PRIVATE openvino::builders) -add_clang_format_target(${TARGET_FE_NAME}_clang FOR_TARGETS ${TARGET_FE_NAME}) +ov_add_clang_format_target(${TARGET_FE_NAME}_clang FOR_TARGETS ${TARGET_FE_NAME}) if(BUILD_SHARED_LIBS) install(TARGETS ${TARGET_FE_NAME} diff --git a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt index 141dbf88cdb..4a1a7d9099a 100644 --- a/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt +++ b/tools/mo/unit_tests/mock_mo_frontend/mock_mo_python_api/CMakeLists.txt @@ -50,7 +50,7 @@ target_link_libraries(${PYBIND_FE_NAME} PRIVATE ${TARGET_FE_NAME}) add_dependencies(${PYBIND_FE_NAME} ${TARGET_FE_NAME}) -add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME}) +ov_add_clang_format_target(${PYBIND_FE_NAME}_clang FOR_TARGETS ${PYBIND_FE_NAME}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY_OLD}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_OLD})