Merge remote-tracking branch 'upstream/master' into xuejun/set_elemen…

…t_type_private

.github/components.yml

@@ -82,7 +82,6 @@ TEMPLATE:
     - C_API
     - Python_API
     - NVIDIA
-    - TOKENIZERS
   build:
     - IR_FE
 
@@ -130,6 +129,7 @@ TF_FE:
   build:
     - CPU
     - Python_API
+    - TOKENIZERS
 
 TFL_FE:
   revalidate:
@@ -144,6 +144,7 @@ PyTorch_FE:
   build:
     - CPU
     - Python_API
+    - TOKENIZERS
 
 C_API:
   build:
@@ -196,7 +197,6 @@ IE_Tests:
     - TEMPLATE
     - AUTO
     - NVIDIA
-    - TOKENIZERS
   build:
     - IR_FE
 

.github/workflows/android_arm64.yml

@@ -5,7 +5,7 @@ on:
   merge_group:
   push:
     branches:
-      - master
+      # - master
       - 'releases/**'
 
 concurrency:

.github/workflows/coverity.yml

@@ -146,3 +146,15 @@ jobs:
               --form description="https://github.com/openvinotoolkit/openvino/runs/${{ github.run_number }}" \
               https://scan.coverity.com/builds?project=openvino
           popd
+
+      - name: Show Coverity configure logs
+        continue-on-error: true
+        run: cov-configure -c ${COVERITY_TOOL_DIR}/cov-analysis-linux64-2023.6.2/config/coverity_config.xml -lscc text
+
+      - name: Upload Coverity logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: coverity_logs
+          path: ${{ env.BUILD_DIR }}/cov-int/build-log.txt
+          if-no-files-found: 'error'

.github/workflows/fedora.yml

@@ -5,7 +5,7 @@ on:
   merge_group:
   push:
     branches:
-      - master
+      # - master
       - 'releases/**'
 
 concurrency:

.github/workflows/job_pytorch_models_tests.yml

@@ -51,6 +51,12 @@ jobs:
           name: openvino_package
           path: ${{ env.INSTALL_DIR }}
 
+      - name: Download OpenVINO tokenizers extension
+        uses: actions/download-artifact@v3
+        with:
+          name: openvino_tokenizers_wheel
+          path: ${{ env.INSTALL_DIR }}
+
       - name: Download OpenVINO tests package
         uses: actions/download-artifact@v3
         with:
@@ -98,7 +104,9 @@ jobs:
           self-hosted-runner: ${{ contains(inputs.runner, 'aks') }}
 
       - name: Install OpenVINO Python wheels
-        run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
+        run: |
+          python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
+          python3 -m pip install ${INSTALL_DIR}/openvino_tokenizers-*
 
       - name: Install PyTorch tests requirements
         run: |

.github/workflows/job_tensorflow_hub_models_tests.yml

@@ -51,6 +51,12 @@ jobs:
           name: openvino_package
           path: ${{ env.INSTALL_DIR }}
 
+      - name: Download OpenVINO tokenizers extension
+        uses: actions/download-artifact@v3
+        with:
+          name: openvino_tokenizers_wheel
+          path: ${{ env.INSTALL_DIR }}
+
       - name: Download OpenVINO tests package
         uses: actions/download-artifact@v3
         with:
@@ -97,7 +103,9 @@ jobs:
           self-hosted-runner: ${{ contains(inputs.runner, 'aks') }}
 
       - name: Install OpenVINO Python wheels
-        run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
+        run: |
+          python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
+          python3 -m pip install ${INSTALL_DIR}/openvino_tokenizers-*
 
       - name: Install TF Hub tests requirements
         run: python3 -m pip install -r ${MODEL_HUB_TESTS_INSTALL_DIR}/tf_hub_tests/requirements.txt

.github/workflows/linux.yml

@@ -479,7 +479,7 @@ jobs:
     name: TensorFlow Hub Models tests
     if: fromJSON(needs.smart_ci.outputs.affected_components).TF_FE.test ||
         fromJSON(needs.smart_ci.outputs.affected_components).TFL_FE.test
-    needs: [ Build, Smart_CI ]
+    needs: [ Build, Smart_CI, Openvino_tokenizers ]
     uses: ./.github/workflows/job_tensorflow_hub_models_tests.yml
     with:
       runner: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-16-cores' || 'ubuntu-20.04-8-cores' }}
@@ -493,7 +493,7 @@ jobs:
   PyTorch_Models_Tests:
     name: PyTorch Models tests
     if: fromJSON(needs.smart_ci.outputs.affected_components).PyTorch_FE.test
-    needs: [ Build, Smart_CI ]
+    needs: [ Build, Smart_CI, Openvino_tokenizers ]
     uses: ./.github/workflows/job_pytorch_models_tests.yml
     with:
       runner: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-16-cores' || 'ubuntu-20.04-8-cores' }}

.github/workflows/linux_arm64.yml

@@ -5,7 +5,7 @@ on:
   merge_group:
   push:
     branches:
-      - master
+      # - master
       - 'releases/**'
 
 concurrency:

.github/workflows/linux_riscv.yml

@@ -60,8 +60,8 @@ jobs:
       OPENVINO_REPO: /__w/openvino/openvino/openvino
       OPENVINO_BUILD_DIR: /__w/openvino/openvino/openvino_build
       INSTALL_DIR: /__w/openvino/openvino/openvino_install
-      CONAN_USER_HOME: /mount/caches/ccache/ubuntu22_riscv64_master_release/.conan
-      CCACHE_DIR: /mount/caches/ccache/ubuntu22_riscv64_master_release
+      CONAN_USER_HOME: /mount/caches/ccache/ubuntu22_riscv64_master/.conan
+      CCACHE_DIR: /mount/caches/ccache/ubuntu22_riscv64_master
       CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
       CCACHE_MAXSIZE: 50G
     if: ${{ !needs.smart_ci.outputs.skip_workflow && github.event_name != 'merge_group' }}
@@ -220,7 +220,7 @@ jobs:
       - name: Check status of all jobs
         if: >-
           ${{
-            contains(needs.*.result, 'failure') || 
+            contains(needs.*.result, 'failure') ||
             contains(needs.*.result, 'cancelled')
           }}
         run: exit 1

.github/workflows/webassembly.yml

@@ -5,7 +5,7 @@ on:
   merge_group:
   push:
     branches:
-      - master
+      # - master
       - 'releases/**'
 
 concurrency:

cmake/developer_package/cross_compile/cross_compiled_disp_gen.cmake

@@ -7,7 +7,7 @@
 # Generates cpp file with dispatcher for cross compiled function
 # Parameters:
 #   XARCH_API_HEADER -- path to header with function declaration
-#   XARCH_FUNC_NAME -- name of function to dispatch
+#   XARCH_FUNC_NAMES -- names of functions to dispatch
 #   XARCH_NAMESPACES -- full namespace used to keep ODR
 #   XARCH_DISP_FILE -- dispatcher file name to generate
 #   XARCH_SET -- set of ARCH supported by dispatcher. semicolon-delimited
@@ -21,9 +21,6 @@ set(_CPU_CHECK_AVX2    "with_cpu_x86_avx2()")
 set(_CPU_CHECK_AVX512F "with_cpu_x86_avx512f()")
 
 function(_generate_dispatcher)
-    _find_signature_in_file(${XARCH_API_HEADER} ${XARCH_FUNC_NAME} SIGNATURE)
-    _generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)
-
     string(REPLACE "::" ";" XARCH_NAMESPACES "${XARCH_NAMESPACES}")
 
     list(GET XARCH_NAMESPACES -1 XARCH_CURRENT_NAMESPACE)
@@ -46,20 +43,25 @@ function(_generate_dispatcher)
             "namespace ${_namespace} {\n")
     endforeach()
 
-    foreach(_arch ${XARCH_SET})
-        string(APPEND DISP_CONTENT
-            "namespace ${_arch} {\n    ${SIGNATURE}\; \n}\n")
-    endforeach()
+    foreach(_func_name ${XARCH_FUNC_NAMES})
+        _find_signature_in_file(${XARCH_API_HEADER} ${_func_name} SIGNATURE)
+        _generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)
 
-    string(APPEND DISP_CONTENT
-            "namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")
+        foreach(_arch ${XARCH_SET})
+            string(APPEND DISP_CONTENT
+                "namespace ${_arch} {\n    ${SIGNATURE}\; \n}\n")
+        endforeach()
 
-    foreach(_arch ${XARCH_SET})
         string(APPEND DISP_CONTENT
-            "    if (${_CPU_CHECK_${_arch}}) {\n        return ${_arch}::${CALL_LINE}\;\n    }\n")
-    endforeach()
+                "namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")
+
+        foreach(_arch ${XARCH_SET})
+            string(APPEND DISP_CONTENT
+                "    if (${_CPU_CHECK_${_arch}}) {\n        return ${_arch}::${CALL_LINE}\;\n    }\n")
+        endforeach()
 
-    string(APPEND DISP_CONTENT "}\n\n}\n")
+        string(APPEND DISP_CONTENT "}\n\n}\n")
+    endforeach()
 
     foreach(_namespace ${PARENT_NAMESPACES})
         string(APPEND DISP_CONTENT "}  // namespace ${_namespace}\n")

cmake/developer_package/cross_compile/cross_compiled_func.cmake

@@ -53,14 +53,15 @@ set(DISPATCHER_GEN_OPTIONS_HOLDER ${CMAKE_CURRENT_LIST_DIR}/cross_compiled_disp_
 #            AVX512F   <source_file>
 #         API <header_file>
 #         NAMESPACE <namespace>   # like "IE::Ext::CPU::XARCH"
-#         NAME <function_name>    # like "my_fun"
+#         NAME <function_names>    # like "my_fun1 my_fun2"
 #     )
 #
 function(cross_compiled_file TARGET)
     set(oneValueArgs   API        ## Header with declaration of cross compiled function
                        NAMESPACE  ## The namespace where cross compiled function was declared
-                       NAME)      ## String with function signature to make cross compiled
-    set(multiValueArgs ARCH)      ## List of architecture described in _ARCH_LIST
+                       )
+    set(multiValueArgs NAME       ## String with function signatures to make cross compiled
+                       ARCH)      ## List of architecture described in _ARCH_LIST
     cmake_parse_arguments(X "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     ## verification
@@ -92,7 +93,7 @@ function(cross_compiled_file TARGET)
         endif()
     endforeach()
 
-    _add_dispatcher_to_target(${TARGET} ${X_API} ${X_NAME} "${X_NAMESPACE}" "${_FULL_ARCH_SET}")
+    _add_dispatcher_to_target(${TARGET} ${X_API} "${X_NAME}" "${X_NAMESPACE}" "${_FULL_ARCH_SET}")
 endfunction()
 
 
@@ -155,7 +156,7 @@ function(_add_dispatcher_to_target TARGET HEADER FUNC_NAME NAMESPACE ARCH_SET)
     add_custom_command(
             OUTPUT  ${DISPATCHER_SOURCE}
             COMMAND ${CMAKE_COMMAND}
-                    -D "XARCH_FUNC_NAME=${X_NAME}"
+                    -D "XARCH_FUNC_NAMES=${X_NAME}"
                     -D "XARCH_NAMESPACES=${NAMESPACE}"
                     -D "XARCH_API_HEADER=${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}"
                     -D "XARCH_DISP_FILE=${CMAKE_CURRENT_BINARY_DIR}/${DISPATCHER_SOURCE}"

cmake/packaging/debian.cmake

@@ -51,8 +51,8 @@ macro(ov_cpack_settings)
            NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO}_python.*" AND
            # because in case of .deb package, pyopenvino_package_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} is installed
            (NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
-           # temporary block nvidia
-           NOT item STREQUAL "nvidia" AND
+           # temporary block NVIDIA and NPU
+           NOT item MATCHES "^(nvidia|npu)$" AND
            # don't install Intel OpenMP
            NOT item STREQUAL "omp" AND
            # the same for pugixml

cmake/packaging/rpm.cmake

@@ -37,8 +37,8 @@ macro(ov_cpack_settings)
            NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO}_python.*" AND
            # because in case of .rpm package, pyopenvino_package_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} is installed
            (NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
-           # temporary block nvidia
-           NOT item STREQUAL "nvidia" AND
+           # temporary block NVIDIA and NPU
+           NOT item MATCHES "^(nvidia|npu)$" AND
            # don't install Intel OpenMP
            NOT item STREQUAL "omp" AND
            # the same for pugixml

cmake/templates/openvino.pc.in

@@ -9,14 +9,13 @@ exec_prefix=${prefix}/@OV_CPACK_RUNTIMEDIR@
 libdir=${exec_prefix}
 
 include_prefix=${prefix}/@OV_CPACK_INCLUDEDIR@
-includedir_old=${include_prefix}/ie
 includedir_new=${include_prefix}
 
 Name: OpenVINO
 Description: OpenVINO™ Toolkit
 URL: https://docs.openvino.ai/latest/index.html
 Version: @OpenVINO_VERSION@
 Conflicts: openvino < @OpenVINO_VERSION@
-Cflags: -I${includedir_old} -I${includedir_new} @PKGCONFIG_OpenVINO_DEFINITIONS@
+Cflags: -I${includedir_new} @PKGCONFIG_OpenVINO_DEFINITIONS@
 Libs: -L${libdir} @PKGCONFIG_OpenVINO_FRONTENDS@ -lopenvino_c -lopenvino @PKGCONFIG_OpenVINO_PRIVATE_DEPS@
 Libs.private: -ldl -lm -lpthread -lrt

docs/articles_en/documentation/openvino_ir/operation_sets/operations_specifications/activation/Swish_4.rst

@@ -5,7 +5,7 @@ Swish
 
 
 .. meta::
-  :description: Learn about Swish-4 - an element-wise, activation operation, which 
+  :description: Learn about Swish-4 - an element-wise, activation operation, which
                 can be performed on a single tensor in OpenVINO.
 
 **Versioned name**: *Swish-4*
@@ -55,7 +55,7 @@ Example: Second input ``beta`` provided
                 <dim>256</dim>
                 <dim>56</dim>
             </port>
-            <port id="1">  < !-- beta value: 2.0 -->
+            <port id="1">  <!-- beta value: 2.0 -->
             </port>
         </input>
         <output>