From 84710e44407ea5b8e7ef20e1b34a22378f46a82f Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Thu, 27 Oct 2022 17:08:56 +0400 Subject: [PATCH] Bump CMake for Linux Azure (#13652) * Bump Cmake for Linux * Fixed environment * Change CI script * Disable some warnings * Fixed compiler flag * Enabled Warnings as error for Linux * Revert "Enabled Warnings as error for Linux" This reverts commit bfb09efb712dc15a297345cd93628690a6f1defb. * Use prebuild cmake * Remove redundant check --- .ci/azure/linux.yml | 53 +++++++++++-------- .../intel_myriad/third_party/CMakeLists.txt | 2 +- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index b4ec568d393..1ad32590b40 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -91,30 +91,9 @@ jobs: TMP_DIR: /mnt/tmp SHARE_DIR: /mount/cinfsshare/onnxtestdata CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux + CMAKE_VERSION: 3.24.0 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 - echo cmake info ; which cmake ; cmake --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 - echo TargetBranch: $(System.PullRequest.TargetBranch) - echo SourceBranch: $(Build.SourceBranch) - displayName: 'System info' - - script: | set -e rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR) @@ -139,6 +118,13 @@ jobs: submodules: recursive path: openvino_contrib + - script: | + wget "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh" + chmod +x ./cmake-${CMAKE_VERSION}-linux-x86_64.sh + sudo ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --prefix=/usr/local/ --skip-license + rm -rf ./cmake-${CMAKE_VERSION}-linux-x86_64.sh + displayName: 'Install cmake' + - script: | set -e $(REPO_DIR)/install_build_dependencies.sh @@ -168,6 +154,29 @@ jobs: workingDirectory: $(WORK_DIR) displayName: 'Install dependencies' + - 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 + echo cmake info ; which cmake ; cmake --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 + echo TargetBranch: $(System.PullRequest.TargetBranch) + echo SourceBranch: $(Build.SourceBranch) + displayName: 'System info' + + # Should be after 'Install dependencies' because Git lfs is not installed - checkout: testdata clean: true diff --git a/src/plugins/intel_myriad/third_party/CMakeLists.txt b/src/plugins/intel_myriad/third_party/CMakeLists.txt index 219b2483f92..1fdea79ac8b 100644 --- a/src/plugins/intel_myriad/third_party/CMakeLists.txt +++ b/src/plugins/intel_myriad/third_party/CMakeLists.txt @@ -4,7 +4,7 @@ if (ENABLE_INTEL_MYRIAD) if(CMAKE_COMPILER_IS_GNUCC OR OV_COMPILER_IS_CLANG) - ie_add_compiler_flags(-Wno-enum-conversion) + ie_add_compiler_flags(-Wno-enum-conversion -Wno-missing-declarations -Wno-format-truncation) endif() add_definitions(-DXLINK_USE_BUS)