Merge pull request openvinotoolkit#9 from openvinotoolkit/master

Update forked branch

.ci/azure/ci_utils/onnxruntime/skip_tests

@@ -0,0 +1,6 @@
+TransposeOpTest.NHWC2NCHW
+TransposeOpTest.NCHW2NHWC
+TransposeOpTest.TwoDim_int16
+GatherOpTest.Gather_axis1_indices2d_int16
+SoftmaxOperator.ThreeDimsAxis1
+SoftmaxOperator.ThreeDimsAxis0

.ci/azure/ci_utils/onnxruntime/version

@@ -0,0 +1 @@
+rel-1.7.1

.ci/azure/linux_onnxruntime.yml

@@ -0,0 +1,156 @@
+jobs:
+- job: onnxruntime
+  timeoutInMinutes: 90
+
+  pool:
+    name: LIN_VMSS_VENV_ONNX_WU2
+
+  variables:
+    system.debug: true
+    VSTS_HTTP_RETRY: 5
+    VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 8
+    BUILD_TYPE: Release
+    REPO_DIR: $(Build.Repository.LocalPath)
+    ONNXRUNTIME_REPO_DIR: $(REPO_DIR)/../onnxruntime
+    WORK_DIR: $(Pipeline.Workspace)/_w
+    MODELS_DIR: /mount/cinfsshare/onnxtestdata
+    TMP_DIR: /mnt/tmp
+    INSTALL_DIR: $(WORK_DIR)/install_pkg
+    BUILD_DIR: $(WORK_DIR)/build
+    ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime
+    ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build
+  steps:
+  - script: |
+      curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01"
+      whoami
+      uname -a
+      echo Python3 info ; which python3 ; python3 --version
+      echo Python info ; which python ; python --version
+      echo Java info ; which java ; java -version
+      echo gcc info ; which gcc ; gcc --version
+      lsb_release
+      env
+      cat /proc/cpuinfo
+      cat /proc/meminfo
+      cat /etc/fstab
+      vmstat -s
+      df
+      lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd"
+      free -h
+    displayName: 'System info'
+
+  - script: |
+      rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR)
+      sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR)
+      sudo mkdir -p $(MODELS_DIR)
+      sudo apt --assume-yes install nfs-common
+      sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(MODELS_DIR) -o vers=4,minorversion=1,sec=sys
+    displayName: 'Make dirs'
+
+  - checkout: self
+    clean: true
+    lfs: false
+    submodules: recursive
+    path: openvino
+
+  - script: |
+      branch=`tr -s '\n ' < $(ONNXRUNTIME_UTILS)/version`
+      git clone --branch $branch --single-branch --recursive https://github.com/microsoft/onnxruntime.git $(ONNXRUNTIME_REPO_DIR)
+    displayName: 'Clone onnxruntime'
+
+  - 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
+      # For running Python API tests
+      python3 -m pip install -r $(REPO_DIR)/inference-engine/ie_bridges/python/src/requirements-dev.txt
+      # Speed up build
+      wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
+      unzip ninja-linux.zip
+      sudo cp -v ninja /usr/local/bin/
+      # Speed up tests
+      git clone https://github.com/google/gtest-parallel.git
+    workingDirectory: $(WORK_DIR)
+    displayName: 'Install dependencies'
+
+  - task: CMake@1
+    inputs:
+      # CMake must get Python 3.x version by default
+      cmakeArgs: >
+        -GNinja
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
+        -DENABLE_PYTHON=ON
+        -DPYTHON_EXECUTABLE=/usr/bin/python3.6
+        -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
+        -DNGRAPH_ONNX_IMPORT_ENABLE=ON
+        -DNGRAPH_ONNX_EDITOR_ENABLE=ON
+        -DNGRAPH_INTERPRETER_ENABLE=ON
+        -DNGRAPH_DEBUG_ENABLE=OFF
+        -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON
+        $(REPO_DIR)
+      workingDirectory: $(BUILD_DIR)
+
+  - script: ninja
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Build Lin'
+
+  - script: ls -alR $(REPO_DIR)/bin/
+    displayName: 'List files'
+
+  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Install'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      echo "2021.2" > $(INSTALL_DIR)/deployment_tools/inference_engine/version.txt
+      ./build.sh --config RelWithDebInfo --use_openvino CPU_FP32 --build_shared_lib --parallel --skip_tests --build_dir $(ONNXRUNTIME_BUILD_DIR)
+    workingDirectory: $(ONNXRUNTIME_REPO_DIR)
+    displayName: 'Build ONNX Runtime'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      skip_tests=`tr -s '\n ' ':' < $(ONNXRUNTIME_UTILS)/skip_tests`
+      ./onnxruntime_test_all --gtest_filter=-$skip_tests
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run onnxruntime_test_all'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      ./onnxruntime_shared_lib_test
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run onnxruntime_shared_lib_test'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      ./onnxruntime_global_thread_pools_test
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run onnxruntime_global_thread_pools_test'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      ./onnxruntime_api_tests_without_env
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run onnxruntime_api_tests_without_env'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      ./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-converted"
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run pytorch-converted tests'
+
+  - script: |
+      source $(INSTALL_DIR)/bin/setupvars.sh
+      ./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-operator"
+    workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
+    displayName: 'Run pytorch-operator tests'

.ci/azure/windows.yml

@@ -36,7 +36,7 @@ jobs:
     SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
     IB_DIR: C:\Program Files (x86)\IncrediBuild
     IB_TESTCONSOLE: $(IB_DIR)\IBTestConsole.exe
-    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;$(IB_DIR);%PATH%
+    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.2\opencv\bin;$(IB_DIR);%PATH%
 
   steps:
   - script: |

.ci/azure/windows_conditional_compilation.yml

@@ -24,7 +24,7 @@ jobs:
     SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
     IB_DIR: C:\Program Files (x86)\IncrediBuild
     IB_TESTCONSOLE: $(IB_DIR)\IBTestConsole.exe
-    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;$(IB_DIR);%PATH%
+    TEST_ENV_PATH: $(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.2\opencv\bin;$(IB_DIR);%PATH%
 
   steps:
   - script: |

.ci/openvino-onnx/Dockerfile

@@ -1,6 +1,10 @@
 FROM ubuntu:20.04
 
-LABEL version=2020.07.09.1
+LABEL version=2021.03.30.1
+
+# Build configuration arguments
+ARG BUILD_TYPE=Release
+ARG PROTOBUF_LITE=OFF
 
 ARG http_proxy
 ARG https_proxy
@@ -10,7 +14,6 @@ ENV https_proxy ${https_proxy}
 ENV CI=true
 ENV DEBIAN_FRONTEND=noninteractive
 ENV PYTHONUNBUFFERED 1
-ARG PROTOBUF_LITE=OFF
 
 # Install base dependencies
 RUN apt-get update && apt-get install -y locales && apt-get clean autoclean && apt-get autoremove -y
@@ -52,7 +55,7 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
 COPY . /openvino/
 WORKDIR /openvino/build
 RUN cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DENABLE_VPU=OFF \
     -DENABLE_GNA=OFF \
     -DENABLE_OPENCV=OFF \
@@ -66,6 +69,7 @@ RUN cmake .. \
     -DENABLE_PYTHON=ON \
     -DPYTHON_EXECUTABLE=/usr/bin/python3 \
     -DNGRAPH_ONNX_IMPORT_ENABLE=ON \
+    -DNGRAPH_ONNX_EDITOR_ENABLE=ON \
     -DNGRAPH_INTERPRETER_ENABLE=ON \
     -DNGRAPH_DEBUG_ENABLE=OFF \
     -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON \
@@ -75,7 +79,7 @@ RUN make -j $(nproc) install
 
 # Run tests via tox
 WORKDIR /openvino/ngraph/python
-ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist/deployment_tools/ngraph
+ENV ngraph_DIR=/openvino/dist/deployment_tools/ngraph
 ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib
-ENV PYTHONPATH=/openvino/bin/intel64/Release/lib/python_api/python3.8:${PYTHONPATH}
+ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH}
 CMD tox

.ci/openvino-onnx/Jenkinsfile

@@ -1,12 +1,13 @@
 // Copyright (C) 2018-2020 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-DOCKER_CONTAINER_NAME= "openvino-onnx-ci-container"
-DOCKER_IMAGE_TAG = "openvino-onnx-ci-image"
+DOCKER_CONTAINER_PREFIX= "openvino-onnx-ci-container"
+DOCKER_IMAGE_PREFIX= "openvino-onnx-ci-image"
 
 BACKEND_CONFIGURATIONS = [
-    [ protobuf_lite : "ON" ],
-    [ protobuf_lite : "OFF" ]
+    [ name: "Release", build_type: "Release", protobuf_lite : "OFF" ],
+    [ name: "Debug", build_type: "Debug", protobuf_lite : "OFF" ],
+    [ name: "Rel_Lite", build_type: "Release", protobuf_lite : "ON" ],
 ]
 
 // workaround for aborting previous builds on PR update
@@ -77,7 +78,7 @@ def gitSubmoduleUpdate(String repository_name) {
             git submodule init && git submodule update \
                 --init \
                 --no-fetch \
-                --recursive 
+                --recursive
         """
     }
 }
@@ -89,35 +90,59 @@ def prepare_repository() {
     }
 }
 
+def get_commit_id(){
+    dir("${WORKDIR}/PROJECT_NAME") {
+        GIT_COMMIT_ID = sh(returnStdout: true, script: "git log -n 1 --pretty=format:'%h'").trim()
+    }
+}
+
 def updateModels() {
     sh """
         ./ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/data -o
     """
 }
 
-def buildDockerImage(String protobuf_lite="OFF") {
+def buildDockerImage(Map configuration) {
     updateModels()
+    get_commit_id()
+    DOCKER_IMAGE_TAG="${DOCKER_IMAGE_PREFIX}_${GIT_COMMIT_ID}_${configuration.name}".toLowerCase()
     sh """
-        docker build --tag=${DOCKER_IMAGE_TAG} --build-arg PROTOBUF_LITE=${protobuf_lite} \
+        docker build --tag=${DOCKER_IMAGE_TAG} \
+        --build-arg BUILD_TYPE=${configuration.build_type} \
+        --build-arg PROTOBUF_LITE=${configuration.protobuf_lite} \
         --file=.ci/openvino-onnx/Dockerfile \
         --build-arg http_proxy=http://proxy-chain.intel.com:911/ \
         --build-arg https_proxy=http://proxy-chain.intel.com:912/ .
     """
 }
 
-def runTests() {
-    sh """
-        docker run --name ${DOCKER_CONTAINER_NAME} \
-        --volume ${HOME}/ONNX_CI/data/model_zoo:/root/.onnx/model_zoo \
-        ${DOCKER_IMAGE_TAG}
-    """
+
+def runTests(Map configuration) {
+    get_commit_id()
+    DOCKER_IMAGE_TAG="${DOCKER_IMAGE_PREFIX}_${GIT_COMMIT_ID}_${configuration.name}".toLowerCase()
+    DOCKER_CONTAINER_NAME="${DOCKER_CONTAINER_PREFIX}_${GIT_COMMIT_ID}_${configuration.name}"
+    // Run only basic unit tests in Debug configuration
+    if (configuration.build_type == "Debug") {
+        sh """
+            docker run --name ${DOCKER_CONTAINER_NAME} ${DOCKER_IMAGE_TAG}
+        """
+    }
+
+    // Run unit-tests AND large model tests by default
+    else {
+        sh """
+            docker run --name ${DOCKER_CONTAINER_NAME} \
+            --volume ${HOME}/ONNX_CI/data/model_zoo:/root/.onnx/model_zoo \
+            ${DOCKER_IMAGE_TAG} /bin/bash -c "tox && tox -e zoo_models"
+        """
+    }
 }
 
 def getConfigurationsMap() {
     def configurationsMap = [:]
     for (backend in BACKEND_CONFIGURATIONS) {
         def configuration = backend.clone()
-        configuration.name = "protobuf-lite ${configuration.protobuf_lite}"
+        configuration.name = "${configuration.name}"
         configurationsMap[configuration.name] = {
             stage(configuration.name) { CONFIGURATION_WORKFLOW(configuration) }
         }
@@ -143,12 +168,12 @@ CONFIGURATION_WORKFLOW = { configuration ->
             }
             stage("Prepare Docker environment") {
               dir("${WORKDIR}") {
-                    buildDockerImage(configuration.protobuf_lite)
+                    buildDockerImage(configuration)
                 }
             }
             stage("Run tests") {
                 timeout(time: 20, unit: 'MINUTES') {
-                    runTests()
+                    runTests(configuration)
                 }
             }
         }
@@ -165,9 +190,11 @@ CONFIGURATION_WORKFLOW = { configuration ->
         finally {
             stage("Cleanup") {
                 deleteDir()
+                    get_commit_id()
+                    DOCKER_CONTAINER_NAME="${DOCKER_CONTAINER_PREFIX}_${GIT_COMMIT_ID}_${configuration.name}"
                 sh """
-                    docker image prune -f
                     docker rm -f ${DOCKER_CONTAINER_NAME}
+                    docker image prune -f
                 """
             }
         }

.github/workflows/mo.yml

@@ -80,12 +80,22 @@ jobs:
           python3 setup.py sdist bdist_wheel
         working-directory: model-optimizer
 
-      - name: Test
+      - name: Test package content
+        run: |
+          echo "src = open('openvino_mo.egg-info/SOURCES.txt', 'rt').read().split()" | tee -a test_wheel.py
+          echo "ref = open('automation/package_BOM.txt', 'rt').read().split()"       | tee -a test_wheel.py
+          echo "for name in ref:"                                                    | tee -a test_wheel.py
+          echo "  if name.endswith('.py'):"                                          | tee -a test_wheel.py
+          echo "    assert name in src or './' + name in src, name + ' file missed'" | tee -a test_wheel.py
+          python3 test_wheel.py
+        working-directory: model-optimizer
+
+      - name: Test conversion
         run: |
           wget -q http://download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224.tgz
           tar -xf mobilenet_v1_1.0_224.tgz
           python3 -m pip install model-optimizer/dist/*.whl
-          python3 -c "import sys, subprocess, mo_tf; subprocess.run([sys.executable, mo_tf.__file__, '--input_model', 'mobilenet_v1_1.0_224_frozen.pb', '--input_shape', '[1,224,224,3]'], check=True)"
+          python3 -m mo --input_model mobilenet_v1_1.0_224_frozen.pb --input_shape "[1,224,224,3]"
 
       - uses: actions/upload-artifact@v2
         with:

README.md

@@ -45,5 +45,4 @@ Please report questions, issues and suggestions using:
 [Open Model Zoo]:https://github.com/opencv/open_model_zoo
 [Inference Engine]:https://software.intel.com/en-us/articles/OpenVINO-InferEngine
 [Model Optimizer]:https://software.intel.com/en-us/articles/OpenVINO-ModelOptimizer
-[tag on StackOverflow]:https://stackoverflow.com/search?q=%23openvino
 [nGraph]:https://docs.openvinotoolkit.org/latest/openvino_docs_nGraph_DG_DevGuide.html

cmake/developer_package/clang_format/clang_format.cmake

@@ -17,6 +17,9 @@ if (ENABLE_CLANG_FORMAT)
                 set(ENABLE_CLANG_FORMAT OFF)
             endif()
         endif()
+    else()
+        message(WARNING "Supported clang-format version is not found!")
+        set(ENABLE_CLANG_FORMAT OFF)
     endif()
 endif()