From 331b1883a166394670bec9584040bdf58bd6d25c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 5 Dec 2022 10:10:31 +0400 Subject: [PATCH] Use prebuilt cmake in install-dependencies steps (#14368) --- .ci/azure/android_arm64.yml | 1 - .ci/azure/linux.yml | 48 +++------------------ .ci/azure/linux_arm64.yml | 1 - .ci/azure/linux_conditional_compilation.yml | 38 +--------------- .ci/azure/linux_debian.yml | 2 + .ci/azure/linux_ngraph_onnx.yml | 31 +++++-------- .ci/azure/linux_onnxruntime.yml | 38 +++------------- .ci/azure/mac.yml | 1 - .ci/azure/windows.yml | 2 + install_build_dependencies.sh | 11 ++--- 10 files changed, 33 insertions(+), 140 deletions(-) diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml index 94d72dca2b3..906f2719970 100644 --- a/.ci/azure/android_arm64.yml +++ b/.ci/azure/android_arm64.yml @@ -134,7 +134,6 @@ jobs: -DANDROID_STL=c++_shared -DANDROID_PLATFORM=$(ANDROID_SDK_VERSION) -DENABLE_TESTS=ON - -DENABLE_SAMPLES=ON -DBUILD_java_api=ON -DBUILD_nvidia_plugin=OFF -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index c32e99bfe7a..b8e87538a74 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -62,7 +62,7 @@ jobs: CMAKE_CPACK_GENERATOR: SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples PYTHON_SAMPLES_INSTALL_DIR: $(SAMPLES_INSTALL_DIR)/python - RUN_PREFIX: . $(SETUPVARS) -pyver 3.10 && + RUN_PREFIX: . $(SETUPVARS) && maxParallel: 2 # About 150% of total time @@ -94,8 +94,6 @@ jobs: CMAKE_VERSION: 3.24.0 BUILD_PYTHON: $(WORK_DIR)/build_python INSTALL_PYTHON: $(INSTALL_OPENVINO)/extras/python - PY_VENV: $(WORK_DIR)/.venv - PYTHON_VERSION: 3.10.7 steps: - script: | @@ -143,33 +141,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 sudo -E $(REPO_DIR)/install_build_dependencies.sh # Move jdk into contrib # 'clang' compiler is to check that samples can be built using it sudo apt --assume-yes install openjdk-11-jdk libbz2-dev clang - # For opencv-python: python3-setuptools and pip upgrade - wget https://www.python.org/ftp/python/"$PYTHON_VERSION"/Python-"$PYTHON_VERSION".tgz - tar -xzf Python-"$PYTHON_VERSION".tgz - cd Python-"$PYTHON_VERSION" || exit - ./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" - make python - sudo make install - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - /usr/local/bin/python3.10 -m venv $(PY_VENV) - . $(PY_VENV)/bin/activate - echo Python3 info ; which python3 ; python3 --version - python3 --version - python3.10 --version - curl https://bootstrap.pypa.io/get-pip.py | python3 + # For Python API python3 -m pip install --upgrade pip python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt python3 -m pip install -r $(REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt @@ -180,6 +158,8 @@ jobs: python3 -m pip install -r $(REPO_DIR)/src/frontends/paddle/tests/requirements.txt # For running ONNX frontend unit tests python3 -m pip install -r $(REPO_DIR)/src/frontends/onnx/tests/requirements.txt + # For running TensorFlow frontend unit tests + python3 -m pip install -r $(REPO_DIR)/src/frontends/tensorflow/tests/requirements.txt # For MO unit tests python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements.txt python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements_dev.txt @@ -232,7 +212,6 @@ jobs: -DENABLE_PYTHON=ON -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) - -DPYTHON_EXECUTABLE=$(PY_VENV)/bin/python3.10 -DENABLE_TESTS=ON -DENABLE_OV_ONNX_FRONTEND=ON -DENABLE_FASTER_BUILD=ON @@ -286,9 +265,7 @@ jobs: displayName: 'Install wheel packages' - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_LAYER_TESTS_DIR)/cmake_install.cmake displayName: 'Install Layer Tests' - - script: | - . $(PY_VENV)/bin/activate - python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools + - script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools displayName: 'Install python wheels' - script: | set -e @@ -299,7 +276,6 @@ jobs: # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time - script: | - . $(PY_VENV)/bin/activate export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) # because of static build libgna is needed for python binary @@ -313,7 +289,6 @@ jobs: # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time - script: | - . $(PY_VENV)/bin/activate export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) # because of static build libgna is needed for python binary and mock_py frontend library @@ -331,7 +306,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate # because of static build libgna is needed for python binary export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1910/linux/x64:$LD_LIBRARY_PATH python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml @@ -505,16 +479,13 @@ jobs: workingDirectory: $(BUILD_SAMPLES_TESTS_DIR) displayName: 'Install Samples Tests' - - script: | - . $(PY_VENV)/bin/activate - python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt + - script: python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt workingDirectory: $(INSTALL_TEST_DIR) displayName: 'Install dependencies for samples smoke tests' continueOnError: false - script: | - . $(PY_VENV)/bin/activate export PATH=$HOME/.local/bin:$PATH export IE_APP_PATH=$(INSTALL_DIR)/samples_bin export LD_LIBRARY_PATH=$IE_APP_PATH:$LD_LIBRARY_PATH @@ -526,7 +497,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(REPO_DIR)/tools/mo/:$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU @@ -535,7 +505,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(REPO_DIR)/tools/mo/:$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU @@ -544,7 +513,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=$(INSTALL_TEST_DIR)/TEST-tf_Roll.xmlTEST @@ -552,7 +520,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU @@ -561,7 +528,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU @@ -570,7 +536,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU @@ -579,7 +544,6 @@ jobs: continueOnError: false - script: | - . $(PY_VENV)/bin/activate python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH export TEST_DEVICE=CPU diff --git a/.ci/azure/linux_arm64.yml b/.ci/azure/linux_arm64.yml index 3dc27635cb9..0cc5b99cf0b 100644 --- a/.ci/azure/linux_arm64.yml +++ b/.ci/azure/linux_arm64.yml @@ -177,7 +177,6 @@ jobs: -DENABLE_PYTHON=OFF -DENABLE_TESTS=ON -DENABLE_DATA=OFF - -DENABLE_LTO=ON -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_INTEL_MYRIAD=OFF diff --git a/.ci/azure/linux_conditional_compilation.yml b/.ci/azure/linux_conditional_compilation.yml index 5b04b98e977..5563f066d1b 100644 --- a/.ci/azure/linux_conditional_compilation.yml +++ b/.ci/azure/linux_conditional_compilation.yml @@ -86,20 +86,6 @@ jobs: - script: | set -e sudo -E $(REPO_DIR)/install_build_dependencies.sh - wget https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tgz - tar -xzf Python-3.10.6.tgz - cd Python-3.10.6 || exit - ./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" - make -j 1 python - sudo make -j 1 install - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - /usr/local/bin/python3.10 -m venv $(WORK_DIR)/.venv - . $(WORK_DIR)/.venv/bin/activate - echo Python3 info ; which python3 ; python3 --version - python3 --version - python3.10 --version - curl https://bootstrap.pypa.io/get-pip.py | python3 - python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt # Speed up build wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip unzip ninja-linux.zip @@ -122,17 +108,13 @@ jobs: -DENABLE_FASTER_BUILD=ON -DENABLE_PROFILING_ITT=ON -DSELECTIVE_BUILD=COLLECT - -DPYTHON_EXECUTABLE=$(WORK_DIR)/.venv/bin/python3.10 - -DENABLE_CLDNN=OFF -DENABLE_INTEL_GPU=OFF -DENABLE_MULTI=OFF -DENABLE_AUTO=OFF -DENABLE_AUTO_BATCH=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF - -DENABLE_INTEL_MYRIAD=OFF -DENABLE_INTEL_MYRIAD_COMMON=OFF - -DENABLE_TESTS=OFF -DENABLE_OV_ONNX_FRONTEND=OFF -DENABLE_OV_PADDLE_FRONTEND=OFF -DENABLE_OV_TF_FRONTEND=OFF @@ -157,30 +139,12 @@ jobs: inputs: cmakeArgs: > -GNinja - -DVERBOSE_BUILD=ON - -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) - -DENABLE_FASTER_BUILD=ON - -DENABLE_PROFILING_ITT=OFF - -DENABLE_CLDNN=OFF - -DENABLE_INTEL_GPU=OFF - -DENABLE_MULTI=OFF - -DENABLE_AUTO=OFF - -DENABLE_AUTO_BATCH=OFF - -DENABLE_HETERO=OFF - -DENABLE_TEMPLATE=OFF - -DENABLE_INTEL_MYRIAD=OFF - -DENABLE_INTEL_MYRIAD_COMMON=OFF - -DENABLE_TESTS=OFF - -DENABLE_OV_ONNX_FRONTEND=OFF - -DENABLE_OV_PADDLE_FRONTEND=OFF - -DENABLE_OV_TF_FRONTEND=OFF -DSELECTIVE_BUILD=ON -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)/*.csv $(REPO_DIR) workingDirectory: $(BUILD_DIR) - - script: cmake --build . - workingDirectory: $(BUILD_DIR) + - script: cmake --build $(BUILD_DIR) displayName: 'Build LinCC ON' - script: ls -alR $(REPO_DIR)/bin/ diff --git a/.ci/azure/linux_debian.yml b/.ci/azure/linux_debian.yml index 3760bf98e58..3e2c5604d87 100644 --- a/.ci/azure/linux_debian.yml +++ b/.ci/azure/linux_debian.yml @@ -134,6 +134,8 @@ jobs: python3 -m pip install -r $(REPO_DIR)/src/frontends/paddle/tests/requirements.txt # For running ONNX frontend unit tests python3 -m pip install -r $(REPO_DIR)/src/frontends/onnx/tests/requirements.txt + # For running TensorFlow frontend unit tests + python3 -m pip install -r $(REPO_DIR)/src/frontends/tensorflow/tests/requirements.txt # For MO unit tests python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements.txt python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements_dev.txt diff --git a/.ci/azure/linux_ngraph_onnx.yml b/.ci/azure/linux_ngraph_onnx.yml index 982a375197d..a385187b7e3 100644 --- a/.ci/azure/linux_ngraph_onnx.yml +++ b/.ci/azure/linux_ngraph_onnx.yml @@ -94,39 +94,30 @@ jobs: - script: | set -e apt-get update && apt-get install -y lsb-release && apt-get clean all - sudo apt-get -y install libssl-dev zlib1g-dev - sudo apt-get -y install build-essential - wget https://www.python.org/ftp/python/3.10.7/Python-3.10.7.tgz - tar -xzf Python-3.10.7.tgz - cd Python-3.10.7 || exit - ./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" - make python - sudo make install - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - /usr/local/bin/python3.10 -m venv $(WORK_DIR)/.venv - . $(WORK_DIR)/.venv/bin/activate - echo Python3 info ; which python3 ; python3 --version - python3 --version - python3.10 --version - curl https://bootstrap.pypa.io/get-pip.py | python3 - sudo apt --assume-yes install git-lfs uidmap curl -fsSL https://get.docker.com -o get-docker.sh sudo sh get-docker.sh workingDirectory: $(WORK_DIR) displayName: 'Install dependencies' - script: - . $(WORK_DIR)/.venv/bin/activate src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)" displayName: 'Update models' condition: ne(variables['BUILD_TYPE'], 'Debug') - - script: - sudo docker build --tag=openvino-onnx-ci-image --file=.ci/openvino-onnx/Dockerfile --build-arg BUILD_TYPE=$(BUILD_TYPE) . + - script: | + sudo docker build \ + --tag=openvino-onnx-ci-image \ + --file=.ci/openvino-onnx/Dockerfile \ + --build-arg BUILD_TYPE=$(BUILD_TYPE) . displayName: 'Docker build $(BUILD_TYPE)' - script: sudo fallocate -l 64G /swapfile ; sudo mkswap /swapfile ; sudo swapon /swapfile ; df ; free -h displayName: 'Create swap' - - script: sudo docker run --name openvino-onnx-ci-container --volume $(MODELS_DIR)/models_data/model_zoo/onnx_model_zoo_$(ONNX_MODEL_ZOO_SHA):/root/.onnx/model_zoo/onnx_model_zoo --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image /bin/bash -c "$(TOX_COMMAND)" + - script: | + sudo docker run \ + --name openvino-onnx-ci-container \ + --volume $(MODELS_DIR)/models_data/model_zoo/onnx_model_zoo_$(ONNX_MODEL_ZOO_SHA):/root/.onnx/model_zoo/onnx_model_zoo \ + --volume $(MODELS_DIR)/msft:/root/.onnx/model_zoo/MSFT openvino-onnx-ci-image \ + /bin/bash -c "$(TOX_COMMAND)" displayName: 'Docker run $(BUILD_TYPE)' diff --git a/.ci/azure/linux_onnxruntime.yml b/.ci/azure/linux_onnxruntime.yml index 13a5b4abfce..fdea5db70a4 100644 --- a/.ci/azure/linux_onnxruntime.yml +++ b/.ci/azure/linux_onnxruntime.yml @@ -47,8 +47,6 @@ jobs: BUILD_DIR: $(WORK_DIR)/build ONNXRUNTIME_UTILS: $(REPO_DIR)/.ci/azure/ci_utils/onnxruntime ONNXRUNTIME_BUILD_DIR: $(ONNXRUNTIME_REPO_DIR)/build - PY_VENV: $(WORK_DIR)/.venv - PYTHON_VERSION: 3.10.7 steps: - script: | @@ -93,23 +91,6 @@ jobs: - script: | set -e sudo -E $(REPO_DIR)/install_build_dependencies.sh - wget https://www.python.org/ftp/python/"$PYTHON_VERSION"/Python-"$PYTHON_VERSION".tgz - tar -xzf Python-"$PYTHON_VERSION".tgz - cd Python-"$PYTHON_VERSION" || exit - ./configure --enable-optimizations --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" - make python - sudo make install - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - /usr/local/bin/python3.10 -m venv $(PY_VENV) - . $(PY_VENV)/bin/activate - echo Python3 info ; which python3 ; python3 --version - python3 --version - python3.10 --version - curl https://bootstrap.pypa.io/get-pip.py | python3 - python3 -m pip install --upgrade pip - python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt - # For running Python API tests - python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements-dev.txt # Speed up build wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip unzip ninja-linux.zip @@ -126,17 +107,15 @@ jobs: -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DCMAKE_COMPILE_WARNING_AS_ERROR=ON - -DENABLE_PYTHON=ON - -DPYTHON_EXECUTABLE=$(PY_VENV)/bin/python3.10 -DENABLE_INTEL_MYRIAD_COMMON=OFF -DENABLE_INTEL_GNA=OFF - -DENABLE_CPPLINT=OFF - -DENABLE_TESTS=OFF - -DENABLE_INTEL_CPU=ON -DENABLE_INTEL_GPU=OFF + -DENABLE_CPPLINT=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF - -DENABLE_OV_ONNX_FRONTEND=ON + -DENABLE_COMPILE_TOOL=OFF + -DENABLE_OV_TF_FRONTEND=OFF + -DENABLE_OV_PADDLE_FRONTEND=OFF -DENABLE_OPENVINO_DEBUG=OFF $(REPO_DIR) workingDirectory: $(BUILD_DIR) @@ -150,17 +129,15 @@ jobs: - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake workingDirectory: $(BUILD_DIR) - displayName: 'Install' + displayName: 'Install OpenVINO' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh CXXFLAGS="-Wno-error=deprecated-declarations" ./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 Lin ONNX Runtime' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh skip_tests=`tr -s '\n ' ':' < $(ONNXRUNTIME_UTILS)/skip_tests` ./onnxruntime_test_all --gtest_filter=-$skip_tests @@ -168,35 +145,30 @@ jobs: displayName: 'Run onnxruntime_test_all' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh ./onnxruntime_shared_lib_test workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo displayName: 'Run onnxruntime_shared_lib_test' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh ./onnxruntime_global_thread_pools_test workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo displayName: 'Run onnxruntime_global_thread_pools_test' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh ./onnxruntime_api_tests_without_env workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo displayName: 'Run onnxruntime_api_tests_without_env' - script: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/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: | - . $(PY_VENV)/bin/activate source $(INSTALL_DIR)/setupvars.sh ./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-operator" workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml index 402a21dcba2..dff3847e1ad 100644 --- a/.ci/azure/mac.yml +++ b/.ci/azure/mac.yml @@ -128,7 +128,6 @@ jobs: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ -DENABLE_PYTHON=ON \ - -DENABLE_TESTS=OFF \ -DENABLE_STRICT_DEPENDENCIES=OFF \ -DOPENVINO_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 5bcc09eb3d4..40f1f144451 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -155,6 +155,8 @@ jobs: python -m pip install -r $(REPO_DIR)\src\frontends\paddle\tests\requirements.txt rem For running ONNX frontend unit tests python -m pip install -r $(REPO_DIR)\src\frontends\onnx\tests\requirements.txt + rem For running TensorFlow frontend unit tests + python -m pip install -r $(REPO_DIR)\src\frontends\tensorflow\tests\requirements.txt rem For MO unit tests python -m pip install -r $(REPO_DIR)\tools\mo\requirements.txt python -m pip install -r $(REPO_DIR)\tools\mo\requirements_dev.txt diff --git a/install_build_dependencies.sh b/install_build_dependencies.sh index 4b5c19a3d98..8f1aa9a6b56 100755 --- a/install_build_dependencies.sh +++ b/install_build_dependencies.sh @@ -165,13 +165,14 @@ else echo "Unknown OS, please install build dependencies manually" fi -# cmake 3.20 or higher is required to build OpenVINO +# cmake 3.20.0 or higher is required to build OpenVINO current_cmake_ver=$(cmake --version | sed -ne 's/[^0-9]*\(\([0-9]\.\)\{0,4\}[0-9][^.]\).*/\1/p') required_cmake_ver=3.20.0 if [ ! "$(printf '%s\n' "$required_cmake_ver" "$current_cmake_ver" | sort -V | head -n1)" = "$required_cmake_ver" ]; then installed_cmake_ver=3.23.2 - wget "https://github.com/Kitware/CMake/releases/download/v${installed_cmake_ver}/cmake-${installed_cmake_ver}.tar.gz" - tar xf cmake-${installed_cmake_ver}.tar.gz - (cd cmake-${installed_cmake_ver} && ./bootstrap --parallel="$(nproc --all)" && make --jobs="$(nproc --all)" && make install) - rm -rf "cmake-${installed_cmake_ver}" "cmake-${installed_cmake_ver}.tar.gz" + arch=$(uname -m) + wget "https://github.com/Kitware/CMake/releases/download/v${installed_cmake_ver}/cmake-${installed_cmake_ver}-linux-${arch}.sh" + chmod +x "cmake-${installed_cmake_ver}-linux-${arch}.sh" + "./cmake-${installed_cmake_ver}-linux-${arch}.sh" --skip-license --prefix=/usr/local + rm -rf "cmake-${installed_cmake_ver}-linux-${arch}.sh" fi