Merge branch 'master' into haiqi/add_infer_request_test

zhaixuejun1993 · Nov 20, 2023 · 69e1926 · 69e1926
2 parents 03627d9 + 5203d34
commit 69e1926
Show file tree

Hide file tree

Showing 552 changed files with 24,796 additions and 9,737 deletions.
diff --git a/.github/components.yml b/.github/components.yml
@@ -34,7 +34,6 @@ HETERO:
     - HETERO
     - AUTO_BATCH
     - TEMPLATE
-    - AUTO
     - C_API
     - Python_API
   build:
@@ -48,7 +47,6 @@ AUTO_BATCH:
     - HETERO
     - AUTO_BATCH
     - TEMPLATE
-    - AUTO
     - C_API
     - Python_API
   build:
@@ -70,11 +68,6 @@ TEMPLATE:
 
 AUTO:
   revalidate:
-    - CPU
-    - GPU
-    - GNA
-    - HETERO
-    - AUTO_BATCH
     - TEMPLATE
     - AUTO
     - C_API

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -818,11 +818,11 @@ jobs:
           ${INSTALL_TEST_DIR}/ov_cpu_unit_tests --gtest_print_time=1 \
                 --gtest_output=xml:${INSTALL_TEST_DIR}/TEST-CPUUnitTests.xml
 
-      - name: SubgraphsDumper tests
+      - name: ov_subgraphs_dumper_tests tests
         run: |
           source ${INSTALL_DIR}/setupvars.sh
-          ${INSTALL_TEST_DIR}/subgraphsDumperTests --gtest_print_time=1 \
-                --gtest_output=xml:${INSTALL_TEST_DIR}/TEST-SubgraphsDumperTests.xml
+          ${INSTALL_TEST_DIR}/ov_subgraphs_dumper_tests --gtest_print_time=1 \
+                --gtest_output=xml:${INSTALL_TEST_DIR}/TEST-ov_subgraphs_dumper_tests.xml
 
       - name: Template OpImpl tests
         run: |

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -457,11 +457,11 @@ jobs:
           ${{ env.INSTALL_TEST_DIR }}/ov_cpu_unit_tests --gtest_print_time=1 \
                 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-CPUUnitTests.xml
 
-      - name: SubgraphsDumper tests
+      - name: ov_subgraphs_dumper_tests tests
         run: |
           source ${{ env.INSTALL_DIR }}/setupvars.sh
-          ${{ env.INSTALL_TEST_DIR }}/subgraphsDumperTests --gtest_print_time=1 \
-                --gtest_output=xml:${INSTALL_TEST_DIR}/TEST-SubgraphsDumperTests.xml
+          ${{ env.INSTALL_TEST_DIR }}/ov_subgraphs_dumper_tests --gtest_print_time=1 \
+                --gtest_output=xml:${INSTALL_TEST_DIR}/TEST-ov_subgraphs_dumper_tests.xml
 
       - name: Template OpImpl tests
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -599,10 +599,10 @@ jobs:
         run: |
           call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/ov_cpu_unit_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-CPUUnitTests.xml
 
-      - name: SubgraphsDumper tests
+      - name: ov_subgraphs_dumper_tests tests
         shell: cmd
         run: |
-          call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/subgraphsDumperTests   --gtest_print_time=1 --device=TEMPLATE --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-SubgraphsDumperTests.xml
+          call "${{ env.INSTALL_DIR }}\\setupvars.bat" && ${{ env.INSTALL_TEST_DIR }}/ov_subgraphs_dumper_tests --gtest_print_time=1 --device=TEMPLATE --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-SubgraphsDumperTests.xml
 
       - name: Template OpImpl tests
         shell: cmd

diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
@@ -85,12 +85,13 @@ unset(protobuf_installed CACHE)
 #                 FILEDESCRIPTION <description> # used on Windows to describe DLL file
 #                 [LINKABLE_FRONTEND] # whether we can use FE API directly or via FEM only
 #                 [SKIP_INSTALL] # private frontend, not for end users
+#                 [PROTOBUF_REQUIRED] # options to denote that protobuf is used
 #                 [PROTOBUF_LITE] # requires only libprotobuf-lite
 #                 [SKIP_NCC_STYLE] # use custom NCC rules
 #                 [LINK_LIBRARIES <lib1 lib2 ...>])
 #
 macro(ov_add_frontend)
-    set(options LINKABLE_FRONTEND PROTOBUF_LITE SKIP_NCC_STYLE SKIP_INSTALL)
+    set(options LINKABLE_FRONTEND PROTOBUF_REQUIRED PROTOBUF_LITE SKIP_NCC_STYLE SKIP_INSTALL)
     set(oneValueArgs NAME FILEDESCRIPTION)
     set(multiValueArgs LINK_LIBRARIES PROTO_FILES)
     cmake_parse_arguments(OV_FRONTEND "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -171,15 +172,15 @@ macro(ov_add_frontend)
 
     # Create library
     add_library(${TARGET_NAME} ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS}
-        ${PROTO_SRCS} ${PROTO_HDRS} ${flatbuffers_schema_files} ${proto_files})
+                               ${PROTO_SRCS} ${PROTO_HDRS} ${flatbuffers_schema_files} ${proto_files})
 
     if(OV_FRONTEND_LINKABLE_FRONTEND)
         # create beautiful alias
         add_library(openvino::frontend::${OV_FRONTEND_NAME} ALIAS ${TARGET_NAME})
     endif()
 
     # Shutdown protobuf when unloading the frontend dynamic library
-    if(proto_files AND BUILD_SHARED_LIBS)
+    if(OV_FRONTEND_PROTOBUF_REQUIRED AND BUILD_SHARED_LIBS)
         target_link_libraries(${TARGET_NAME} PRIVATE openvino::protobuf_shutdown)
     endif()
 
@@ -208,17 +209,17 @@ macro(ov_add_frontend)
     target_link_libraries(${TARGET_NAME} PRIVATE ${OV_FRONTEND_LINK_LIBRARIES} PUBLIC openvino::runtime)
     ov_add_library_version(${TARGET_NAME})
 
-    # WA for TF frontends which always require protobuf (not protobuf-lite)
-    # if TF FE is built in static mode, use protobuf for all other FEs
-    if(FORCE_FRONTENDS_USE_PROTOBUF)
-        set(OV_FRONTEND_PROTOBUF_LITE OFF)
-    endif()
-    # if protobuf::libprotobuf-lite is not available, use protobuf::libprotobuf
-    if(NOT TARGET protobuf::libprotobuf-lite)
-        set(OV_FRONTEND_PROTOBUF_LITE OFF)
-    endif()
+    if(OV_FRONTEND_PROTOBUF_REQUIRED)
+        # WA for TF frontends which always require protobuf (not protobuf-lite)
+        # if TF FE is built in static mode, use protobuf for all other FEs
+        if(FORCE_FRONTENDS_USE_PROTOBUF)
+            set(OV_FRONTEND_PROTOBUF_LITE OFF)
+        endif()
+        # if protobuf::libprotobuf-lite is not available, use protobuf::libprotobuf
+        if(NOT TARGET protobuf::libprotobuf-lite)
+            set(OV_FRONTEND_PROTOBUF_LITE OFF)
+        endif()
 
-    if(proto_files)
         if(OV_FRONTEND_PROTOBUF_LITE)
             set(protobuf_target_name libprotobuf-lite)
             set(protobuf_install_name "protobuf_lite_installed")

diff --git a/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake b/cmake/developer_package/ncc_naming_style/ncc_naming_style.cmake
@@ -32,6 +32,8 @@ if(ENABLE_NCC_STYLE)
         set(clang_version 14)
     elseif(Python3_VERSION_MINOR EQUAL 11)
         set(clang_version 14)
+    elseif(Python3_VERSION_MINOR EQUAL 12)
+        set(clang_version 15)
     else()
         message(WARNING "Cannot suggest clang package for python ${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
     endif()

diff --git a/cmake/developer_package/ncc_naming_style/requirements_dev.txt b/cmake/developer_package/ncc_naming_style/requirements_dev.txt
@@ -2,4 +2,5 @@ clang==12.0.1; python_version == '3.8'
 clang==12.0.1; python_version == '3.9'
 clang==14.0; python_version == '3.10'
 clang==14.0; python_version == '3.11'
+clang==15.0.7; python_version == '3.12'
 pyyaml
diff --git a/cmake/packaging/debian.cmake b/cmake/packaging/debian.cmake
@@ -92,6 +92,7 @@ macro(ov_cpack_settings)
         2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5
         2023.0.0 2023.0.1 2023.0.2 2023.0.3
         2023.1.0
+        2023.2.0
         )
 
     #

diff --git a/cmake/packaging/rpm.cmake b/cmake/packaging/rpm.cmake
@@ -78,6 +78,7 @@ macro(ov_cpack_settings)
         2022.3.0 2022.3.1 2022.3.2 2022.3.3 2022.3.4 2022.3.5
         2023.0.0 2023.0.1 2023.0.2 2023.0.3
         2023.1.0
+        2023.2.0
         )
 
     find_host_program(rpmlint_PROGRAM NAMES rpmlint DOC "Path to rpmlint")

diff --git a/docs/_static/benchmarks_files/OV-2023.0-Performance-Data.xlsx b/docs/_static/benchmarks_files/OV-2023.0-Performance-Data.xlsx
diff --git a/docs/_static/benchmarks_files/OV-2023.1-Platform_list.pdf b/docs/_static/benchmarks_files/OV-2023.1-Platform_list.pdf
diff --git a/docs/_static/benchmarks_files/OV-2023.1-system-info-detailed.xlsx b/docs/_static/benchmarks_files/OV-2023.1-system-info-detailed.xlsx
diff --git a/docs/_static/benchmarks_files/OV-2023.2-Performance-Data.xlsx b/docs/_static/benchmarks_files/OV-2023.2-Performance-Data.xlsx
diff --git a/docs/_static/benchmarks_files/OV-2023.2-platform_list.pdf b/docs/_static/benchmarks_files/OV-2023.2-platform_list.pdf
diff --git a/docs/_static/benchmarks_files/OV-2023.2-system-info-detailed.xlsx b/docs/_static/benchmarks_files/OV-2023.2-system-info-detailed.xlsx