Merge pull request #1 from openvinotoolkit/master

update my fork
itikhono · Dec 3, 2020 · 56b755e · 56b755e
2 parents 7275e24 + b3124a5
commit 56b755e
Show file tree

Hide file tree

Showing 1,116 changed files with 17,454 additions and 13,319 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -1,3 +1,15 @@
+resources:
+  repositories:
+  - repository: openvino_contrib
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/openvino_contrib
+
+  - repository: testdata
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/testdata
+
 jobs:
 - job: Lin
   # About 150% of total time
@@ -13,6 +25,8 @@ jobs:
     WORKERS_NUMBER: 8
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
+    OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
+    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
@@ -48,6 +62,17 @@ jobs:
     submodules: recursive
     path: openvino
 
+  - checkout: openvino_contrib
+    clean: true
+    lfs: false
+    submodules: recursive
+    path: openvino_contrib
+
+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
   - script: |
       sudo apt --assume-yes install libusb-1.0-0-dev
       python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/requirements.txt
@@ -65,7 +90,7 @@ jobs:
   - task: CMake@1
     inputs:
       # CMake must get Python 3.x version by default
-      cmakeArgs: -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DENABLE_TESTS=ON $(REPO_DIR)
+      cmakeArgs: -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR)
       workingDirectory: $(BUILD_DIR)
 
   - script: ninja
@@ -116,28 +141,23 @@ jobs:
     continueOnError: false
 
   - script: |
-      git clone https://github.com/openvinotoolkit/testdata.git
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Clone testdata'
-
-  - script: |
-      export DATA_PATH=$(WORK_DIR)/testdata
-      export MODELS_PATH=$(WORK_DIR)/testdata
+      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=$(WORK_DIR)/testdata
-      export MODELS_PATH=$(WORK_DIR)/testdata
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
       $(BIN_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false
 
   - script: |
-      export DATA_PATH=$(WORK_DIR)/testdata
-      export MODELS_PATH=$(WORK_DIR)/testdata
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
       export LD_LIBRARY_PATH=$(BIN_DIR)/lib
       export PYTHONPATH=$(BIN_DIR)/lib/python_api/python3.6
       env

diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml
@@ -1,3 +1,15 @@
+resources:
+  repositories:
+  - repository: openvino_contrib
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/openvino_contrib
+
+  - repository: testdata
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/testdata
+
 jobs:
 - job: Mac
   # About 200% of total time (perfomace of Mac hosts is unstable)
@@ -13,6 +25,8 @@ jobs:
     WORKERS_NUMBER: 3
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
+    OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
+    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE)
@@ -42,6 +56,17 @@ jobs:
     submodules: recursive
     path: openvino
 
+  - checkout: openvino_contrib
+    clean: true
+    lfs: false
+    submodules: recursive
+    path: openvino_contrib
+
+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.7'
@@ -63,7 +88,7 @@ jobs:
       # Disable errors with Ninja
       export CXXFLAGS="-Wno-error=unused-command-line-argument"
       export CFLAGS="-Wno-error=unused-command-line-argument"
-      cmake -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=ON $(REPO_DIR)
+      cmake -GNinja -DVERBOSE_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_PYTHON=ON -DENABLE_TESTS=ON -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules $(REPO_DIR)
     workingDirectory: $(BUILD_DIR)
     displayName: 'CMake'
 
@@ -111,21 +136,16 @@ jobs:
     continueOnError: false
 
   - script: |
-      git clone https://github.com/openvinotoolkit/testdata.git
-    workingDirectory: $(WORK_DIR)
-    displayName: 'Clone testdata'
-
-  - script: |
-      export DATA_PATH=$(WORK_DIR)/testdata
-      export MODELS_PATH=$(WORK_DIR)/testdata
+      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
 
   - script: |
-      export DATA_PATH=$(WORK_DIR)/testdata
-      export MODELS_PATH=$(WORK_DIR)/testdata
+      export DATA_PATH=$(MODELS_PATH)
+      export MODELS_PATH=$(MODELS_PATH)
       $(BIN_DIR)/InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false

diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml
@@ -1,3 +1,15 @@
+resources:
+  repositories:
+  - repository: openvino_contrib
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/openvino_contrib
+
+  - repository: testdata
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/testdata
+
 jobs:
 - job: Win
   # About 150% of total time
@@ -13,6 +25,8 @@ jobs:
     WORKERS_NUMBER: 8
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
+    OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib
+    MODELS_PATH: $(REPO_DIR)\..\testdata
     WORK_DIR: $(Pipeline.Workspace)\_w
     BUILD_DIR: D:\build
     BIN_DIR: $(REPO_DIR)\bin\intel64
@@ -45,6 +59,17 @@ jobs:
     submodules: recursive
     path: openvino
 
+  - checkout: openvino_contrib
+    clean: true
+    lfs: false
+    submodules: recursive
+    path: openvino_contrib
+
+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
   - script: |
       certutil -urlcache -split -f https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip ninja-win.zip
       powershell -command "Expand-Archive -Force ninja-win.zip"
@@ -65,7 +90,7 @@ jobs:
 
   - script: |
       set PATH=$(WORK_DIR)\ninja-win;%PATH%
-      call "$(MSVS_VARS_PATH)" && cmake -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)
+      call "$(MSVS_VARS_PATH)" && cmake -GNinja -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'
 
@@ -141,25 +166,20 @@ jobs:
     displayName: 'MklDnnBehaviorTests'
     continueOnError: false
 
-  - script: |
-      git clone https://github.com/openvinotoolkit/testdata.git
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Clone testdata'
-
     # Add for gtest-parallel, it hangs now (CVS-33386)
     #python $(BUILD_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=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH%
-      set DATA_PATH=$(BUILD_DIR)\testdata
-      set MODELS_PATH=$(BUILD_DIR)\testdata
+      set DATA_PATH=$(MODELS_PATH)
+      set MODELS_PATH=$(MODELS_PATH)
       $(BIN_DIR)\MklDnnFunctionalTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-MklDnnFunctionalTests.xml
     displayName: 'MklDnnFunctionalTests'
     continueOnError: false
 
   - script: |
       set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH%
-      set DATA_PATH=$(BUILD_DIR)\testdata
-      set MODELS_PATH=$(BUILD_DIR)\testdata
+      set DATA_PATH=$(MODELS_PATH)
+      set MODELS_PATH=$(MODELS_PATH)
       $(BIN_DIR)\InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml
     displayName: 'IE CAPITests'
     continueOnError: false

diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile
@@ -75,8 +75,8 @@ RUN make -j $(nproc) install
 
 # Run tests via tox
 WORKDIR /openvino/ngraph/python
-ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist
-ENV LD_LIBRARY_PATH=/openvino/dist/lib
+ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist/deployment_tools/ngraph
+ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib
 ENV NGRAPH_ONNX_IMPORT_ENABLE=TRUE
 ENV PYTHONPATH=/openvino/bin/intel64/Release/lib/python_api/python3.8:${PYTHONPATH}
 RUN git clone --recursive https://github.com/pybind/pybind11.git -b v2.5.0 --depth 1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,7 +114,7 @@ function(build_ngraph)
     ie_cpack_add_component(ngraph)
 
     set(SDL_cmake_included ON)
-    # set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/")
+    set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/")
     add_subdirectory(ngraph)
     set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
 endfunction()

diff --git a/inference-engine/cmake/clang_format.cmake → cmake/clang_format/clang_format.cmake b/inference-engine/cmake/clang_format.cmake → cmake/clang_format/clang_format.cmake
@@ -76,10 +76,10 @@ function(add_clang_format_target TARGET_NAME)
             -D "CLANG_FORMAT=${CLANG_FORMAT}"
             -D "INPUT_FILE=${source_file}"
             -D "OUTPUT_FILE=${output_file}"
-            -P "${IE_MAIN_SOURCE_DIR}/cmake/clang_format_check.cmake"
+            -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/clang_format/clang_format_check.cmake"
             DEPENDS
             "${source_file}"
-            "${IE_MAIN_SOURCE_DIR}/cmake/clang_format_check.cmake"
+            "${OpenVINO_MAIN_SOURCE_DIR}/cmake/clang_format/clang_format_check.cmake"
             COMMENT
             "[clang-format] ${source_file}"
             VERBATIM)
@@ -102,10 +102,10 @@ function(add_clang_format_target TARGET_NAME)
         -D "CLANG_FORMAT=${CLANG_FORMAT}"
         -D "INPUT_FILES=${CLANG_FORMAT_FOR_SOURCES}"
         -D "EXCLUDE_PATTERNS=${CLANG_FORMAT_EXCLUDE_PATTERNS}"
-        -P "${IE_MAIN_SOURCE_DIR}/cmake/clang_format_fix.cmake"
+        -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/clang_format/clang_format_fix.cmake"
         DEPENDS
         "${CLANG_FORMAT_FOR_SOURCES}"
-        "${IE_MAIN_SOURCE_DIR}/cmake/clang_format_fix.cmake"
+        "${OpenVINO_MAIN_SOURCE_DIR}/cmake/clang_format/clang_format_fix.cmake"
         COMMENT
         "[clang-format] ${TARGET_NAME}_fix"
         VERBATIM)

diff --git a/...nce-engine/cmake/clang_format_check.cmake → cmake/clang_format/clang_format_check.cmake b/...nce-engine/cmake/clang_format_check.cmake → cmake/clang_format/clang_format_check.cmake
diff --git a/...rence-engine/cmake/clang_format_fix.cmake → cmake/clang_format/clang_format_fix.cmake b/...rence-engine/cmake/clang_format_fix.cmake → cmake/clang_format/clang_format_fix.cmake
diff --git a/inference-engine/cmake/cpplint.cmake → cmake/cpplint/cpplint.cmake b/inference-engine/cmake/cpplint.cmake → cmake/cpplint/cpplint.cmake
@@ -68,17 +68,17 @@ function(add_cpplint_target TARGET_NAME)
                 "${output_file}"
             COMMAND
                 "${CMAKE_COMMAND}"
-                -D "CPPLINT_SCRIPT=${IE_MAIN_SOURCE_DIR}/scripts/cpplint.py"
+                -D "CPPLINT_SCRIPT=${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint.py"
                 -D "INPUT_FILE=${source_file}"
                 -D "OUTPUT_FILE=${output_file}"
                 -D "WORKING_DIRECTORY=${CMAKE_CURRENT_SOURCE_DIR}"
                 -D "SKIP_RETURN_CODE=${ENABLE_CPPLINT_REPORT}"
                 -D "CUSTOM_FILTER=${custom_filter}"
-                -P "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_run.cmake"
+                -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_run.cmake"
             DEPENDS
                 "${source_file}"
-                "${IE_MAIN_SOURCE_DIR}/scripts/cpplint.py"
-                "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_run.cmake"
+                "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint.py"
+                "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_run.cmake"
             COMMENT
                 "[cpplint] ${source_file}"
             VERBATIM)
@@ -118,10 +118,10 @@ function(add_cpplint_report_target)
             "${CMAKE_COMMAND}"
             -D "FINAL_OUTPUT_FILE=${cpplint_output_file}"
             -D "OUTPUT_FILES=${CPPLINT_ALL_OUTPUT_FILES}"
-            -P "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_merge.cmake"
+            -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_merge.cmake"
         DEPENDS
             ${CPPLINT_ALL_OUTPUT_FILES}
-            "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_merge.cmake"
+            "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_merge.cmake"
         COMMENT
             "[cpplint] Merge all output files"
         VERBATIM)
@@ -133,36 +133,36 @@ function(add_cpplint_report_target)
         COMMAND
             "${CMAKE_COMMAND}"
             -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
-            -D "CONVERT_SCRIPT=${IE_MAIN_SOURCE_DIR}/scripts/cpplint_to_cppcheckxml.py"
+            -D "CONVERT_SCRIPT=${OpenVINO_MAIN_SOURCE_DIR}/scripts/cpplint_to_cppcheckxml.py"
             -D "INPUT_FILE=${cpplint_output_file}"
             -D "OUTPUT_FILE=${cppcheck_output_file}"
-            -P "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_to_cppcheck_xml.cmake"
+            -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_to_cppcheck_xml.cmake"
         DEPENDS
             "${cpplint_output_file}"
-            "${IE_MAIN_SOURCE_DIR}/scripts/cpplint_to_cppcheckxml.py"
-            "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_to_cppcheck_xml.cmake"
+            "${OpenVINO_MAIN_SOURCE_DIR}/scripts/cpplint_to_cppcheckxml.py"
+            "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_to_cppcheck_xml.cmake"
         COMMENT
             "[cpplint] Convert to cppcheck XML format"
         VERBATIM)
 
-    set(report_dir "${IE_MAIN_SOURCE_DIR}/report/cpplint")
+    set(report_dir "${OpenVINO_MAIN_SOURCE_DIR}/report/cpplint")
     set(html_output_file "${report_dir}/index.html")
     add_custom_command(
         OUTPUT
             "${html_output_file}"
         COMMAND
             "${CMAKE_COMMAND}"
             -D "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
-            -D "CONVERT_SCRIPT=${IE_MAIN_SOURCE_DIR}/scripts/cppcheck-htmlreport.py"
+            -D "CONVERT_SCRIPT=${OpenVINO_MAIN_SOURCE_DIR}/scripts/cppcheck-htmlreport.py"
             -D "INPUT_FILE=${cppcheck_output_file}"
             -D "REPORT_DIR=${report_dir}"
-            -D "SOURCE_DIR=${IE_MAIN_SOURCE_DIR}"
+            -D "SOURCE_DIR=${OpenVINO_MAIN_SOURCE_DIR}"
             -D "TITLE=${CMAKE_PROJECT_NAME}"
-            -P "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_html.cmake"
+            -P "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_html.cmake"
         DEPENDS
             "${cppcheck_output_file}"
-            "${IE_MAIN_SOURCE_DIR}/scripts/cppcheck-htmlreport.py"
-            "${IE_MAIN_SOURCE_DIR}/cmake/cpplint_html.cmake"
+            "${OpenVINO_MAIN_SOURCE_DIR}/scripts/cppcheck-htmlreport.py"
+            "${OpenVINO_MAIN_SOURCE_DIR}/cmake/cpplint/cpplint_html.cmake"
         COMMENT
             "[cpplint] Generate HTML report"
         VERBATIM)

diff --git a/inference-engine/scripts/cpplint.py → cmake/cpplint/cpplint.py b/inference-engine/scripts/cpplint.py → cmake/cpplint/cpplint.py
diff --git a/inference-engine/cmake/cpplint_html.cmake → cmake/cpplint/cpplint_html.cmake b/inference-engine/cmake/cpplint_html.cmake → cmake/cpplint/cpplint_html.cmake
diff --git a/inference-engine/cmake/cpplint_merge.cmake → cmake/cpplint/cpplint_merge.cmake b/inference-engine/cmake/cpplint_merge.cmake → cmake/cpplint/cpplint_merge.cmake
diff --git a/inference-engine/cmake/cpplint_run.cmake → cmake/cpplint/cpplint_run.cmake b/inference-engine/cmake/cpplint_run.cmake → cmake/cpplint/cpplint_run.cmake
diff --git a/...ngine/cmake/cpplint_to_cppcheck_xml.cmake → cmake/cpplint/cpplint_to_cppcheck_xml.cmake b/...ngine/cmake/cpplint_to_cppcheck_xml.cmake → cmake/cpplint/cpplint_to_cppcheck_xml.cmake
diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
@@ -249,3 +249,8 @@ endfunction()
 set_ci_build_number()
 
 include(vs_version/vs_version)
+
+# Code style utils
+
+include(cpplint/cpplint)
+include(clang_format/clang_format)