Merge remote-tracking branch 'upstream/master' into telemetry_optimum

popovaan · Apr 15, 2024 · a294a28 · a294a28
2 parents d6eebb2 + 5098aca
commit a294a28
Show file tree

Hide file tree

Showing 142 changed files with 3,083 additions and 2,151 deletions.
diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml
@@ -87,7 +87,6 @@ jobs:
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/json
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gtest
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gflags
-            git submodule update --init -- ${OPENVINO_REPO}/thirdparty/open_model_zoo
           popd
 
       - name: Clone vcpkg

diff --git a/.github/workflows/job_debian_packages.yml b/.github/workflows/job_debian_packages.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Install debian packages & check conflicts
         run: |
           apt-get update -y
-          
+
           if [[ "${{ runner.arch }}" == "X64" ]]; then
             # Install debian packages from previous release
             apt-get install --no-install-recommends -y gnupg wget ca-certificates
@@ -66,21 +66,26 @@ jobs:
         run: |
           /usr/share/openvino/samples/cpp/build_samples.sh
           /usr/share/openvino/samples/c/build_samples.sh
-          
+
           [[ "${{ runner.arch }}" == "X64" ]] && path_by_arch="intel64" || path_by_arch="aarch64"
           ~/openvino_cpp_samples_build/$path_by_arch/Release/hello_query_device
-          
+
+          # check integrity of OpenVINO Python API installation
+          apt-get install python3-pip -y
+          python3 -m pip check
+
           python3 /usr/share/openvino/samples/python/hello_query_device/hello_query_device.py
           python3 -c 'from openvino import Core; Core().get_property("CPU", "AVAILABLE_DEVICES")'
-          
+
           if [[ "${{ runner.arch }}" == "X64" ]]; then
             python3 -c 'from openvino import Core; Core().get_property("GPU", "AVAILABLE_DEVICES")'
           fi
-          
+
           python3 -c 'from openvino import Core; Core().get_property("AUTO", "SUPPORTED_PROPERTIES")'
           python3 -c 'from openvino import Core; Core().get_property("MULTI", "SUPPORTED_PROPERTIES")'
           python3 -c 'from openvino import Core; Core().get_property("HETERO", "SUPPORTED_PROPERTIES")'
           python3 -c 'from openvino import Core; Core().get_property("BATCH", "SUPPORTED_PROPERTIES")'
           python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 6'
           benchmark_app --help
+          opt_in_out --help
           ovc --help
diff --git a/.github/workflows/job_python_unit_tests.yml b/.github/workflows/job_python_unit_tests.yml
@@ -259,8 +259,6 @@ jobs:
       - name: TensorFlow 1 Layer Tests - TF FE
         if: fromJSON(inputs.affected-components).TF_FE.test
         run: |
-          # requires 'unit_tests' from 'mo'
-          export PYTHONPATH=${INSTALL_TEST_DIR}/mo
           python3 -m pytest ${LAYER_TESTS_INSTALL_DIR}/tensorflow_tests/ -m precommit -n logical --junitxml=${INSTALL_TEST_DIR}/TEST-tf_fe.xml
         env:
           TEST_DEVICE: CPU
@@ -269,8 +267,6 @@ jobs:
       - name: TensorFlow 2 Layer Tests - TF FE
         if: fromJSON(inputs.affected-components).TF_FE.test && runner.os != 'macOS' # Ticket: 123322
         run: |
-          # requires 'unit_tests' from 'mo'
-          export PYTHONPATH=${INSTALL_TEST_DIR}/mo
           python3 -m pytest ${LAYER_TESTS_INSTALL_DIR}/tensorflow2_keras_tests/ -n logical -m precommit_tf_fe --junitxml=${INSTALL_TEST_DIR}/TEST-tf2_fe.xml
         env:
           TEST_DEVICE: CPU

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -760,16 +760,114 @@ jobs:
           path: ${{ env.EXTENSION_BUILD_DIR }}/*.whl
           if-no-files-found: 'error'
 
-  GPU_Stub:
+  GPU:
+    name: GPU ${{ matrix.TEST_TYPE }} Tests
     needs: [ Build, Smart_CI ]
-    runs-on: ubuntu-latest
     if: fromJSON(needs.smart_ci.outputs.affected_components).GPU
+    timeout-minutes: 80
+    runs-on: [ self-hosted, gpu ]
+    strategy:
+      max-parallel: 2
+      fail-fast: false
+      matrix:
+        TEST_TYPE: ['unit', 'func']
+    container:
+      image: ubuntu:20.04
+      options: --device /dev/dri:/dev/dri --group-add 109 --group-add 44
+      volumes:
+        - /dev/dri:/dev/dri
+    defaults:
+      run:
+        shell: bash
+    env:
+      DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
+      INSTALL_DIR: ${{ github.workspace }}/install
+      INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
+      GTEST_PARALLEL_SCRIPT: ${{ github.workspace }}/gtest_parallel.py
     steps:
-      - name: GPU stub
+      - name: Download OpenVINO package
+        uses: actions/download-artifact@v4
+        with:
+          name: 'openvino_package'
+          path: ${{ env.INSTALL_DIR }}
+
+      - name: Download OpenVINO tests package
+        uses: actions/download-artifact@v4
+        with:
+          name: 'openvino_tests'
+          path: ${{ env.INSTALL_TEST_DIR }}
+
+      # Needed as ${{ github.workspace }} is not working correctly when using Docker
+      - name: Setup Variables
         run: |
-          echo "This is only a stub to collect statistics of GPU runs filtered by Smart CI.
-          It will help us to estimate hardware requirements"
-        shell: bash
+          echo "INSTALL_DIR=$GITHUB_WORKSPACE/install" >> "$GITHUB_ENV"
+          echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
+          echo "GTEST_PARALLEL_SCRIPT=$GITHUB_WORKSPACE/gtest_parallel.py" >> "$GITHUB_ENV"
+
+      - name: Extract OpenVINO packages
+        run: |
+          pushd $INSTALL_DIR
+            tar -xzf openvino_package.tar.gz -C $INSTALL_DIR
+          popd
+          pushd $INSTALL_TEST_DIR
+            tar -xzf openvino_tests.tar.gz -C $INSTALL_DIR
+          popd
+
+      - name: Install dependencies (Linux)
+        run: |
+          $INSTALL_DIR/install_dependencies/install_openvino_dependencies.sh -c=core -c=dev -c=gpu -y
+
+          apt-get update && apt-get install -y wget software-properties-common ca-certificates gpg-agent tzdata
+        env:
+          DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
+          TZ: "Europe/London" # to prevent tzdata from waiting user input
+
+      - name: Setup Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Get gtest-parallel script
+        run: wget https://raw.githubusercontent.com/google/gtest-parallel/master/gtest_parallel.py
+
+      - name: Install GPU Drivers
+        run: |
+          wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.15985.7/intel-igc-core_1.0.15985.7_amd64.deb
+          wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.15985.7/intel-igc-opencl_1.0.15985.7_amd64.deb
+          wget https://github.com/intel/compute-runtime/releases/download/24.05.28454.6/intel-level-zero-gpu-dbgsym_1.3.28454.6_amd64.ddeb
+          wget https://github.com/intel/compute-runtime/releases/download/24.05.28454.6/intel-level-zero-gpu_1.3.28454.6_amd64.deb
+          wget https://github.com/intel/compute-runtime/releases/download/24.05.28454.6/intel-opencl-icd-dbgsym_24.05.28454.6_amd64.ddeb
+          wget https://github.com/intel/compute-runtime/releases/download/24.05.28454.6/intel-opencl-icd_24.05.28454.6_amd64.deb
+          wget https://github.com/intel/compute-runtime/releases/download/24.05.28454.6/libigdgmm12_22.3.11_amd64.deb
+          dpkg -i *.deb
+
+      #
+      # Tests
+      #
+
+      - name: OpenVINO GPU ${{ matrix.TEST_TYPE }} Tests
+        run: |
+          source ${INSTALL_DIR}/setupvars.sh
+
+          rm -rf ${INSTALL_TEST_DIR}/gpu_${{ matrix.TEST_TYPE }}_tests && mkdir -p ${INSTALL_TEST_DIR}/gpu_${{ matrix.TEST_TYPE }}_tests
+          
+          test_filter=''
+          if [[ "${{ matrix.TEST_TYPE }}" == "unit" ]]; then
+            # Ticket: 138018
+            test_filter='-*scatter_nd_update_gpu.dynamic_padded_output*:*border_gpu.basic_zero_input*:*bicubic_zeros_no_align_data1x1*:*bicubic_border_align_batches*:*bilinear_zeros_no_align_data1x1*:*non_zero_gpu.empty_input*:*mark_shape_of_subgraphs.concat_with_empty_tensor_inputs*:*concat_cpu_impl.dynamic_4d_f*:*border_gpu.basic_zero_input_dynamic*:*network_test.model_with_empty_input_is_not_dynamic*:*bicubic_zeros_align_data1x1*'
+          else
+            test_filter='*smoke*'
+          fi
+          python3 ${GTEST_PARALLEL_SCRIPT} ${INSTALL_TEST_DIR}/ov_gpu_${{ matrix.TEST_TYPE }}_tests --dump_json_test_results=${INSTALL_TEST_DIR}/gpu_${{ matrix.TEST_TYPE }}_tests/ov_gpu_${{ matrix.TEST_TYPE }}_tests.json -- --report_unique_name --gtest_filter=$test_filter
+          
+
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-results-${{ matrix.TEST_TYPE }}-gpu
+          path: ${{ env.INSTALL_TEST_DIR }}/gpu_${{ matrix.TEST_TYPE }}_tests
+          if-no-files-found: 'error'
 
   Overall_Status:
     name: ci/gha_overall_status

diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
@@ -125,6 +125,9 @@ jobs:
           update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30
           update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30
 
+          # For building the latest h5py
+          apt install --assume-yes --no-install-recommends libhdf5-dev
+
       - name: Install sccache
         uses: mozilla-actions/[email protected]
         with:

diff --git a/.github/workflows/linux_riscv.yml b/.github/workflows/linux_riscv.yml
@@ -107,6 +107,7 @@ jobs:
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/json
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gtest
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gflags
+            git submodule update --init -- ${OPENVINO_REPO}/thirdparty/telemetry
             git submodule update --init -- ${OPENVINO_REPO}/src/plugins/intel_cpu
             git submodule update --init -- ${OPENVINO_REPO}/thirdparty/open_model_zoo
           popd

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -617,8 +617,6 @@ jobs:
         if: fromJSON(needs.smart_ci.outputs.affected_components).TF_FE.test
         shell: cmd
         run: |
-          :: requires 'unit_tests' from 'tools/mo'
-          set PYTHONPATH=${{ env.INSTALL_TEST_DIR }}\mo;%PYTHONPATH%
           python3 -m pytest ${{ env.LAYER_TESTS_INSTALL_DIR }}/tensorflow_tests/ -n logical -m precommit  --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-tf_fe.xml
         env:
           TEST_DEVICE: CPU
@@ -628,9 +626,6 @@ jobs:
         if: fromJSON(needs.smart_ci.outputs.affected_components).TF_FE.test
         shell: cmd
         run: |
-          :: requires 'unit_tests' from 'tools/mo'
-          set PYTHONPATH=${{ env.INSTALL_TEST_DIR }}\mo;%PYTHONPATH%
-
           python3 -m pytest ${{ env.LAYER_TESTS_INSTALL_DIR }}/tensorflow2_keras_tests/ -m precommit_tf_fe --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-tf2_fe.xml
         env:
           TEST_DEVICE: CPU

diff --git a/.gitmodules b/.gitmodules
@@ -78,3 +78,6 @@
 [submodule "src/plugins/intel_npu/thirdparty/level-zero-ext"]
 	path = src/plugins/intel_npu/thirdparty/level-zero-ext
 	url = https://github.com/intel/level-zero-npu-extensions.git
+[submodule "thirdparty/telemetry"]
+	path = thirdparty/telemetry
+	url = https://github.com/openvinotoolkit/telemetry.git
diff --git a/cmake/packaging/debian.cmake b/cmake/packaging/debian.cmake
@@ -53,6 +53,8 @@ macro(ov_cpack_settings)
            (NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
            # temporary block nvidia
            NOT item STREQUAL "nvidia" AND
+           # don't install node_addon
+           NOT item MATCHES "node_addon" AND
            # don't install Intel OpenMP
            NOT item STREQUAL "omp" AND
            # the same for pugixml

diff --git a/cmake/packaging/rpm.cmake b/cmake/packaging/rpm.cmake
@@ -39,6 +39,8 @@ macro(ov_cpack_settings)
            (NOT item MATCHES "^${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_python.*" OR ENABLE_PYTHON_PACKAGING) AND
            # temporary block nvidia
            NOT item STREQUAL "nvidia" AND
+           # don't install node_addon
+           NOT item MATCHES "node_addon" AND
            # temporary block npu
            NOT item STREQUAL "npu" AND
            # don't install Intel OpenMP

diff --git a/...pported-model-formats/[legacy]-conversion-tutorials/convert-tensorflow-yolo.rst b/...pported-model-formats/[legacy]-conversion-tutorials/convert-tensorflow-yolo.rst
@@ -58,12 +58,19 @@ This section explains how to convert the YOLOv4 Keras model from the `repository
         python keras-YOLOv3-model-set/tools/model_converter/convert.py <path_to_cfg_file>/yolov4-tiny.cfg <path_to_weights>/yolov4-tiny.weights <saved_model_dir>
 
 
-4. Run model conversion for from the TensorFlow 2 format to an IR:
+4. Run model conversion from the TensorFlow 2 to an IR format:
 
    .. note::
 
       Before you run the conversion, make sure you have installed all the model conversion API dependencies for TensorFlow 2.
 
+      If you get errors, you may need to add the additional step to divide the input by 255:
+
+      .. code-block:: sh
+
+         --scale_values=image_input[255]
+
+
    .. code-block:: sh
 
       mo --saved_model_dir yolov4 --output_dir models/IRs --input_shape [1,608,608,3] --model_name yolov4

diff --git a/...en/documentation/openvino-ir-format/operation-sets/available-opsets/opset14.rst b/...en/documentation/openvino-ir-format/operation-sets/available-opsets/opset14.rst
@@ -169,6 +169,7 @@ Table of Contents
 * :doc:`RNNCell <../operation-specs/sequence/rnn-cell-3>`
 * :doc:`RNNSequence <../operation-specs/sequence/rnn-sequence-5>`
 * :doc:`ROIAlign <../operation-specs/detection/roi-align-9>`
+* :doc:`ROIAlignRotated <../operation-specs/detection/roi-align-rotated-14>`
 * :doc:`ROIPooling <../operation-specs/detection/roi-pooling-1>`
 * :doc:`Roll <../operation-specs/movement/roll-7>`
 * :doc:`Round <../operation-specs/arithmetic/round-5>`

diff --git a/...articles_en/documentation/openvino-ir-format/operation-sets/operation-specs.rst b/...articles_en/documentation/openvino-ir-format/operation-sets/operation-specs.rst
@@ -188,6 +188,7 @@ Operation Specifications
    RNNSequence-5 <operation-specs/sequence/rnn-sequence-5>
    ROIAlign-3 <operation-specs/detection/roi-align-3>
    ROIAlign-9 <operation-specs/detection/roi-align-9>
+   ROIAlignRotated-14 <operation-specs/detection/roi-align-rotated-14>
    ROIPooling-1 <operation-specs/detection/roi-pooling-1>
    Roll-7 <operation-specs/movement/roll-7>
    Round-5 <operation-specs/arithmetic/round-5>