Merge remote-tracking branch 'upstream/master' into sdp_concat_optimi…

…zed_states
maxnick · Nov 27, 2023 · 5faa0cf · 5faa0cf
2 parents d9478a6 + 72cb4e4
commit 5faa0cf
Show file tree

Hide file tree

Showing 147 changed files with 4,735 additions and 1,082 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -1357,6 +1357,91 @@ jobs:
             ${{ env.INSTALL_TEST_DIR }}/TEST*.html
           if-no-files-found: 'error'
 
+  TensorFlow_Hub_Performance_Models_Tests:
+    name: TensorFlow Hub Performance Models tests
+    needs: [Build, Smart_CI]
+    defaults:
+      run:
+        shell: bash
+    runs-on: ${{ github.event_name == 'schedule' && 'ubuntu-20.04-16-cores' || 'ubuntu-20.04-8-cores'}}
+    timeout-minutes: ${{ github.event_name == 'schedule' && 400 || 5 }}
+    env:
+      OPENVINO_REPO: ${{ github.workspace }}/openvino
+      INSTALL_DIR: ${{ github.workspace }}/install
+      INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
+      MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests
+    if: fromJSON(needs.smart_ci.outputs.affected_components).TF_FE.test || 
+        fromJSON(needs.smart_ci.outputs.affected_components).TFL_FE.test
+
+    steps:
+      - name: Check sudo
+        run: if [ "$(id -u)" -eq 0 ]; then apt update && apt --assume-yes install sudo; fi
+
+      - name: Download OpenVINO package
+        uses: actions/download-artifact@v3
+        with:
+          name: openvino_package
+          path: ${{ env.INSTALL_DIR }}
+
+      - name: Download OpenVINO tests package
+        uses: actions/download-artifact@v3
+        with:
+          name: openvino_tests
+          path: ${{ env.INSTALL_TEST_DIR }}
+
+      - 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: Fetch setup_python action
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github/actions/setup_python/action.yml
+          sparse-checkout-cone-mode: false
+          path: 'openvino'
+
+      - name: Setup Python ${{ env.PYTHON_VERSION }}
+        uses: ./openvino/.github/actions/setup_python
+        with:
+          version: ${{ env.PYTHON_VERSION }}
+          should-setup-pip-paths: 'false'
+          self-hosted-runner: 'false'
+
+      - name: Install OpenVINO Python wheels
+        run: python3 -m pip install ${INSTALL_DIR}/tools/openvino-*
+
+      - name: Install TF Hub tests requirements
+        run: |
+          python3 -m pip install -r ${MODEL_HUB_TESTS_INSTALL_DIR}/tf_hub_tests/requirements.txt
+
+      - name: Install Hub Performance tests requirements
+        run: |
+          python3 -m pip install -r ${MODEL_HUB_TESTS_INSTALL_DIR}/performance_tests/requirements.txt
+
+      - name: Performance Hub Tests
+        run: |
+          export PYTHONPATH=${MODEL_HUB_TESTS_INSTALL_DIR}:$PYTHONPATH
+          python3 -m pytest ${MODEL_HUB_TESTS_INSTALL_DIR}/performance_tests/ -m ${TYPE} --html=${INSTALL_TEST_DIR}/TEST-tf_hub_performance.html --self-contained-html -v
+        env:
+          TYPE: ${{ github.event_name == 'schedule' && 'nightly' || 'precommit'}}
+          TEST_DEVICE: CPU
+
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v3
+        if: ${{ !cancelled() }}
+        with:
+          name: test-results-tensorflow-hub-performance-models
+          path: |
+            ${{ env.INSTALL_TEST_DIR }}/TEST*.html
+          if-no-files-found: 'error'
+
   PyTorch_Models_Tests:
     name: PyTorch Models tests
     needs: [Build, Smart_CI]
@@ -1576,10 +1661,21 @@ jobs:
       - name: Show ccache stats
         run: ${SCCACHE_PATH} --show-stats
 
+  GPU_Stub:
+    needs: [Build, Smart_CI]
+    runs-on: ubuntu-latest
+    if: fromJSON(needs.smart_ci.outputs.affected_components).GPU
+    steps:
+      - name: GPU stub
+        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
+
   Overall_Status:
-    name: ci/gha_linux
+    name: ci/gha_overall_status
     needs: [Smart_CI, Build, Debian_Packages, Samples, Conformance, ONNX_Runtime, CXX_Unit_Tests, Python_Unit_Tests,
-            CPU_Functional_Tests, TensorFlow_Hub_Models_Tests, PyTorch_Models_Tests, NVIDIA_Plugin]
+            CPU_Functional_Tests, TensorFlow_Hub_Models_Tests, TensorFlow_Hub_Performance_Models_Tests, PyTorch_Models_Tests, NVIDIA_Plugin]
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
@@ -80,6 +80,25 @@ endfunction()
 unset(protobuf_lite_installed CACHE)
 unset(protobuf_installed CACHE)
 
+#
+# ov_frontend_group_files(<ROOT_DIR>  # Root path for scanning
+#                         <REL_PATH>  # Relative path (in ROOT_DIR) is used for scanning
+#                         <FILE_EXT>) # File extension for grouping
+#
+macro(ov_frontend_group_files root_dir rel_path file_mask)
+   file(GLOB items RELATIVE ${root_dir}/${rel_path} ${root_dir}/${rel_path}/*)
+   foreach(item ${items})
+        if(IS_DIRECTORY ${root_dir}/${rel_path}/${item})
+            ov_frontend_group_files(${root_dir} ${rel_path}/${item} ${file_mask})
+        else()
+            if(${item} MATCHES ".*\.${file_mask}$")
+                string(REPLACE "/" "\\" groupname ${rel_path})
+                source_group(${groupname} FILES ${root_dir}/${rel_path}/${item})
+            endif()
+        endif()
+   endforeach()
+endmacro()
+
 #
 # ov_add_frontend(NAME <IR|ONNX|...>
 #                 FILEDESCRIPTION <description> # used on Windows to describe DLL file
@@ -121,7 +140,8 @@ macro(ov_add_frontend)
     # Create named folders for the sources within the .vcproj
     # Empty name lists them directly under the .vcproj
 
-    source_group("src" FILES ${LIBRARY_SRC})
+    ov_frontend_group_files(${frontend_root_dir}/ "src" "cpp")
+    ov_frontend_group_files(${frontend_root_dir}/ "src" "proto")
     source_group("include" FILES ${LIBRARY_HEADERS})
     source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
 

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -20,6 +20,7 @@ main  .searchForm {
 pre {
     white-space: pre-wrap;
     word-wrap: break-word;
+    background-color: #efefef;
 }
 
 
@@ -29,26 +30,28 @@ a#wap_dns {display: none;}
 
 /* Sphinx-design tabs override */
 .sd-tab-set>input:checked+label {
-    border-color: var(--sd-color-tabs-underline-inactive);
-    color: var(--sd-color-info-text)!important;
-    background-color: rgb(0 104 181)!important;
+    color: var(--sd-color-black)!important;
+    background-color: #f8f8f8!important;
+    border: solid 1px #bdbdbd;
+    border-bottom: solid 0px;
+    margin-bottom: -1px;
 }
 
 .sd-tab-set>input:checked+label:hover {
     color: --sd-color-info-text;
-    background-color: rgb(0,74,134)!important;
+    background-color: #f8f8f8!important;
 }
 
 .sd-tab-set>input:not(:checked)+label:hover {
     color: var(--sd-color-black)!important;
-    background-color: rgb(245, 245, 245)!important;
+    background-color: #cccccc!important;
     border-color: var(--sd-color-card-header)!important;
 }
 
 .sd-tab-set>label {
     border-bottom: 0.125rem solid transparent;
     margin-right: 10px!important;
-    margin-bottom: 8px;
+    margin-bottom: 0;
     color: var(--sd-color-black)!important;
     border-color: var(--sd-color-tabs-underline-inactive);
     cursor: pointer;
@@ -60,11 +63,29 @@ a#wap_dns {display: none;}
     z-index: 1;
 }
 
+.sd-tab-label {
+    background-color: #e5e5e5;
+}
+
 .sd-tab-content {
-    box-shadow:none!important;
-    border-top: solid 2px var(--sd-color-tabs-overline)!important;
+    box-shadow: 0 0 0 0;
+    border: solid 1px var(--sd-color-tabs-overline);
+    border-color: #bdbdbd;
+    background-color: #f8f8f8;
+    padding-right: 4px;
+    padding-left: 4px;
+    padding-bottom: 6px;
+    margin: 0 0 0 0;
+
+}
+
+.sd-tab-content .sd-tab-content {
+    background-color: #f8f8f8
 }
 
+.sd-tab-content .sd-tab-content .sd-tab-content {
+    background-color: #f8f8f8
+}
 
 /* Navigation panels override */
 /* =================================================== */

diff --git a/docs/snippets/example_itask_executor.cpp b/docs/snippets/example_itask_executor.cpp
@@ -6,16 +6,16 @@
 #    define IN_OV_COMPONENT
 #    define WAS_OV_LIBRARY_DEFINED
 #endif
-#include <threading/ie_cpu_streams_executor.hpp>
+#include "openvino/runtime/threading/cpu_streams_executor.hpp"
 
 #ifdef WAS_OV_LIBRARY_DEFINED
 #    undef IN_OV_COMPONENT
 #    undef WAS_OV_LIBRARY_DEFINED
 #endif
 
-#include <memory>
 #include <future>
 #include <iostream>
+#include <memory>
 
 void example1() {
 // ! [itask_executor:define_pipeline]
@@ -24,9 +24,12 @@ void example1() {
     // When the promise is created we can get std::future to wait the result
     auto future = promise->get_future();
     // Rather simple task
-    InferenceEngine::Task task = [] {std::cout << "Some Output" << std::endl; };
+    ov::threading::Task task = [] {
+        std::cout << "Some Output" << std::endl;
+    };
     // Create an executor
-    InferenceEngine::ITaskExecutor::Ptr taskExecutor = std::make_shared<InferenceEngine::CPUStreamsExecutor>();
+    ov::threading::ITaskExecutor::Ptr taskExecutor =
+        std::make_shared<ov::threading::CPUStreamsExecutor>(ov::threading::IStreamsExecutor::Config{});
     if (taskExecutor == nullptr) {
         // ProcessError(e);
         return;

diff --git a/src/bindings/python/tests/test_graph/test_any.py b/src/bindings/python/tests/test_graph/test_any.py
@@ -2,7 +2,7 @@
 # Copyright (C) 2018-2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-from openvino.runtime import OVAny
+from openvino import OVAny
 import pytest