Merge branch 'master' into vu/apivalidator

openvinotoolkit · Feb 25, 2023 · e091949 · e091949
2 parents 56ef377 + 46e8aad
commit e091949
Show file tree

Hide file tree

Showing 274 changed files with 7,255 additions and 3,120 deletions.
diff --git a/cmake/developer_package/api_validator/api_validator.cmake b/cmake/developer_package/api_validator/api_validator.cmake
@@ -21,34 +21,34 @@ endif()
 function(_ie_add_api_validator_post_build_step_recursive)
     cmake_parse_arguments(API_VALIDATOR "" "TARGET" "" ${ARGN})
 
-    list(APPEND API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGET})
-    set(API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGETS} PARENT_SCOPE)
-
-    get_target_property(IS_IMPORTED ${API_VALIDATOR_TARGET} IMPORTED)
-    if(IS_IMPORTED)
-        return()
+    get_target_property(LIBRARY_TYPE ${API_VALIDATOR_TARGET} TYPE)
+    if(LIBRARY_TYPE MATCHES "^(SHARED_LIBRARY|MODULE_LIBRARY|EXECUTABLE)$" AND
+        NOT ${API_VALIDATOR_TARGET} IN_LIST API_VALIDATOR_TARGETS)
+        list(APPEND API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGET})
     endif()
 
-    get_target_property(LIBRARY_TYPE ${API_VALIDATOR_TARGET} TYPE)
-    if(LIBRARY_TYPE STREQUAL "EXECUTABLE" OR LIBRARY_TYPE STREQUAL "SHARED_LIBRARY")
+    if(NOT LIBRARY_TYPE STREQUAL "INTERFACE_LIBRARY")
         get_target_property(LINKED_LIBRARIES ${API_VALIDATOR_TARGET} LINK_LIBRARIES)
-        if(LINKED_LIBRARIES)
-            foreach(ITEM IN LISTS LINKED_LIBRARIES)
-                if(NOT TARGET ${ITEM})
-                    continue()
-                endif()
-                get_target_property(LIBRARY_TYPE_DEPENDENCY ${ITEM} TYPE)
-                if(LIBRARY_TYPE_DEPENDENCY STREQUAL "SHARED_LIBRARY")
-                    _ie_add_api_validator_post_build_step_recursive(TARGET ${ITEM})
-                endif()
-            endforeach()
-        endif()
+    else()
+        set(LINKED_LIBRARIES)
     endif()
+    get_target_property(INTERFACE_LINKED_LIBRARIES ${API_VALIDATOR_TARGET} INTERFACE_LINK_LIBRARIES)
+
+    foreach(library IN LISTS LINKED_LIBRARIES INTERFACE_LINKED_LIBRARIES)
+        if(TARGET "${library}")
+            get_target_property(orig_library ${library} ALIASED_TARGET)
+            if(TARGET "${orig_library}")
+                _ie_add_api_validator_post_build_step_recursive(TARGET ${orig_library})
+            else()
+                _ie_add_api_validator_post_build_step_recursive(TARGET ${library})
+            endif()
+        endif()
+    endforeach()
 
     set(API_VALIDATOR_TARGETS ${API_VALIDATOR_TARGETS} PARENT_SCOPE)
 endfunction()
 
-set(VALIDATED_LIBRARIES "" CACHE INTERNAL "")
+set(VALIDATED_TARGETS "" CACHE INTERNAL "")
 
 function(_ov_add_api_validator_post_build_step)
     set(UWP_API_VALIDATOR_APIS "${PROGRAMFILES}/Windows Kits/10/build/universalDDIs/x64/UniversalDDIs.xml")
@@ -58,7 +58,7 @@ function(_ov_add_api_validator_post_build_step)
         return()
     endif()
 
-    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "EXTRA" "" ${ARGN})
+    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "EXTRA" ${ARGN})
 
     if(NOT API_VALIDATOR_TARGET)
         message(FATAL_ERROR "RunApiValidator requires TARGET to validate!")
@@ -71,13 +71,16 @@ function(_ov_add_api_validator_post_build_step)
     # collect targets
 
     _ie_add_api_validator_post_build_step_recursive(TARGET ${API_VALIDATOR_TARGET})
-    if (API_VALIDATOR_EXTRA)
+    if(API_VALIDATOR_EXTRA)
         foreach(target IN LISTS API_VALIDATOR_EXTRA)
             _ie_add_api_validator_post_build_step_recursive(TARGET ${target})
         endforeach()
     endif()
 
-    list(REMOVE_DUPLICATES API_VALIDATOR_TARGETS)
+    # remove targets which were tested before
+    foreach(item IN LISTS VALIDATED_TARGETS)
+        list(REMOVE_ITEM API_VALIDATOR_TARGETS ${item})
+    endforeach()
 
     if(NOT API_VALIDATOR_TARGETS)
         return()
@@ -93,8 +96,10 @@ function(_ov_add_api_validator_post_build_step)
             get_filename_component(target_name "${target_location}" NAME_WE)
         elseif(TARGET "${orig_target}")
             set(target_name ${orig_target})
+            set(target_location $<TARGET_FILE:${orig_target}>)
         else()
             set(target_name ${target})
+            set(target_location $<TARGET_FILE:${target}>)
         endif()
     endmacro()
 
@@ -109,7 +114,7 @@ function(_ov_add_api_validator_post_build_step)
         add_custom_command(TARGET ${API_VALIDATOR_TARGET} POST_BUILD
             COMMAND ${CMAKE_COMMAND} --config $<CONFIG>
                 -D UWP_API_VALIDATOR=${UWP_API_VALIDATOR}
-                -D UWP_API_VALIDATOR_TARGET=$<TARGET_FILE:${target}>
+                -D UWP_API_VALIDATOR_TARGET=${target_location}
                 -D UWP_API_VALIDATOR_APIS=${UWP_API_VALIDATOR_APIS}
                 -D UWP_API_VALIDATOR_EXCLUSION=${UWP_API_VALIDATOR_EXCLUSION}
                 -D UWP_API_VALIDATOR_OUTPUT=${output_file}
@@ -122,8 +127,8 @@ function(_ov_add_api_validator_post_build_step)
 
     # update list of validated libraries
 
-    list(APPEND VALIDATED_LIBRARIES ${API_VALIDATOR_TARGETS})
-    set(VALIDATED_LIBRARIES "${VALIDATED_LIBRARIES}" CACHE INTERNAL "" FORCE)
+    list(APPEND VALIDATED_TARGETS ${API_VALIDATOR_TARGETS})
+    set(VALIDATED_TARGETS "${VALIDATED_TARGETS}" CACHE INTERNAL "" FORCE)
 endfunction()
 
 #

diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
@@ -182,7 +182,7 @@ macro(ov_add_frontend)
         add_library(openvino::frontend::${OV_FRONTEND_NAME} ALIAS ${TARGET_NAME})
     endif()
 
-    # Shutdown protobuf when unloading the front dynamic library
+    # Shutdown protobuf when unloading the frontend dynamic library
     if(proto_files AND BUILD_SHARED_LIBS)
         target_link_libraries(${TARGET_NAME} PRIVATE ov_protobuf_shutdown)
     endif()
@@ -217,8 +217,6 @@ macro(ov_add_frontend)
     ie_add_vs_version_file(NAME ${TARGET_NAME}
                            FILEDESCRIPTION ${OV_FRONTEND_FILEDESCRIPTION})
 
-    ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
-
     target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime)
     target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES})
     ov_add_library_version(${TARGET_NAME})
@@ -259,6 +257,11 @@ 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})
+
+    # installation
+
     if(NOT OV_FRONTEND_SKIP_INSTALL)
         if(BUILD_SHARED_LIBS)
             # Note:

diff --git a/docs/OV_Runtime_UG/Operations_specifications.md b/docs/OV_Runtime_UG/Operations_specifications.md
@@ -202,6 +202,7 @@
    Tile-1 <openvino_docs_ops_movement_Tile_1>
    TopK-1 <openvino_docs_ops_sort_TopK_1>
    TopK-3 <openvino_docs_ops_sort_TopK_3>
+   TopK-11 <openvino_docs_ops_sort_TopK_11>
    Transpose-1 <openvino_docs_ops_movement_Transpose_1>
    Unique-10 <openvino_docs_ops_movement_Unique_10>
    Unsqueeze-1 <openvino_docs_ops_shape_Unsqueeze_1>