Merge branch 'openvinotoolkit:master' into master

.ci/azure/linux.yml

@@ -125,6 +125,7 @@ jobs:
     displayName: 'nGraph UT'
     continueOnError: false
 
+    # python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(BIN_DIR)/InferenceEngineUnitTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
   - script: $(BIN_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:TEST-InferenceEngineUnitTests.xml
     displayName: 'IE UT old'
     continueOnError: false
@@ -161,14 +162,6 @@ jobs:
     displayName: 'CPU FuncTests'
     continueOnError: false
 
-  - script: |
-      export DATA_PATH=$(MODELS_PATH)
-      export MODELS_PATH=$(MODELS_PATH)
-      python3 $(WORK_DIR)/gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
-    workingDirectory: $(WORK_DIR)
-    displayName: 'MklDnnFunctionalTests'
-    continueOnError: false
-
   - script: |
       export DATA_PATH=$(MODELS_PATH)
       export MODELS_PATH=$(MODELS_PATH)

.ci/azure/linux_onnxruntime.yml

@@ -61,6 +61,9 @@ jobs:
 
   - script: |
       sudo apt --assume-yes install libusb-1.0-0-dev
+      # For opencv-python: setuptools and upgrade
+      sudo apt-get install python3-setuptools
+      python3 -m pip install --upgrade pip
       python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
       # For running Python API tests
       python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt

.ci/azure/mac.yml

@@ -105,7 +105,7 @@ jobs:
     workingDirectory: $(BUILD_DIR)
     displayName: 'Install'
 
-  - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid:IE_CPU/GRUSequenceOp.onnx_model_gru* --gtest_output=xml:TEST-NGraphUT.xml
+  - script: $(BIN_DIR)/unit-test --gtest_print_time=1 --gtest_filter=-backend_api.config_unsupported:*IE_GPU*:IE_CPU.onnx_model_sigmoid:IE_CPU/GRUSequenceOp.onnx_model_gru*:IE_CPU.exp_* --gtest_output=xml:TEST-NGraphUT.xml
     displayName: 'nGraph UT'
     continueOnError: false
 
@@ -133,17 +133,10 @@ jobs:
     displayName: 'IE FuncTests'
     continueOnError: false
 
-  - script: $(BIN_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
+  - script: $(BIN_DIR)/cpuFuncTests --gtest_filter=*smoke*:-smoke_LPT/ReduceMinTransformation.CompareWithRefImpl/f32_Shape* --gtest_print_time=1 --gtest_output=xml:TEST-cpuFuncTests.xml
     displayName: 'CPU FuncTests'
     continueOnError: false
-
-  - script: |
-      export DATA_PATH=$(MODELS_PATH)
-      export MODELS_PATH=$(MODELS_PATH)
-      python3 $(WORK_DIR)/gtest-parallel/gtest-parallel $(BIN_DIR)/MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke*:-smoke_MobileNet/ModelTransformationsTest.LPT/mobilenet_v2_tf_depthwise_batch1_inPluginDisabled_inTestDisabled_asymmetric* -- --gtest_print_time=1
-    workingDirectory: $(WORK_DIR)
-    displayName: 'MklDnnFunctionalTests'
-    continueOnError: false
+    enabled: false
 
   - script: |
       export DATA_PATH=$(MODELS_PATH)

.ci/azure/windows.yml

@@ -167,17 +167,6 @@ jobs:
     displayName: 'CPU FuncTests - IB'
     continueOnError: false
 
-    # Add for gtest-parallel, it hangs now (CVS-33386)
-    #python $(WORK_DIR)\gtest-parallel\gtest-parallel $(BIN_DIR)\MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke* -- --gtest_print_time=1
-  - script: |
-      set PATH=$(TEST_ENV_PATH)
-      set DATA_PATH=$(MODELS_PATH)
-      set MODELS_PATH=$(MODELS_PATH)
-      rem "$(IB_TESTCONSOLE)" $(BIN_DIR)\MklDnnFunctionalTests.exe --gtest_filter=*smoke* --gtest_output=xml:TEST-MklDnnFunctionalTests-IB.xml
-      $(BIN_DIR)\MklDnnFunctionalTests.exe --gtest_filter=*smoke* --gtest_output=xml:TEST-MklDnnFunctionalTests.xml
-    displayName: 'MklDnnFunctionalTests'
-    continueOnError: false
-
   - script: |
       set PATH=$(TEST_ENV_PATH)
       set DATA_PATH=$(MODELS_PATH)

CMakeLists.txt

@@ -30,7 +30,7 @@ message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID
 message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
 
 # remove file with exported developer targets to force its regeneration
-file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
+file(REMOVE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
 foreach(component IN LISTS openvino_export_components)
     file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
     unset(${component} CACHE)

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -14,7 +14,13 @@ set(CMAKE_MODULE_PATH "${IEDevScripts_DIR}")
 function(set_ci_build_number)
     set(repo_root "${CMAKE_SOURCE_DIR}")
     include(version)
-    set(CI_BUILD_NUMBER "${CI_BUILD_NUMBER}" PARENT_SCOPE)
+    foreach(var CI_BUILD_NUMBER IE_VERSION
+                IE_VERSION_MAJOR IE_VERSION_MINOR IE_VERSION_PATCH)
+        if(NOT DEFINED ${var})
+            message(FATAL_ERROR "${var} version component is not defined")
+        endif()
+        set(${var} "${${var}}" PARENT_SCOPE)
+    endforeach()
 endfunction()
 
 set_ci_build_number()

cmake/developer_package/FindTBB.cmake → cmake/developer_package/TBBConfig.cmake

@@ -12,7 +12,7 @@
 #   2) ${TBBROOT} with IE own version of TBBConfig.cmake (actual for TBB < 2017.7)
 #
 
-## Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
+# Path to IE own version of TBBConfig.cmake old TBB version without cmake config.
 if(APPLE)
     set(IE_OWN_TBB_CONFIG tbb/mac)
 elseif(UNIX)
@@ -27,6 +27,7 @@ find_package(TBB
     CONFIG
     PATHS ${TBBROOT}/cmake
           ${IEDevScripts_DIR}/${IE_OWN_TBB_CONFIG}
+    NO_CMAKE_FIND_ROOT_PATH
     NO_DEFAULT_PATH
 )
 

cmake/developer_package/features.cmake

@@ -56,7 +56,7 @@ ie_option (VERBOSE_BUILD "shows extra information about build" OFF)
 
 ie_option (ENABLE_UNSAFE_LOCATIONS "skip check for MD5 for dependency" OFF)
 
-ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" ON)
+ie_option (ENABLE_ALTERNATIVE_TEMP "in case of dependency conflict, to avoid modification in master, use local copy of dependency" OFF)
 
 ie_dependent_option (ENABLE_FUZZING "instrument build for fuzzing" OFF "CMAKE_CXX_COMPILER_ID MATCHES ^(Apple)?Clang$; NOT WIN32" OFF)
 

cmake/developer_package/version.cmake

@@ -26,6 +26,55 @@ function (commitHash VAR)
     set (${VAR} ${GIT_COMMIT_HASH} PARENT_SCOPE)
 endfunction()
 
+macro(ie_parse_ci_build_number)
+    if(CI_BUILD_NUMBER MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)\-.*")
+        set(IE_VERSION_MAJOR ${CMAKE_MATCH_1})
+        set(IE_VERSION_MINOR ${CMAKE_MATCH_2})
+        set(IE_VERSION_PATCH ${CMAKE_MATCH_3})
+        set(has_ci_version ON)
+    else()
+        set(IE_VERSION_MAJOR 0)
+        set(IE_VERSION_MINOR 0)
+        set(IE_VERSION_PATCH 0)
+    endif()
+
+    if(NOT DEFINED repo_root)
+        message(FATAL_ERROR "repo_root is not defined")
+    endif()
+
+    if(DEFINED InferenceEngineDeveloperPackage_DIR)
+        set(ie_version_hpp "${IE_MAIN_SOURCE_DIR}/include/ie_version.hpp")
+        if(NOT EXISTS ${ie_version_hpp})
+            message(FATAL_ERROR "File ie_version.hpp with IE_VERSION definitions is not found")
+        endif()
+
+        file(STRINGS "${ie_version_hpp}" IE_VERSION_PARTS REGEX "#define IE_VERSION_[A-Z]+[ ]+" )
+
+        string(REGEX REPLACE ".+IE_VERSION_MAJOR[ ]+([0-9]+).*" "\\1"
+               IE_VERSION_MAJOR_HPP "${IE_VERSION_PARTS}")
+        string(REGEX REPLACE ".+IE_VERSION_MINOR[ ]+([0-9]+).*" "\\1"
+               IE_VERSION_MINOR_HPP "${IE_VERSION_PARTS}")
+        string(REGEX REPLACE ".+IE_VERSION_PATCH[ ]+([0-9]+).*" "\\1"
+               IE_VERSION_PATCH_HPP "${IE_VERSION_PARTS}")
+
+        foreach(var IE_VERSION_MAJOR IE_VERSION_MINOR IE_VERSION_PATCH)
+            if(DEFINED ${var} AND NOT ${var} EQUAL ${var}_HPP)
+                message(FATAL_ERROR "${var} parsed from CI_BUILD_NUMBER (${${var}}) \
+                    and from ie_version.hpp (${${var}_HPP}) are different")
+            else()
+                # CI_BUILD_NUMBER is not defined well, take info from ie_verison.hpp as a baseline
+                set(${var} ${${var}_HPP})
+            endif()
+        endforeach()
+    elseif(has_ci_version)
+        message(WARNING "IE_MAIN_SOURCE_DIR is not defined. No way to compare versions")
+    else()
+        message(WARNING "No way to detect OpenVINO version. Supposing 0.0.0.0")
+    endif()
+
+    set(IE_VERSION "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}")
+endmacro()
+
 if (DEFINED ENV{CI_BUILD_NUMBER})
     set(CI_BUILD_NUMBER $ENV{CI_BUILD_NUMBER})
 else()
@@ -36,6 +85,11 @@ else()
     set(CI_BUILD_NUMBER "${custom_build}")
 endif()
 
+# provides Inference Engine version
+# 1. If CI_BUILD_NUMBER is defined, parses this information
+# 2. Otherwise, parses ie_version.hpp
+ie_parse_ci_build_number()
+
 function (addVersionDefines FILE)
     foreach (VAR ${ARGN})
         if (DEFINED ${VAR} AND NOT "${${VAR}}" STREQUAL "")

cmake/developer_package/vs_version/vs_version.cmake

@@ -2,24 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-macro(ie_parse_ci_build_number)
-    if(CI_BUILD_NUMBER MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)\-.*")
-        set(IE_VERSION_MAJOR ${CMAKE_MATCH_1})
-        set(IE_VERSION_MINOR ${CMAKE_MATCH_2})
-        set(IE_VERSION_PATCH ${CMAKE_MATCH_3})
-        set(IE_VS_VER_HAS_VERSION 1)
-    else()
-        set(IE_VS_VER_HAS_VERSION 0)
-    endif()
-endmacro()
-
-ie_parse_ci_build_number()
-
-if(IE_VS_VER_HAS_VERSION)
-    set(IE_VS_VER_FILEVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
-    set(IE_VS_VER_PRODUCTVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
-    set(IE_VS_VER_FILEVERSION_STR "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}.0")
-endif()
+set(IE_VS_VER_FILEVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
+set(IE_VS_VER_PRODUCTVERSION_QUAD "${IE_VERSION_MAJOR},${IE_VERSION_MINOR},${IE_VERSION_PATCH},0")
+set(IE_VS_VER_FILEVERSION_STR "${IE_VERSION_MAJOR}.${IE_VERSION_MINOR}.${IE_VERSION_PATCH}.0")
 
 set(IE_VS_VER_COMPANY_NAME_STR "Intel Corporation")
 set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")

cmake/developer_package/vs_version/vs_version.rc.in

@@ -1,10 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO         VERSIONINFO
-#if @IE_VS_VER_HAS_VERSION@
   FILEVERSION           @IE_VS_VER_FILEVERSION_QUAD@
   PRODUCTVERSION        @IE_VS_VER_PRODUCTVERSION_QUAD@
-#endif
   FILEFLAGSMASK         VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS             1
@@ -21,9 +19,7 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "@IE_VS_VER_COMPANY_NAME_STR@\0"
       VALUE "FileDescription", "@IE_VS_VER_FILEDESCRIPTION_STR@\0"
-#if @IE_VS_VER_HAS_VERSION@
       VALUE "FileVersion", "@IE_VS_VER_FILEVERSION_STR@\0"
-#endif
       VALUE "InternalName", "@IE_VS_VER_INTERNALNAME_STR@\0"
       VALUE "LegalCopyright", "@IE_VS_VER_COPYRIGHT_STR@\0"
       VALUE "OriginalFilename", "@IE_VS_VER_ORIGINALFILENAME_STR@\0"