lznamens · lznamens · Dec 21, 2020 · Dec 21, 2020 · Dec 21, 2020 · Dec 21, 2020
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -98,6 +98,7 @@ jobs:
         -DENABLE_PYTHON=ON
         -DPYTHON_EXECUTABLE=/usr/bin/python3.6
         -DENABLE_TESTS=ON
+        -DENABLE_FASTER_BUILD=ON
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules
         $(REPO_DIR)
       workingDirectory: $(BUILD_DIR)

diff --git a/.ci/azure/linux_ngraph_onnx.yml b/.ci/azure/linux_ngraph_onnx.yml
@@ -64,7 +64,7 @@ jobs:
   - task: CMake@1
     inputs:
       # CMake must get Python 3.x version by default
-      cmakeArgs: -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_VPU=OFF -DENABLE_GNA=OFF -DENABLE_OPENCV=OFF -DENABLE_CPPLINT=OFF -DENABLE_TESTS=OFF -DENABLE_BEH_TESTS=OFF -DENABLE_FUNCTIONAL_TESTS=OFF -DENABLE_MKL_DNN=ON -DENABLE_CLDNN=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF -DENABLE_SPEECH_DEMO=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DNGRAPH_ONNX_IMPORT_ENABLE=ON -DNGRAPH_INTERPRETER_ENABLE=ON -DNGRAPH_DEBUG_ENABLE=OFF -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) $(REPO_DIR)
+      cmakeArgs: -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_VPU=OFF -DENABLE_GNA=OFF -DENABLE_OPENCV=OFF -DENABLE_CPPLINT=OFF -DENABLE_TESTS=OFF -DENABLE_MKL_DNN=ON -DENABLE_CLDNN=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF -DENABLE_SPEECH_DEMO=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DNGRAPH_ONNX_IMPORT_ENABLE=ON -DNGRAPH_INTERPRETER_ENABLE=ON -DNGRAPH_DEBUG_ENABLE=OFF -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) $(REPO_DIR)
       workingDirectory: $(BUILD_DIR)
     enabled: false
 

diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml
@@ -90,7 +90,7 @@ jobs:
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
+      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_FASTER_BUILD=ON -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 

diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile
@@ -57,8 +57,6 @@ RUN cmake .. \
     -DENABLE_OPENCV=OFF \
     -DENABLE_CPPLINT=OFF \
     -DENABLE_TESTS=OFF \
-    -DENABLE_BEH_TESTS=OFF \
-    -DENABLE_FUNCTIONAL_TESTS=OFF \
     -DENABLE_MKL_DNN=ON \
     -DENABLE_CLDNN=OFF \
     -DENABLE_PROFILING_ITT=OFF \

diff --git a/.ci/openvino-onnx/Jenkinsfile b/.ci/openvino-onnx/Jenkinsfile
@@ -111,7 +111,7 @@ pipeline {
     }
     options {
         skipDefaultCheckout true
-        timeout(activity: true, time: 10, unit: 'MINUTES')
+        timeout(activity: true, time: 60, unit: 'MINUTES')
     }
     stages {
         stage("Clone repository") {
@@ -132,7 +132,7 @@ pipeline {
         }
         stage("Run tests") {
             options {
-                  timeout(time: 15, unit: 'MINUTES')
+                  timeout(time: 60, unit: 'MINUTES')
               }
             steps{
                 runTests()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,17 +8,17 @@ project(OpenVINO)
 
 set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(IE_MAIN_SOURCE_DIR ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine)
-list(APPEND CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake")
 
-include(CTest)
-include(features)
+find_package(IEDevScripts REQUIRED
+             PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
+             NO_CMAKE_FIND_ROOT_PATH
+             NO_DEFAULT_PATH)
 
-# include developer package
-include(developer_package)
+include(CTest)
+include(cmake/features.cmake)
 
 # These options are shared with 3rdparty plugins by means of developer package
-include(check_features)
-include(dependencies)
+include(cmake/dependencies.cmake)
 
 # resolving dependencies for the project
 message (STATUS "PROJECT ............................... " ${PROJECT_NAME})
@@ -30,8 +30,11 @@ 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}/targets_developer.cmake")
-file(REMOVE "${CMAKE_BINARY_DIR}/targets.cmake")
+file(REMOVE "${CMAKE_BINARY_DIR}/inference_engine_targets.cmake")
+foreach(component IN LISTS openvino_export_components)
+    file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
+    unset(${component} CACHE)
+endforeach()
 
 #
 # Build
@@ -45,7 +48,6 @@ function(build_ngraph)
     endfunction()
 
     set(NGRAPH_BUILD_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STRING "" FORCE)
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OpenVINO_MAIN_SOURCE_DIR}/ngraph/cmake/Modules/")
 
     if (ENABLE_SANITIZER)
         ngraph_set(NGRAPH_ADDRESS_SANITIZER TRUE)
@@ -119,28 +121,36 @@ function(build_ngraph)
     set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
 endfunction()
 
-file(REMOVE "${CMAKE_BINARY_DIR}/openvino_targets_developer.cmake")
-unset(OpenVINODeveloperPackageTargets CACHE)
-
 function(openvino_developer_export_targets)
-    set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets};${ARGV}")
+    cmake_parse_arguments(EXPORT "" "COMPONENT" "TARGETS" ${ARGN})
+
+    if(EXPORT_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "openvino_developer_export_targets has unparsed arguments: ${EXPORT_UNPARSED_ARGUMENTS}")
+    endif()
+
+    set(${EXPORT_COMPONENT} "${${EXPORT_COMPONENT}};${EXPORT_TARGETS}")
 
     # to allow exporting of aliased targets with the original names
-    foreach(target_name ${OpenVINODeveloperPackageTargets})
+    foreach(target_name IN LISTS ${EXPORT_COMPONENT})
         if(TARGET "${target_name}")
             get_target_property(original_name ${target_name} ALIASED_TARGET)
             if(TARGET "${original_name}")
                 message(STATUS "The name ${target_name} is an ALIAS for ${original_name}. "
                         "It will be exported to the InferenceEngineDeveloperPackage with the original name.")
-                list(REMOVE_ITEM OpenVINODeveloperPackageTargets ${target_name})
-                list(APPEND OpenVINODeveloperPackageTargets ${original_name})
+                list(REMOVE_ITEM ${EXPORT_COMPONENT} ${target_name})
+                list(APPEND ${EXPORT_COMPONENT} ${original_name})
             endif()
         endif()
     endforeach()
 
-    list(REMOVE_DUPLICATES OpenVINODeveloperPackageTargets)
-    set(OpenVINODeveloperPackageTargets "${OpenVINODeveloperPackageTargets}" CACHE INTERNAL
-        "Paths to extra Inference Engine plugins" FORCE)
+    list(REMOVE_DUPLICATES ${EXPORT_COMPONENT})
+    set(${EXPORT_COMPONENT} "${${EXPORT_COMPONENT}}" CACHE INTERNAL
+        "A list of OpenVINO ${EXPORT_COMPONENT} exported targets" FORCE)
+
+    list(APPEND openvino_export_components ${EXPORT_COMPONENT})
+    list(REMOVE_DUPLICATES openvino_export_components)
+    set(openvino_export_components "${openvino_export_components}" CACHE INTERNAL
+        "A list of OpenVINO exported components" FORCE)
 endfunction()
 
 add_subdirectory(openvino)

diff --git a/cmake/check_features.cmake b/cmake/check_features.cmake
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -4,8 +4,6 @@
 
 set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
 
-include(dependency_solver)
-
 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
     set(protoc_version "3.7.1")
 

diff --git a/inference-engine/cmake/FindTBB.cmake → cmake/developer_package/FindTBB.cmake b/inference-engine/cmake/FindTBB.cmake → cmake/developer_package/FindTBB.cmake
@@ -25,8 +25,9 @@ endif()
 
 find_package(TBB
     CONFIG
-    NO_DEFAULT_PATH
     PATHS ${TBBROOT}/cmake
-          ${CMAKE_CURRENT_LIST_DIR}/${IE_OWN_TBB_CONFIG}
+          ${IEDevScripts_DIR}/${IE_OWN_TBB_CONFIG}
+    NO_DEFAULT_PATH
 )
+
 find_package_handle_standard_args(TBB CONFIG_MODE)