diff --git a/.ci/azure/linux_ngraph_onnx.yml b/.ci/azure/linux_ngraph_onnx.yml new file mode 100644 index 00000000000000..f993670f98c95b --- /dev/null +++ b/.ci/azure/linux_ngraph_onnx.yml @@ -0,0 +1,95 @@ +jobs: +- job: nGraph_ONNX_Lin + + # About 150% of total time + timeoutInMinutes: 60 + + pool: + name: LIN_VMSS_VENV_F8S_WU2 + + variables: + system.debug: true + VSTS_HTTP_RETRY: 5 + VSTS_HTTP_TIMEOUT: 200 + WORKERS_NUMBER: 8 + BUILD_TYPE: Release + REPO_DIR: $(Build.Repository.LocalPath) + WORK_DIR: $(Pipeline.Workspace)/_w + BUILD_DIR: $(WORK_DIR)/build + BIN_DIR: $(REPO_DIR)/bin/intel64/$(BUILD_TYPE) + INSTALL_DIR: $(WORK_DIR)/install + + steps: + - checkout: self + clean: true + lfs: false + submodules: recursive + path: openvino + + - script: | + curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01" + whoami + uname -a + which python3 + python3 --version + gcc --version + lsb_release + env + cat /proc/cpuinfo + cat /proc/meminfo + vmstat -s + df + displayName: 'System info' + + - script: | + rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR) + displayName: 'Make dir' + + - script: | + sudo apt --assume-yes install libusb-1.0-0-dev + python3 -m pip install -r ./inference-engine/ie_bridges/python/requirements.txt + # For running Python API tests + python3 -m pip install -r ./inference-engine/ie_bridges/python/src/requirements-dev.txt + displayName: 'Install dependencies' + enabled: false + + - script: | + 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 Ninja' + enabled: false + + - 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) + workingDirectory: $(BUILD_DIR) + enabled: false + + - script: ninja + workingDirectory: $(BUILD_DIR) + displayName: 'Build' + enabled: false + + - script: make install + workingDirectory: $(BUILD_DIR) + displayName: 'Install' + enabled: false + + - script: | + ls -alR $(REPO_DIR)/bin/ + ls -alR $(INSTALL_DIR) + displayName: 'List files' + enabled: false + + - script: docker build --tag=openvino-onnx-ci-image --file=$(REPO_DIR)/.ci/openvino-onnx/Dockerfile . + workingDirectory: $(BUILD_DIR) + displayName: 'Docker build' + enabled: false + + - script: docker run --name openvino-onnx-ci-container openvino-onnx-ci-image + workingDirectory: $(BUILD_DIR) + displayName: 'Docker run tests' + enabled: false diff --git a/.github/workflows/files_size.yml b/.github/workflows/files_size.yml new file mode 100644 index 00000000000000..9f5aa130615335 --- /dev/null +++ b/.github/workflows/files_size.yml @@ -0,0 +1,17 @@ +name: Files Size +on: [push, pull_request] + +jobs: + Check-Files-Size: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + + - name: git ls-tree + run: | + git ls-tree -r -t -l --full-name HEAD | sort -n -r -k 4 + + - name: git lfs ls-files + run: | + git lfs ls-files --size + diff --git a/inference-engine/cmake/features_ie.cmake b/inference-engine/cmake/features_ie.cmake index 71947495cf9e90..b4936f4fdbef5d 100644 --- a/inference-engine/cmake/features_ie.cmake +++ b/inference-engine/cmake/features_ie.cmake @@ -109,3 +109,5 @@ ie_option(ENABLE_CLANG_FORMAT "Enable clang-format checks during the build" ON) set(IE_EXTRA_PLUGINS "" CACHE STRING "Extra paths for plugins to include into DLDT build tree") ie_dependent_option(ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the Inference Engine binaries" ON "THREADING MATCHES TBB;LINUX" OFF) + +ie_option (USE_SYSTEM_PUGIXML "use the system copy of pugixml" OFF) diff --git a/inference-engine/src/transformations/include/ngraph_ops/interp.hpp b/inference-engine/src/transformations/include/ngraph_ops/interp.hpp index a06db3077fce26..5e1a0b66ada687 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/interp.hpp +++ b/inference-engine/src/transformations/include/ngraph_ops/interp.hpp @@ -15,7 +15,7 @@ namespace ngraph { namespace op { -typedef struct { +struct InterpolateIEAttrs { int height = -1; int width = -1; float zoom_factor = 0; @@ -26,7 +26,7 @@ typedef struct { std::string mode = ""; int pad_beg = 0; int pad_end = 0; -} InterpolateIEAttrs; +}; class TRANSFORMATIONS_API Interp : public Op { public: @@ -45,11 +45,11 @@ class TRANSFORMATIONS_API Interp : public Op { InterpolateIEAttrs m_attrs; }; -typedef struct { +struct ResampleIEAttrs { bool antialias = true; int64_t factor = 0; std::string mode = ""; -} ResampleIEAttrs; +}; class TRANSFORMATIONS_API ResampleV2 : public Op { public: diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt index a2550bfaa7cbf3..86b0dad79660d9 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -55,22 +55,31 @@ function(build_with_lto) set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) endfunction() - ie_build_pugixml() + if (USE_SYSTEM_PUGIXML) + find_package(PugiXML REQUIRED) + set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE) + else() + ie_build_pugixml() + target_include_directories(pugixml INTERFACE "$") + endif() add_subdirectory(stb_lib) add_subdirectory(ade) add_subdirectory(fluid/modules/gapi) - target_include_directories(pugixml INTERFACE "$") - - set_target_properties(pugixml ade fluid stb_image + set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty) # developer package - ie_developer_export_targets(ade fluid pugixml) - if(TARGET pugixml_mt) - ie_developer_export_targets(pugixml_mt) - set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) + ie_developer_export_targets(ade fluid) + + if (NOT USE_SYSTEM_PUGIXML) + set_target_properties(pugixml PROPERTIES FOLDER thirdparty) + ie_developer_export_targets(pugixml) + if(TARGET pugixml_mt) + ie_developer_export_targets(pugixml_mt) + set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) + endif() endif() if(ENABLE_MKL_DNN)