Merge branch 'master' into torch_2.5_fix

openvinotoolkit · Oct 25, 2024 · 0485102 · 0485102
2 parents fcb21ad + 2d3289e
commit 0485102
Show file tree

Hide file tree

Showing 130 changed files with 4,815 additions and 866 deletions.
diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Cache documentation
         id: cache_sphinx_docs
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: build/docs/_build/.doctrees
           key: sphinx-docs-cache

diff --git a/.github/workflows/job_build_linux.yml b/.github/workflows/job_build_linux.yml
@@ -331,7 +331,7 @@ jobs:
             ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
             ${{ env.BUILD_DIR }}/deb
             ${{ env.MANIFEST_PATH }}
-            ${{ env.STORE_WHEELS == 'true' && format('{0}/wheels', env.BUILD_DIR) || '' }}
+            ${{ env.STORE_WHEELS == 'true' && format('{0}/wheels', env.INSTALL_WHEELS_DIR) || '' }}
           storage_dir: ${{ env.PRODUCT_TYPE }}
           storage_root: ${{ env.ARTIFACTS_SHARE }}
         env:

diff --git a/.github/workflows/job_build_windows.yml b/.github/workflows/job_build_windows.yml
@@ -17,6 +17,10 @@ on:
         description: 'Target branch for the build'
         type: string
         required: true
+      cmake-options:
+        description: 'A string of options passed to CMake'
+        type: string
+        required: true
 
 permissions: read-all
 
@@ -33,7 +37,6 @@ jobs:
     runs-on: ${{ inputs.runner }}
     env:
       CMAKE_BUILD_TYPE: ${{ inputs.build-type }}
-      CMAKE_GENERATOR: 'Ninja Multi-Config'
       CMAKE_CXX_COMPILER_LAUNCHER: ccache
       CMAKE_C_COMPILER_LAUNCHER: ccache
       CCACHE_REMOTE_DIR: C:\\mount\\caches\\ccache\\windows2022_x86_64_${{ inputs.build-type }}\\${{ inputs.target-branch }}
@@ -155,25 +158,13 @@ jobs:
 
       - name: CMake configure
         run: |
-          cmake -G "${{ env.CMAKE_GENERATOR }}" `
-            -DENABLE_CPPLINT=OFF `
-            -DBUILD_SHARED_LIBS=ON `
-            -DENABLE_TESTS=ON `
-            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON `
-            -DENABLE_STRICT_DEPENDENCIES=OFF `
-            -DENABLE_PYTHON=ON `
-            -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON `
-            -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} `
-            -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" `
-            -DOPENVINO_EXTRA_MODULES="${{ env.OPENVINO_CONTRIB_REPO }}/modules/custom_operations;${{ env.OPENVINO_CONTRIB_REPO }}/modules/java_api" `
-            -S ${{ env.OPENVINO_REPO }} `
-            -B ${{ env.BUILD_DIR }}
+          cmake -S ${{ env.OPENVINO_REPO }} -B ${{ env.BUILD_DIR }} ${{ inputs.cmake-options }}
 
       - name: Clean ccache stats
         run: '& ccache --zero-stats'
 
       - name: Cmake build - OpenVINO
-        run: cmake --build ${{ env.BUILD_DIR }} --parallel --verbose
+        run: cmake --build ${{ env.BUILD_DIR }} --config ${{ env.CMAKE_BUILD_TYPE }} --parallel --verbose
 
       - name: Show ccache stats
         run: '& ccache --show-stats'
@@ -225,6 +216,7 @@ jobs:
           if-no-files-found: 'error'
 
       - name: Upload openvino wheels
+        if: ${{ inputs.build-type != 'Debug' }}
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: openvino_wheels
@@ -254,7 +246,9 @@ jobs:
           artifacts: |
             ${{ env.BUILD_DIR }}/openvino_package.zip
             ${{ env.BUILD_DIR }}/openvino_tests.zip
-            ${{ env.INSTALL_WHEELS_DIR }}/wheels
             ${{ env.MANIFEST_PATH }}
+            ${{ env.STORE_WHEELS == 'true' && format('{0}/wheels', env.INSTALL_WHEELS_DIR) || '' }}
           storage_dir: ${{ env.PRODUCT_TYPE }}
           storage_root: ${{ env.ARTIFACTS_SHARE }}
+        env:
+          STORE_WHEELS: ${{ inputs.build-type != 'Debug' }}
diff --git a/.github/workflows/job_cpu_functional_tests.yml b/.github/workflows/job_cpu_functional_tests.yml
@@ -89,7 +89,7 @@ jobs:
         run: python3 -m pip install -r ${INSTALL_TEST_DIR}/functional_test_utils/layer_tests_summary/requirements.txt
 
       - name: Restore tests execution time
-        uses: actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: ${{ env.PARALLEL_TEST_CACHE }}
           key: ${{ runner.os }}-${{ runner.arch }}-tests-functional-cpu-stamp-${{ github.sha }}
@@ -109,7 +109,7 @@ jobs:
         timeout-minutes: 25
 
       - name: Save tests execution time
-        uses: actions/cache/save@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         if: github.ref_name == 'master'
         with:
           path: ${{ env.PARALLEL_TEST_CACHE }}

diff --git a/.github/workflows/job_cxx_unit_tests.yml b/.github/workflows/job_cxx_unit_tests.yml
@@ -20,13 +20,23 @@ on:
         description: 'OS that is used for testing in the form of "ubuntu_20_04"'
         type: string
         required: true
+      build-type:
+        description: 'OpenVINO build type, e.g., "Release"'
+        type: string
+        required: false
+        default: 'Release'
+      timeout-minutes:
+        description: 'Timeout in minutes for the job'
+        type: number
+        required: false
+        default: 35
 
 permissions: read-all
 
 jobs:
   CXX_Unit_Tests:
     name: C++ unit tests
-    timeout-minutes: ${{ contains(inputs.runner, 'win') && 50 || 35 }}
+    timeout-minutes: ${{ inputs.timeout-minutes }}
     runs-on: ${{ inputs.runner }}
     container:
       image: ${{ inputs.image }}
@@ -165,7 +175,6 @@ jobs:
         if: ${{ fromJSON(inputs.affected-components).transformations.test && runner.arch != 'ARM64' }} # Ticket: 126281
         run: |
           ${{ env.SETUPVARS_COMMAND }}
-
           ${{ env.INSTALL_TEST_DIR }}/ov_transformations_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-Transformations.xml
 
       - name: Common test utils tests
@@ -208,8 +217,9 @@ jobs:
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_auto_func_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ov_auto_func_tests.xml
 
+      # Disabled for debug build due to long execution time
       - name: Template plugin func tests
-        if: fromJSON(inputs.affected-components).TEMPLATE.test
+        if: ${{ fromJSON(inputs.affected-components).TEMPLATE.test && inputs.build-type != 'debug' }}
         run: |
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_template_func_tests --gtest_print_time=1 --gtest_filter=*smoke* --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-TemplateFuncTests.xml
@@ -231,9 +241,10 @@ jobs:
         run: |
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_auto_batch_unit_tests --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ov_auto_batch_unit_tests.xml
-
+      
+      # Disabled for debug build due to long execution time
       - name: AutoBatch func tests
-        if: fromJSON(inputs.affected-components).AUTO_BATCH.test
+        if: ${{ fromJSON(inputs.affected-components).AUTO_BATCH.test && inputs.build-type != 'debug' }}
         run: |
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_auto_batch_func_tests --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-ov_auto_batch_func_tests.xml --gtest_filter="*smoke*"
@@ -250,8 +261,9 @@ jobs:
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_hetero_unit_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OVHeteroUnitTests.xml
 
+      # Disabled for debug build due to long execution time
       - name: Hetero func tests
-        if: ${{ fromJSON(inputs.affected-components).HETERO.test && inputs.os != 'debian_10' }} # Ticket: 153170
+        if: ${{ fromJSON(inputs.affected-components).HETERO.test && inputs.os != 'debian_10' && inputs.build-type != 'debug' }} # Ticket: 153170
         run: |
           ${{ env.SETUPVARS_COMMAND }}
           ${{ env.INSTALL_TEST_DIR }}/ov_hetero_func_tests --gtest_print_time=1 --gtest_output=xml:${{ env.INSTALL_TEST_DIR }}/TEST-OVHeteroFuncTests.xml --gtest_filter="*smoke*"

diff --git a/.github/workflows/job_pytorch_models_tests.yml b/.github/workflows/job_pytorch_models_tests.yml
@@ -22,7 +22,7 @@ permissions: read-all
 jobs:
   PyTorch_Models_Tests:
     name: PyTorch Models tests
-    timeout-minutes: ${{ inputs.model_scope == 'precommit' && 35 || 400 }}
+    timeout-minutes: ${{ inputs.model_scope == 'precommit' && 40 || 400 }}
     runs-on: ${{ inputs.runner }}
     container: ${{ fromJSON(inputs.container) }}
     defaults:
@@ -105,8 +105,7 @@ jobs:
           python3 -m pip install ./openvino_tokenizers-*
         working-directory: ${{ env.INSTALL_WHEELS_DIR }}
 
-      - name: Install PyTorch tests requirements for precommit
-        if: ${{ inputs.model_scope == 'precommit' }}
+      - name: Install PyTorch tests requirements
         run: |
           python3 -m pip install -r ${INSTALL_TEST_DIR}/requirements_pytorch
         env:
@@ -116,7 +115,7 @@ jobs:
         if: ${{ inputs.model_scope == 'precommit' || inputs.model_scope == 'nightly_scope1' }}
         run: |
           export PYTHONPATH=${MODEL_HUB_TESTS_INSTALL_DIR}:$PYTHONPATH
-          python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/pytorch/ -m ${TYPE} --html=${INSTALL_TEST_DIR}/TEST-torch_model_timm_tv_${{ inputs.model_scope }}_tests.html --self-contained-html -v -n 2 -k "TestTimmConvertModel or TestTorchHubConvertModel or TestEdsrConvertModel"
+          python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/pytorch/ -m ${TYPE} --html=${INSTALL_TEST_DIR}/TEST-torch_model_timm_tv_${{ inputs.model_scope }}_tests.html --self-contained-html -v -n 4 -k "TestTimmConvertModel or TestTorchHubConvertModel or TestEdsrConvertModel"
         env:
           TYPE: ${{ inputs.model_scope == 'precommit' && 'precommit' || 'nightly' }}
           TEST_DEVICE: CPU

diff --git a/.github/workflows/mo.yml b/.github/workflows/mo.yml
@@ -32,7 +32,7 @@ jobs:
           python-version: '3.10'
 
       - name: Cache pip
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('tools/mo/requirements*.txt') }}

diff --git a/.github/workflows/ovc.yml b/.github/workflows/ovc.yml
@@ -27,7 +27,7 @@ jobs:
           python-version: '3.10'
 
       - name: Cache pip
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('src/bindings/python/requirements*.txt') }}

diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml
@@ -387,7 +387,7 @@ jobs:
         run: python3 -m pip install -r ${{ env.INSTALL_TEST_DIR }}/layer_tests_summary/requirements.txt
 
       - name: Restore tests execution time
-        uses: actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: ${{ env.PARALLEL_TEST_CACHE }}
           key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}

diff --git a/.github/workflows/windows_vs2019_debug.yml b/.github/workflows/windows_vs2019_debug.yml
@@ -2,6 +2,7 @@ name: Windows (VS 2019, Python 3.11, Debug)
 on:
   workflow_dispatch:
   merge_group:
+  pull_request:
   push:
     branches:
       - master
@@ -52,10 +53,21 @@ jobs:
     if: "!needs.smart_ci.outputs.skip_workflow"
     uses: ./.github/workflows/job_build_windows.yml
     with:
-      runner: 'aks-win-16-cores-32gb'
+      runner: 'aks-win-32-cores-128gb'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       build-type: 'Debug'
       target-branch: ${{ needs.smart_ci.outputs.target_branch }}
+      cmake-options: |-
+        -G "Ninja" `
+        -DENABLE_PYTHON=OFF `
+        -DENABLE_CPPLINT=OFF `
+        -DBUILD_SHARED_LIBS=ON `
+        -DENABLE_TESTS=ON `
+        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON `
+        -DENABLE_STRICT_DEPENDENCIES=OFF `
+        -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON `
+        -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" `
+        -DOPENVINO_EXTRA_MODULES="${env:OPENVINO_CONTRIB_REPO }}/modules/custom_operations;${env:OPENVINO_CONTRIB_REPO}/modules/java_api"
 
   CXX_Unit_Tests:
     name: C++ unit tests
@@ -65,7 +77,9 @@ jobs:
       runner: 'aks-win-4-cores-8gb'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       os: 'windows_2019'
-
+      build-type: 'Debug'
+      timeout-minutes: 60
+
   Overall_Status:
     name: ci/gha_overall_status_windows_debug
     needs: [ Smart_CI, Build, CXX_Unit_Tests ]
@@ -78,4 +92,4 @@ jobs:
             contains(needs.*.result, 'failure') ||
             contains(needs.*.result, 'cancelled')
           }}
-        run: exit 1
+        run: exit 1
diff --git a/.github/workflows/windows_vs2019_release.yml b/.github/workflows/windows_vs2019_release.yml
@@ -59,6 +59,17 @@ jobs:
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       build-type: 'Release'
       target-branch: ${{ needs.smart_ci.outputs.target_branch }}
+      cmake-options: |-
+            -G "Ninja Multi-Config" `
+            -DENABLE_PYTHON=ON `
+            -DENABLE_CPPLINT=OFF `
+            -DBUILD_SHARED_LIBS=ON `
+            -DENABLE_TESTS=ON `
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON `
+            -DENABLE_STRICT_DEPENDENCIES=OFF `
+            -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON `
+            -DCUSTOM_OPERATIONS="calculate_grid;complex_mul;fft;grid_sample;sparse_conv;sparse_conv_transpose" `
+            -DOPENVINO_EXTRA_MODULES="${env:OPENVINO_CONTRIB_REPO }}/modules/custom_operations;${env:OPENVINO_CONTRIB_REPO}/modules/java_api"
 
   Samples:
     needs: [ Build, Smart_CI ]
@@ -424,6 +435,8 @@ jobs:
       runner: 'aks-win-4-cores-8gb'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       os: 'windows_2019'
+      build-type: 'Release'
+      timeout-minutes: 50
 
   CPU_Functional_Tests:
     name: CPU functional tests
@@ -481,7 +494,7 @@ jobs:
         run: python3 -m pip install -r ${{ github.workspace }}\install\tests\functional_test_utils\layer_tests_summary\requirements.txt
 
       - name: Restore tests execution time
-        uses: actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: ${{ env.PARALLEL_TEST_CACHE }}
           key: ${{ runner.os }}-tests-functional-cpu-stamp-${{ github.sha }}
@@ -495,7 +508,7 @@ jobs:
         timeout-minutes: 60
 
       - name: Save tests execution time
-        uses: actions/cache/save@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         if: github.ref_name == 'master'
         with:
           path: ${{ env.PARALLEL_TEST_CACHE }}

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,5 +1,10 @@
 # Security Policy
 
+## Security practices
+
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9611/badge)](https://www.bestpractices.dev/projects/9611)
+[![Coverity](https://scan.coverity.com/projects/21921/badge.svg)](https://scan.coverity.com/projects/openvino)
+
 ## Report a Vulnerability
 
 Please report security issues or vulnerabilities to the [Intel® Security Center].

diff --git a/conan.lock b/conan.lock
@@ -10,7 +10,7 @@
         "opencl-icd-loader/2023.04.17#5f73dd9f0c023d416a7f162e320b9c77%1692732261.088",
         "opencl-headers/2023.04.17#3d98f2d12a67c2400de6f11d5335b5a6%1683936272.16",
         "opencl-clhpp-headers/2023.04.17#7c62fcc7ac2559d4839150d2ebaac5c8%1685450803.672",
-        "onnx/1.16.2#b5e8d35b10d454b26751762922465eb8%1712404811.278",
+        "onnx/1.17.0#c79fdfca3ae149874153de15a20f4598%1727864447.241",
         "onetbb/2021.10.0#cbb2fc43088070b48f6e4339bc8fa0e1%1693812561.235",
         "ittapi/3.24.0#9246125f13e7686dee2b0c992b71db94%1682969872.743",
         "hwloc/2.9.2#1c63e2eccac57048ae226e6c946ebf0e%1688677682.002",
@@ -33,4 +33,4 @@
     ],
     "python_requires": [],
     "config_requires": []
-}
+}
diff --git a/conanfile.txt b/conanfile.txt
@@ -7,7 +7,7 @@ opencl-icd-loader/[>=2023.04.17]
 rapidjson/[>=1.1.0]
 xbyak/[>=6.62]
 snappy/[>=1.1.7]
-onnx/1.16.2
+onnx/1.17.0
 pybind11/[>=2.12.0]
 flatbuffers/[>=22.9.24]
 

diff --git a/...rticles_en/documentation/openvino-ir-format/operation-sets/available-opsets.rst b/...rticles_en/documentation/openvino-ir-format/operation-sets/available-opsets.rst
@@ -10,6 +10,7 @@ Available Operation Sets
    :maxdepth: 1
    :hidden:
 
+   available-opsets/opset15
    available-opsets/opset14
    available-opsets/opset13
    available-opsets/opset12
@@ -34,7 +35,9 @@ This topic provides a complete list of available sets of operations supported in
     :header-rows: 1
 
     * - OpenVINO™ Version
-      - Actual Operations Set
+      - Operation Set
+    * - 2024.5
+      - :doc:`opset15 <available-opsets/opset15>`
     * - 2024.0
       - :doc:`opset14 <available-opsets/opset14>`
     * - 2023.2
@@ -71,4 +74,3 @@ See Also
 
 * :doc:`Operation Sets in OpenVINO <../operation-sets>`
 * :doc:`OpenVINO IR format <../../openvino-ir-format>`
-