Merge pull request #5 from nosovmik/mnosov/rebase1

Rebase to latest upstream/master

.ci/azure/analyze_gtest_log.py

@@ -0,0 +1,53 @@
+# Copyright (C) 2018-2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Analyze GTest logs
+"""
+
+import re
+from argparse import ArgumentParser
+
+
+def get_passed_tests(log_file_path):
+    """Gets passed tests with OK status"""
+    ok_test_line_pattern = "[       OK ] "
+    ok_tests = []
+    with open(log_file_path) as log_file_obj:
+        for line in log_file_obj.readlines():
+            if ok_test_line_pattern in line:
+                ok_tests.append(line.split(ok_test_line_pattern)[1])
+    return ok_tests
+
+
+def get_total_time(tests):
+    """Gets total execution time (sec)"""
+    re_compile_time = re.compile(r".+ \(([0-9]+) ms\)")
+    total_time = 0.0
+    for test in tests:
+        re_time = re_compile_time.match(test)
+        if re_time:
+            total_time += int(re_time.group(1)) / 1000
+        else:
+            print("No time in the test line:", test)
+    return total_time
+
+
+def main():
+    """The main entry point function"""
+    arg_parser = ArgumentParser()
+    arg_parser.add_argument(
+        "--log-file", metavar="PATH", default="gtest.log", help="Path to GTest log file"
+    )
+    args = arg_parser.parse_args()
+
+    passed_tests = get_passed_tests(args.log_file)
+    print("PASSED tests count:", len(passed_tests))
+    print("Total execution time of passed tests (sec):", get_total_time(passed_tests))
+
+    print("\nPASSED tests:")
+    print("".join(sorted(passed_tests)))
+
+
+if __name__ == "__main__":
+    main()

.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_conditional_compilation.yml

@@ -0,0 +1,87 @@
+jobs:
+- job: LinCC
+  # About 150% of total time
+  timeoutInMinutes: 90
+
+  pool:
+    name: LIN_VMSS_VENV_F16S_WU2
+
+  variables:
+    system.debug: true
+    VSTS_HTTP_RETRY: 5
+    VSTS_HTTP_TIMEOUT: 200
+    WORKERS_NUMBER: 16
+    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)
+    INSTALL_DIR: $(WORK_DIR)/install_pkg
+    SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
+
+  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)
+      rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR)
+    displayName: 'Make dir'
+
+  - checkout: self
+    clean: true
+    lfs: false
+    submodules: recursive
+    path: openvino
+
+  - 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
+      # 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/
+    workingDirectory: $(WORK_DIR)
+    displayName: 'Install dependencies'
+
+  - task: CMake@1
+    inputs:
+      cmakeArgs: >
+        -GNinja
+        -DVERBOSE_BUILD=ON
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
+        -DENABLE_FASTER_BUILD=ON
+        -DENABLE_PROFILING_ITT=ON
+        -DSELECTIVE_BUILD=COLLECT
+        $(REPO_DIR)
+      workingDirectory: $(BUILD_DIR)
+
+  - script: ninja
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Build'
+
+  - 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'
+

.ci/azure/linux_ngraph_onnx.yml

@@ -43,7 +43,7 @@ jobs:
       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 -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(MODELS_DIR) -o vers=4,minorversion=1,sec=sys
+      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

.ci/azure/linux_onnxruntime.yml

@@ -0,0 +1,155 @@
+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_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'