From 5affdc32848b7d5cb7d7c273b73dcef1cd49fcd7 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 14 Jan 2022 07:50:30 +0300 Subject: [PATCH] Added NCC support for source files (#9630) --- .../frontends/frontends.cmake | 2 +- .../ncc_naming_style/ncc_naming_style.cmake | 31 ++++++++++--------- src/common/util/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 2 +- src/frontends/common/CMakeLists.txt | 2 +- src/frontends/onnx/frontend/CMakeLists.txt | 2 +- src/inference/CMakeLists.txt | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index f662332b4c7..ca8b53f1e6d 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -165,7 +165,7 @@ macro(ov_add_frontend) # frontend's CMakeLists.txt must define its own custom 'ov_ncc_naming_style' step else() ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} - INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" + SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" ADDITIONAL_INCLUDE_DIRECTORIES $) endif() diff --git a/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake b/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake index a4e9bdf72f8..b7760e920d5 100644 --- a/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake +++ b/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake @@ -75,12 +75,12 @@ endif() # # ov_ncc_naming_style(FOR_TARGET target_name -# INCLUDE_DIRECTORY dir +# SOURCE_DIRECTORY dir # [ADDITIONAL_INCLUDE_DIRECTORIES dir1 dir2 ..] # [DEFINITIONS def1 def2 ..]) # # FOR_TARGET - name of the target -# INCLUDE_DIRECTORY - directory to check headers from +# SOURCE_DIRECTORY - directory to check sources from # ADDITIONAL_INCLUDE_DIRECTORIES - additional include directories used in checked headers # DEFINITIONS - additional definitions passed to preprocessor stage # @@ -90,23 +90,24 @@ function(ov_ncc_naming_style) endif() cmake_parse_arguments(NCC_STYLE "FAIL" - "FOR_TARGET;INCLUDE_DIRECTORY" "ADDITIONAL_INCLUDE_DIRECTORIES;DEFINITIONS" ${ARGN}) + "FOR_TARGET;SOURCE_DIRECTORY" "ADDITIONAL_INCLUDE_DIRECTORIES;DEFINITIONS" ${ARGN}) - foreach(var FOR_TARGET INCLUDE_DIRECTORY) + foreach(var FOR_TARGET SOURCE_DIRECTORY) if(NOT DEFINED NCC_STYLE_${var}) message(FATAL_ERROR "${var} is not defined in ov_ncc_naming_style function") endif() endforeach() - file(GLOB_RECURSE headers - RELATIVE "${NCC_STYLE_INCLUDE_DIRECTORY}" - "${NCC_STYLE_INCLUDE_DIRECTORY}/*.hpp") + file(GLOB_RECURSE sources + RELATIVE "${NCC_STYLE_SOURCE_DIRECTORY}" + "${NCC_STYLE_SOURCE_DIRECTORY}/*.hpp" + "${NCC_STYLE_SOURCE_DIRECTORY}/*.cpp") - list(APPEND NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES "${NCC_STYLE_INCLUDE_DIRECTORY}") + list(APPEND NCC_STYLE_ADDITIONAL_INCLUDE_DIRECTORIES "${NCC_STYLE_SOURCE_DIRECTORY}") - foreach(header IN LISTS headers) - set(output_file "${ncc_style_bin_dir}/${header}.ncc_style") - set(full_header_path "${NCC_STYLE_INCLUDE_DIRECTORY}/${header}") + foreach(source IN LISTS sources) + set(output_file "${ncc_style_bin_dir}/${source}.ncc_style") + set(full_source_path "${NCC_STYLE_SOURCE_DIRECTORY}/${source}") add_custom_command( OUTPUT @@ -115,7 +116,7 @@ function(ov_ncc_naming_style) "${CMAKE_COMMAND}" -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" -D "NCC_PY_SCRIPT=${ncc_script_py}" - -D "INPUT_FILE=${full_header_path}" + -D "INPUT_FILE=${full_source_path}" -D "OUTPUT_FILE=${output_file}" -D "DEFINITIONS=${NCC_STYLE_DEFINITIONS}" -D "CLANG_LIB_PATH=${libclang_location}" @@ -124,12 +125,12 @@ function(ov_ncc_naming_style) -D "EXPECTED_FAIL=${NCC_STYLE_FAIL}" -P "${ncc_style_dir}/ncc_run.cmake" DEPENDS - "${full_header_path}" + "${full_source_path}" "${ncc_style_dir}/openvino.style" "${ncc_script_py}" "${ncc_style_dir}/ncc_run.cmake" COMMENT - "[ncc naming style] ${header}" + "[ncc naming style] ${source}" VERBATIM) list(APPEND output_files ${output_file}) endforeach() @@ -145,6 +146,6 @@ endfunction() if(TARGET ncc_all) ov_ncc_naming_style(FOR_TARGET ncc_all - INCLUDE_DIRECTORY "${ncc_style_dir}/self_check" + SOURCE_DIRECTORY "${ncc_style_dir}/self_check" FAIL) endif() diff --git a/src/common/util/CMakeLists.txt b/src/common/util/CMakeLists.txt index 0024d115b06..f78d2c3d82b 100644 --- a/src/common/util/CMakeLists.txt +++ b/src/common/util/CMakeLists.txt @@ -40,6 +40,6 @@ ov_install_static_lib(${TARGET_NAME} core) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} - INCLUDE_DIRECTORY ${UTIL_INCLUDE_DIR}) + SOURCE_DIRECTORY ${UTIL_INCLUDE_DIR}) openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2564ce7d8f9..12c2db6f008 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -66,7 +66,7 @@ target_link_libraries(ngraph_obj PRIVATE ngraph::builder ngraph::reference openv ie_mark_target_as_cc(ngraph_obj) ov_ncc_naming_style(FOR_TARGET ngraph_obj - INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include") + SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include") add_clang_format_target(ngraph_clang FOR_TARGETS ngraph_obj) diff --git a/src/frontends/common/CMakeLists.txt b/src/frontends/common/CMakeLists.txt index 0019fea3513..7cdad9db18c 100644 --- a/src/frontends/common/CMakeLists.txt +++ b/src/frontends/common/CMakeLists.txt @@ -49,7 +49,7 @@ set_property(SOURCE add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}_obj) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}_obj - INCLUDE_DIRECTORY "${FRONTEND_INCLUDE_DIR}" + SOURCE_DIRECTORY "${FRONTEND_INCLUDE_DIR}" ADDITIONAL_INCLUDE_DIRECTORIES $) diff --git a/src/frontends/onnx/frontend/CMakeLists.txt b/src/frontends/onnx/frontend/CMakeLists.txt index f8a7faed867..f6d095c938b 100644 --- a/src/frontends/onnx/frontend/CMakeLists.txt +++ b/src/frontends/onnx/frontend/CMakeLists.txt @@ -14,7 +14,7 @@ set(ONNX_OPSET_VERSION 15 CACHE INTERNAL "Supported version of ONNX operator set target_compile_definitions(${TARGET_NAME} PRIVATE ONNX_OPSET_VERSION=${ONNX_OPSET_VERSION}) ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME} - INCLUDE_DIRECTORY "${${TARGET_NAME}_INCLUDE_DIR}" + SOURCE_DIRECTORY "${${TARGET_NAME}_INCLUDE_DIR}" DEFINITIONS $ ADDITIONAL_INCLUDE_DIRECTORIES diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt index 82dc9e5f8e5..86a6edca6fd 100644 --- a/src/inference/CMakeLists.txt +++ b/src/inference/CMakeLists.txt @@ -157,7 +157,7 @@ target_include_directories(${TARGET_NAME} INTERFACE $) # Static library used for unit tests which are always built