Merge branch 'master' into pd_enable_sin_and_cos

openvinotoolkit · May 17, 2023 · 45784db · 45784db
2 parents 0b2b3a0 + 1e878b6
commit 45784db
Show file tree

Hide file tree

Showing 445 changed files with 7,600 additions and 4,544 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -105,7 +105,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '$(OV_PYTHON_VERSION)' # Setting only major & minor version will download latest release from GH repo example 3.10 will be 3.10.10. 
+      versionSpec: '$(OV_PYTHON_VERSION)' # Setting only major & minor version will download latest release from GH repo example 3.10 will be 3.10.10.
       addToPath: true
       disableDownloadFromRegistry: false
       architecture: 'x64'
@@ -367,7 +367,7 @@ jobs:
     displayName: 'Build cpp samples - gcc'
 
   - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -b $(BUILD_DIR)/cpp_samples_clang
-    env: 
+    env:
       CC: clang
       CXX: clang++
     displayName: 'Build cpp samples - clang'
@@ -447,6 +447,9 @@ jobs:
     displayName: 'CPU FuncTests'
     condition: and(succeeded(), eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF'))
 
+  - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_auto_batch_func_tests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_auto_batch_func_tests.xml
+    displayName: 'AutoBatch FuncTests'
+
   - script: |
       $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'

diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml
@@ -315,6 +315,9 @@ jobs:
     displayName: 'CPU FuncTests'
     condition: and(succeeded(), eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF'))
 
+  - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_auto_batch_func_tests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ov_auto_batch_func_tests.xml
+    displayName: 'AutoBatch FuncTests'
+
   - script: |
       call $(SETUPVARS) && $(INSTALL_TEST_DIR)\InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -0,0 +1,143 @@
+name: Code coverage
+on: workflow_dispatch
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  Coverage:
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - { name: "Ubuntu gcc", os: ubuntu-latest-16-cores, cc: "gcc", cxx: "g++" }
+
+    steps:
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.10'
+          architecture: 'x64'
+
+
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          max-size: 50G
+
+      - name: Clone OpenVINO
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          sudo apt --assume-yes update
+          sudo -E ${{ github.workspace }}/install_build_dependencies.sh
+          sudo apt --assume-yes install lcov
+          
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r ${{ github.workspace }}/src/bindings/python/wheel/requirements-dev.txt
+          python3 -m pip install -r ${{ github.workspace }}/src/bindings/python/requirements.txt
+          # For running Python API tests
+          python3 -m pip install -r ${{ github.workspace }}/src/bindings/python/src/compatibility/openvino/requirements-dev.txt
+          # For running Paddle frontend unit tests
+          python3 -m pip install -r ${{ github.workspace }}/src/frontends/paddle/tests/requirements.txt
+          # For running ONNX frontend unit tests
+          python3 -m pip install -r ${{ github.workspace }}/src/frontends/onnx/tests/requirements.txt
+          # For running TensorFlow frontend unit tests
+          python3 -m pip install -r ${{ github.workspace }}/src/frontends/tensorflow/tests/requirements.txt
+          # For MO unit tests
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_mxnet.txt
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_caffe.txt
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_kaldi.txt
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_onnx.txt
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_tf2.txt
+          python3 -m pip install -r ${{ github.workspace }}/tools/mo/requirements_dev.txt
+          
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v1
+        id: cpu-cores
+
+      - name: Build OpenVINO with CMake
+        uses: ashutoshvarma/action-cmake-build@master
+        with:
+          build-dir: ${{ github.workspace }}/build
+          cc: ${{ matrix.config.cc }}
+          cxx: ${{ matrix.config.cxx }}
+          configure-options: >
+            -GNinja
+            -DCMAKE_VERBOSE_MAKEFILE=ON
+            -DENABLE_PYTHON=ON
+            -DENABLE_ONEDNN_FOR_GPU=ON
+            -DBUILD_SHARED_LIBS=ON
+            -DENABLE_TESTS=ON
+            -DENABLE_OV_ONNX_FRONTEND=ON
+            -DENABLE_FASTER_BUILD=ON
+            -DENABLE_STRICT_DEPENDENCIES=OFF
+            -DENABLE_COVERAGE=ON
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+            -DCMAKE_C_LINKER_LAUNCHER=ccache
+            -DCMAKE_CXX_LINKER_LAUNCHER=ccache
+            -DENABLE_SYSTEM_SNAPPY=ON
+          build-type: Release
+          parallel: ${{ steps.cpu-cores.outputs.count }}
+
+      - name: Install wheel packages
+        run: cmake -DCOMPONENT=python_wheels -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install_pkg -P '${{ github.workspace }}/build/cmake_install.cmake'
+
+      - name: Install python wheels
+        run: python3 -m pip install openvino-dev --find-links=${{ github.workspace }}/install_pkg/tools
+
+      - name: List binaries
+        run: ls -la ${{ github.workspace }}/bin/intel64/Release
+
+      - name: Install OpenVINO
+        run: cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install_pkg -P '${{ github.workspace }}/build/cmake_install.cmake'
+
+      - name: Run OV core unit tests
+        run: ${{ github.workspace }}/bin/intel64/Release/ov_core_unit_tests # --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:${{ github.workspace }}/testdata/TEST-NGraphUT.xml
+
+      - name: Run IR frontend tests
+        run: ${{ github.workspace }}/bin/intel64/Release/ov_ir_frontend_tests # --gtest_print_time=1 --gtest_output=xml:${{ github.workspace }}/testdata/TEST-IRFrontend.xml
+
+      - name: Run ONNX frontend tests
+        run: ${{ github.workspace }}/bin/intel64/Release/ov_onnx_frontend_tests --gtest_filter=-*IE_GPU*
+
+      #- name: Run Paddle frontend unit tests
+      #  run: ${{ github.workspace }}/bin/intel64/Release/paddle_tests --gtest_filter=-*IE_GPU*
+
+      - name: Run TensorFlow frontend unit tests
+        run: ${{ github.workspace }}/bin/intel64/Release/ov_tensorflow_frontend_tests --gtest_filter=-*IE_GPU*
+
+      - name: Build coverage with CMake
+        uses: ashutoshvarma/action-cmake-build@master
+        with:
+          build-dir: ${{ github.workspace }}/coverage
+          cc: ${{ matrix.config.cc }}
+          cxx: ${{ matrix.config.cxx }}
+          target: ov_coverage
+          configure-options: >
+            -DCMAKE_VERBOSE_MAKEFILE=ON
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+            -DCMAKE_C_LINKER_LAUNCHER=ccache
+            -DCMAKE_CXX_LINKER_LAUNCHER=ccache
+          parallel: ${{ steps.cpu-cores.outputs.count }}
+
+
+      - name: Print info
+        run: |
+          ls -laR
+          pwd
+      - name: Generate raport
+        run: |
+          lcov --capture --directory ${{ github.workspace }}/. --output-file coverage.info
+          genhtml coverage.info --output-directory coverage-report
+      - name: Collect coverage
+        uses: codecov/codecov-action@v3
+        with:
+          verbose: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,8 +40,6 @@ endif()
 
 # resolving dependencies for the project
 message (STATUS "CMAKE_VERSION ......................... " ${CMAKE_VERSION})
-message (STATUS "CMAKE_BINARY_DIR ...................... " ${CMAKE_BINARY_DIR})
-message (STATUS "CMAKE_SOURCE_DIR ...................... " ${CMAKE_SOURCE_DIR})
 message (STATUS "OpenVINO_SOURCE_DIR ................... " ${OpenVINO_SOURCE_DIR})
 message (STATUS "OpenVINO_BINARY_DIR ................... " ${OpenVINO_BINARY_DIR})
 message (STATUS "CMAKE_GENERATOR ....................... " ${CMAKE_GENERATOR})
@@ -66,7 +64,7 @@ endif()
 if(CMAKE_TOOLCHAIN_FILE)
     message (STATUS "CMAKE_TOOLCHAIN_FILE .................. " ${CMAKE_TOOLCHAIN_FILE})
 endif()
-if(OV_GLIBC_VERSION)
+if(NOT OV_GLIBC_VERSION VERSION_EQUAL 0.0)
     message (STATUS "GLIBC_VERSION ......................... " ${OV_GLIBC_VERSION})
 endif()
 

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -98,10 +98,10 @@ function(ov_download_tbb)
         # TODO: add target_path to be platform specific as well, to avoid following if
         # build oneTBB 2021.2.1 with Visual Studio 2019 (MSVC 14.21)
         RESOLVE_DEPENDENCY(TBB
-                ARCHIVE_WIN "oneapi-tbb-2021.2.1-win.zip"
+                ARCHIVE_WIN "oneapi-tbb-2021.2.2-win.zip"
                 TARGET_PATH "${TEMP}/tbb"
                 ENVIRONMENT "TBBROOT"
-                SHA256 "d81591673bd7d3d9454054642f8ef799e1fdddc7b4cee810a95e6130eb7323d4"
+                SHA256 "103b19a8af288c6a7d83ed3f0d2239c4afd0dd189fc12aad1d34b3c9e78df94b"
                 USE_NEW_LOCATION TRUE)
     elseif(ANDROID AND X86_64)
         RESOLVE_DEPENDENCY(TBB

diff --git a/cmake/developer_package/add_ie_target.cmake b/cmake/developer_package/add_ie_target.cmake
@@ -163,7 +163,22 @@ function(addIeTargetTest)
 
     addIeTarget(TYPE EXECUTABLE NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS})
 
-    add_test(NAME ${ARG_NAME} COMMAND ${ARG_NAME})
+    if(EMSCRIPTEN)
+        set(JS_BIN_NAME "${ARG_NAME}.js")
+        set(JS_APP_NAME "${ARG_NAME}_js.js")
+        set(JS_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${JS_APP_NAME}")
+        file(WRITE   ${JS_TEST_APP} "// Copyright (C) 2018-2023 Intel Corporation\n")
+        file(APPEND  ${JS_TEST_APP} "// SPDX-License-Identifier: Apache-2.0\n")
+        file(APPEND  ${JS_TEST_APP} "//\n")
+        file(APPEND  ${JS_TEST_APP} "// JS test app\n")
+        file(APPEND  ${JS_TEST_APP} "const createModule = require(\"./${JS_BIN_NAME}\");\n")
+        file(APPEND  ${JS_TEST_APP} "createModule().then(function(Module) {});\n")
+        file(APPEND  ${JS_TEST_APP} " ")
+        # node version>= 16.8.0, else need add "--experimental-wasm-threads --experimental-wasm-bulk-memory" option
+        add_test(NAME ${ARG_NAME} COMMAND node ${JS_TEST_APP})
+    else()
+        add_test(NAME ${ARG_NAME} COMMAND ${ARG_NAME})
+    endif()
     set_property(TEST ${ARG_NAME} PROPERTY LABELS ${ARG_LABELS})
 
     install(TARGETS ${ARG_NAME}

diff --git a/cmake/developer_package/api_validator/api_validator.cmake b/cmake/developer_package/api_validator/api_validator.cmake
@@ -4,23 +4,28 @@
 
 if(WIN32)
     set(PROGRAMFILES_ENV "ProgramFiles(X86)")
-    file(TO_CMAKE_PATH $ENV{${PROGRAMFILES_ENV}} PROGRAMFILES)
 
-    set(WDK_PATHS "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64"
-                  "${PROGRAMFILES}/Windows Kits/10/bin/x64")
+    # check that PROGRAMFILES_ENV is defined, because in case of cross-compilation for Windows
+    # we don't have such variable
+    if(DEFINED ENV{PROGRAMFILES_ENV})
+        file(TO_CMAKE_PATH $ENV{${PROGRAMFILES_ENV}} PROGRAMFILES)
 
-    message(STATUS "Trying to find apivalidator in: ")
-    foreach(wdk_path IN LISTS WDK_PATHS)
-        message("    * ${wdk_path}")
-    endforeach()
+        set(WDK_PATHS "${PROGRAMFILES}/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64"
+                    "${PROGRAMFILES}/Windows Kits/10/bin/x64")
+
+        message(STATUS "Trying to find apivalidator in: ")
+        foreach(wdk_path IN LISTS WDK_PATHS)
+            message("    * ${wdk_path}")
+        endforeach()
 
-    find_host_program(ONECORE_API_VALIDATOR
-                      NAMES apivalidator
-                      PATHS ${WDK_PATHS}
-                      DOC "ApiValidator for OneCore compliance")
+        find_host_program(ONECORE_API_VALIDATOR
+                        NAMES apivalidator
+                        PATHS ${WDK_PATHS}
+                        DOC "ApiValidator for OneCore compliance")
 
-    if(ONECORE_API_VALIDATOR)
-        message(STATUS "Found apivalidator: ${ONECORE_API_VALIDATOR}")
+        if(ONECORE_API_VALIDATOR)
+            message(STATUS "Found apivalidator: ${ONECORE_API_VALIDATOR}")
+        endif()
     endif()
 endif()
 

diff --git a/cmake/developer_package/compile_flags/fuzzing.cmake b/cmake/developer_package/compile_flags/fuzzing.cmake
@@ -4,8 +4,13 @@
 
 macro(enable_fuzzing)
     # Enable (libFuzzer)[https://llvm.org/docs/LibFuzzer.html] if supported.
-    set(FUZZING_COMPILER_FLAGS "-fsanitize=fuzzer-no-link -fprofile-instr-generate -fcoverage-mapping")
-    set(FUZZING_LINKER_FLAGS "-fsanitize-coverage=trace-pc-guard -fprofile-instr-generate")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # see https://learn.microsoft.com/en-us/cpp/build/reference/fsanitize?view=msvc-160#remarks
+        set(FUZZING_COMPILER_FLAGS "/fsanitize=fuzzer")
+    elseif(OV_COMPILER_IS_CLANG)
+        set(FUZZING_COMPILER_FLAGS "-fsanitize=fuzzer-no-link -fprofile-instr-generate -fcoverage-mapping")
+        set(FUZZING_LINKER_FLAGS "-fsanitize-coverage=trace-pc-guard -fprofile-instr-generate")
+    endif()
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FUZZING_COMPILER_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FUZZING_COMPILER_FLAGS}")
@@ -20,6 +25,10 @@ function(add_fuzzer FUZZER_EXE_NAME FUZZER_SOURCES)
     add_executable(${FUZZER_EXE_NAME} ${FUZZER_SOURCES})
     target_link_libraries(${FUZZER_EXE_NAME} PRIVATE fuzz-testhelper)
     if(ENABLE_FUZZING)
-        set_target_properties(${FUZZER_EXE_NAME} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            # no extra flags are required
+        elseif(OV_COMPILER_IS_CLANG)
+            set_target_properties(${FUZZER_EXE_NAME} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer")
+        endif()
     endif()
 endfunction(add_fuzzer)