Merge branch 'master' into feature/extract_gather_transpose

.github/workflows/build_doc.yml

@@ -25,7 +25,7 @@ jobs:
           lfs: true
 
       - name: Install apt-get dependencies
-        uses: awalsh128/cache-apt-pkgs-action@v1.1.3
+        uses: awalsh128/cache-apt-pkgs-action@v1.2.4
         with:
           packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9
           version: 3.0

.github/workflows/mo.yml

@@ -30,7 +30,7 @@ jobs:
           python-version: '3.10'
 
       - name: Cache pip
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('tools/mo/requirements*.txt') }}

cmake/developer_package/api_validator/api_validator.cmake

@@ -5,60 +5,99 @@
 if(WIN32)
     set(PROGRAMFILES_ENV "ProgramFiles(X86)")
     file(TO_CMAKE_PATH $ENV{${PROGRAMFILES_ENV}} PROGRAMFILES)
-    set(UWP_SDK_PATH "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64")
 
-    message(STATUS "Trying to find apivalidator in: ${UWP_SDK_PATH}")
-    find_host_program(UWP_API_VALIDATOR
+    set(WDK_PATHS "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64"
+                  "${PROGRAMFILES}/Windows Kits/10/bin/x64")
+
+    message(STATUS "Trying to find apivalidator in: ")
+    foreach(wdk_path IN LISTS WDK_PATHS)
+        message("    * ${wdk_path}")
+    endforeach()
+
+    find_host_program(ONECORE_API_VALIDATOR
                       NAMES apivalidator
-                      PATHS "${UWP_SDK_PATH}"
-                      DOC "ApiValidator for UWP compliance")
+                      PATHS ${WDK_PATHS}
+                      DOC "ApiValidator for OneCore compliance")
 
-    if(UWP_API_VALIDATOR)
-        message(STATUS "Found apivalidator: ${UWP_API_VALIDATOR}")
+    if(ONECORE_API_VALIDATOR)
+        message(STATUS "Found apivalidator: ${ONECORE_API_VALIDATOR}")
     endif()
 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()
+    # keep checks target list to track cyclic dependencies, leading to infinite recursion
+    list(APPEND checked_targets ${API_VALIDATOR_TARGET})
 
-    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(orig_library IN_LIST checked_targets OR library IN_LIST checked_targets)
+                # in case of cyclic dependencies, we need to skip current target
+                continue()
+            endif()
+            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")
-    set(UWP_API_VALIDATOR_EXCLUSION "${UWP_SDK_PATH}/BinaryExclusionlist.xml")
+    if((NOT ONECORE_API_VALIDATOR) OR (WINDOWS_STORE OR WINDOWS_PHONE))
+        return()
+    endif()
 
-    if((NOT UWP_API_VALIDATOR) OR (WINDOWS_STORE OR WINDOWS_PHONE))
+    # see https://learn.microsoft.com/en-us/windows-hardware/drivers/develop/validating-windows-drivers#known-apivalidator-issues
+    # ApiValidator does not run on Arm64 because AitStatic does not work on Arm64
+    if(HOST_AARCH64)
         return()
     endif()
 
-    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "" ${ARGN})
+    if(X86_64)
+        set(wdk_platform "x64")
+    elseif(X86)
+        set(wdk_platform "x86")
+    elseif(ARM)
+        set(wdk_platform "arm")
+    elseif(AARCH64)
+        set(wdk_platform "arm64")
+    else()
+        message(FATAL_ERROR "Unknown configuration: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+    endif()
+
+    find_file(ONECORE_API_VALIDATOR_APIS NAMES UniversalDDIs.xml
+              PATHS "${PROGRAMFILES}/Windows Kits/10/build/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/universalDDIs/${wdk_platform}"
+                    "${PROGRAMFILES}/Windows Kits/10/build/universalDDIs/${wdk_platform}"
+              DOC "Path to UniversalDDIs.xml file")
+    find_file(ONECORE_API_VALIDATOR_EXCLUSION NAMES BinaryExclusionlist.xml
+              PATHS ${WDK_PATHS}
+              DOC "Path to BinaryExclusionlist.xml file")
+
+    if(NOT ONECORE_API_VALIDATOR_APIS)
+        message(FATAL_ERROR "Internal error: apiValidator is found (${ONECORE_API_VALIDATOR}), but UniversalDDIs.xml file has not been found for ${wdk_platform} platform")
+    endif()
+
+    cmake_parse_arguments(API_VALIDATOR "" "TARGET" "EXTRA" "" ${ARGN})
 
     if(NOT API_VALIDATOR_TARGET)
         message(FATAL_ERROR "RunApiValidator requires TARGET to validate!")
@@ -69,74 +108,81 @@ function(_ov_add_api_validator_post_build_step)
     endif()
 
     # collect targets
-
     _ie_add_api_validator_post_build_step_recursive(TARGET ${API_VALIDATOR_TARGET})
+    if (API_VALIDATOR_EXTRA)
+        foreach(target IN LISTS API_VALIDATOR_EXTRA)
+            _ie_add_api_validator_post_build_step_recursive(TARGET ${target})
+        endforeach()
+    endif()
 
     # remove targets which were tested before
-    foreach(target IN LISTS API_VALIDATOR_TARGETS)
-        list(FIND VALIDATED_LIBRARIES ${target} index)
-        if (NOT index EQUAL -1)
-            list(APPEND VALIDATED_TARGETS ${target})
-        endif()
-        if(TARGET "${target}")
-            get_target_property(orig_target ${target} ALIASED_TARGET)
-            list(FIND VALIDATED_LIBRARIES ${orig_target} index)
-            if (NOT index EQUAL -1)
-                list(APPEND VALIDATED_TARGETS ${target})
-            endif()
-        endif()
-    endforeach()
     foreach(item IN LISTS VALIDATED_TARGETS)
         list(REMOVE_ITEM API_VALIDATOR_TARGETS ${item})
     endforeach()
 
-    list(REMOVE_DUPLICATES API_VALIDATOR_TARGETS)
-
     if(NOT API_VALIDATOR_TARGETS)
         return()
     endif()
 
     # apply check
-
     macro(api_validator_get_target_name)
-        get_target_property(IS_IMPORTED ${target} IMPORTED)
+        get_target_property(is_imported ${target} IMPORTED)
         get_target_property(orig_target ${target} ALIASED_TARGET)
-        if(IS_IMPORTED)
-            get_target_property(target_location ${target} LOCATION)
-            get_filename_component(target_name "${target_location}" NAME_WE)
+        if(is_imported)
+            get_target_property(imported_configs ${target} IMPORTED_CONFIGURATIONS)
+            foreach(imported_config RELEASE RELWITHDEBINFO DEBUG)
+                if(imported_config IN_LIST imported_configs)
+                    get_target_property(target_location ${target} IMPORTED_LOCATION_${imported_config})
+                    get_filename_component(target_name "${target_location}" NAME_WE)
+                    break()
+                endif()
+            endforeach()
+            unset(imported_configs)
         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()
+
+        unset(orig_target)
+        unset(is_imported)
     endmacro()
 
     foreach(target IN LISTS API_VALIDATOR_TARGETS)
         api_validator_get_target_name()
-        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21 AND OV_GENERATOR_MULTI_CONFIG)
-            set(output_file "${CMAKE_BINARY_DIR}/api_validator/$<CONFIG>/${target_name}.txt")
+        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND OV_GENERATOR_MULTI_CONFIG)
+            set(output_file "${OpenVINO_BINARY_DIR}/api_validator/$<CONFIG>/${target_name}.txt")
         else()
-            set(output_file "${CMAKE_BINARY_DIR}/api_validator/${target_name}.txt")
+            set(output_file "${OpenVINO_BINARY_DIR}/api_validator/${target_name}.txt")
         endif()
 
-        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_APIS=${UWP_API_VALIDATOR_APIS}
-                -D UWP_API_VALIDATOR_EXCLUSION=${UWP_API_VALIDATOR_EXCLUSION}
-                -D UWP_API_VALIDATOR_OUTPUT=${output_file}
+        list(APPEND post_build_commands
+             ${CMAKE_COMMAND} --config $<CONFIG>
+                -D ONECORE_API_VALIDATOR=${ONECORE_API_VALIDATOR}
+                -D ONECORE_API_VALIDATOR_TARGET=${target_location}
+                -D ONECORE_API_VALIDATOR_APIS=${ONECORE_API_VALIDATOR_APIS}
+                -D ONECORE_API_VALIDATOR_EXCLUSION=${ONECORE_API_VALIDATOR_EXCLUSION}
+                -D ONECORE_API_VALIDATOR_OUTPUT=${output_file}
                 -D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                -P "${IEDevScripts_DIR}/api_validator/api_validator_run.cmake"
-            BYPRODUCTS ${output_file}
-            COMMENT "[apiValidator] Check ${target_name} for OneCore compliance"
-            VERBATIM)
+                -P "${IEDevScripts_DIR}/api_validator/api_validator_run.cmake")
+        list(APPEND byproducts_files ${output_file})
+
+        unset(target_name)
+        unset(target_location)
     endforeach()
 
+    add_custom_command(TARGET ${API_VALIDATOR_TARGET} POST_BUILD
+        COMMAND ${post_build_commands}
+        BYPRODUCTS ${byproducts_files}
+        COMMENT "[apiValidator] Check ${API_VALIDATOR_TARGET} and dependencies for OneCore compliance"
+        VERBATIM)
+
     # 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()
 
 #

cmake/developer_package/api_validator/api_validator_run.cmake

@@ -4,28 +4,28 @@
 
 cmake_policy(SET CMP0012 NEW)
 
-foreach(var UWP_API_VALIDATOR UWP_API_VALIDATOR_TARGET
-            UWP_API_VALIDATOR_APIS UWP_API_VALIDATOR_EXCLUSION
-            UWP_API_VALIDATOR_OUTPUT CMAKE_TOOLCHAIN_FILE)
+foreach(var ONECORE_API_VALIDATOR ONECORE_API_VALIDATOR_TARGET
+            ONECORE_API_VALIDATOR_APIS ONECORE_API_VALIDATOR_EXCLUSION
+            ONECORE_API_VALIDATOR_OUTPUT CMAKE_TOOLCHAIN_FILE)
     if(NOT DEFINED ${var})
         message(FATAL_ERROR "Variable ${var} is not defined")
     endif()
 endforeach()
 
 # create command
 
-if(NOT EXISTS "${UWP_API_VALIDATOR_APIS}")
-    message(FATAL_ERROR "${UWP_API_VALIDATOR_APIS} does not exist")
+if(NOT EXISTS "${ONECORE_API_VALIDATOR_APIS}")
+    message(FATAL_ERROR "${ONECORE_API_VALIDATOR_APIS} does not exist")
 endif()
 
-set(command "${UWP_API_VALIDATOR}"
-        -SupportedApiXmlFiles:${UWP_API_VALIDATOR_APIS}
-        -DriverPackagePath:${UWP_API_VALIDATOR_TARGET})
-if(EXISTS "${UWP_API_VALIDATOR_EXCLUSION}")
+set(command "${ONECORE_API_VALIDATOR}"
+        -SupportedApiXmlFiles:${ONECORE_API_VALIDATOR_APIS}
+        -DriverPackagePath:${ONECORE_API_VALIDATOR_TARGET})
+if(EXISTS "${ONECORE_API_VALIDATOR_EXCLUSION}")
     list(APPEND command
-        -BinaryExclusionListXmlFile:${UWP_API_VALIDATOR_EXCLUSION}
+        -BinaryExclusionListXmlFile:${ONECORE_API_VALIDATOR_EXCLUSION}
         -StrictCompliance:TRUE)
-    set(UWP_HAS_BINARY_EXCLUSION ON)
+    set(ONECORE_HAS_BINARY_EXCLUSION ON)
 endif()
 
 # execute
@@ -36,13 +36,13 @@ execute_process(COMMAND ${command}
                 RESULT_VARIABLE exit_code
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-file(WRITE "${UWP_API_VALIDATOR_OUTPUT}" "${output_message}\n\n\n${error_message}")
+file(WRITE "${ONECORE_API_VALIDATOR_OUTPUT}" "CMAKE COMMAND: ${command}\n\n\n${output_message}\n\n\n${error_message}")
 
 # post-process output
 
-get_filename_component(name "${UWP_API_VALIDATOR_TARGET}" NAME)
+get_filename_component(name "${ONECORE_API_VALIDATOR_TARGET}" NAME)
 
-if(NOT UWP_HAS_BINARY_EXCLUSION)
+if(NOT ONECORE_HAS_BINARY_EXCLUSION)
     if(CMAKE_TOOLCHAIN_FILE MATCHES "onecoreuap.toolchain.cmake$")
         # empty since we compile with static MSVC runtime
     else()
@@ -66,7 +66,7 @@ endif()
 
 # write output
 
-if(UWP_HAS_BINARY_EXCLUSION AND NOT exit_code EQUAL 0)
+if(ONECORE_HAS_BINARY_EXCLUSION AND NOT exit_code EQUAL 0)
     message(FATAL_ERROR "${error_message}")
 endif()
 

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:

cmake/developer_package/target_flags.cmake

@@ -20,7 +20,7 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
   set(arch_flag X86_64)
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
   set(arch_flag X86)
-elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*)")
+elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)")
   set(arch_flag AARCH64)
 elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
   set(arch_flag ARM)
@@ -31,8 +31,8 @@ endif()
 set(HOST_${arch_flag} ON)
 
 macro(_ie_process_msvc_generator_platform arch_flag)
-  # if cmake -A <ARM|ARM64> is passed
-  if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+  # if cmake -A <ARM|ARM64|x64|Win32> is passed
+  if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
     set(AARCH64 ON)
   elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
     set(ARM ON)