[CI] [GHA] Remove unnecessary steps and cmake options, use proper # of CPU cores for ARM64 pipeline (#19746)

* address comments

* rm

* use machine's # of cpu core
This commit is contained in:
Andrey Kashchikhin 2023-09-11 19:37:42 +01:00 committed by GitHub
parent 2320329a51
commit 3e95e48309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 38 deletions

View File

@ -136,13 +136,6 @@ jobs:
restore-keys: |
linux-ubuntu
- name: Get tools versions
run: |
ninja --version || exit 1
ccache --version || exit 1
python3 --version || exit 1
cmake --version || exit 1
- name: Get number of CPU cores
uses: SimenB/github-actions-cpu-cores@v2
id: cpu-cores
@ -164,8 +157,6 @@ jobs:
-DENABLE_STRICT_DEPENDENCIES=OFF \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_LINKER_LAUNCHER=ccache \
-DCMAKE_C_LINKER_LAUNCHER=ccache \
-DENABLE_SYSTEM_SNAPPY=ON \
-DENABLE_SYSTEM_TBB=ON \
-DBUILD_nvidia_plugin=OFF \

View File

@ -65,11 +65,6 @@ jobs:
fetch-depth: '0'
submodules: 'recursive'
- name: Create Directories
run: |
mkdir -p ${{ env.BUILD_DIR }}
mkdir -p ${{ env.INSTALL_DIR }}
- name: Setup Python 3.11
uses: actions/setup-python@v4
with:
@ -118,13 +113,6 @@ jobs:
restore-keys: |
${{ github.job }}-linux-android-arm64
- name: Get tools versions
run: |
ninja --version
ccache --version
python3 --version
cmake --version
#
# Build
#
@ -163,8 +151,6 @@ jobs:
-DENABLE_TESTS=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_LINKER_LAUNCHER=ccache \
-DCMAKE_C_LINKER_LAUNCHER=ccache \
-S ${{ env.OPENVINO_REPO }} \
-B ${{ env.BUILD_DIR }}

View File

@ -1,4 +1,4 @@
name: Linux ARM64 (Ubuntu 20.04, Python 3.11)
name: Linux ARM64 with Conan (Ubuntu 20.04, Python 3.11)
on:
schedule:
# run daily at 00:00
@ -40,7 +40,6 @@ jobs:
CMAKE_GENERATOR: 'Ninja'
CMAKE_CXX_COMPILER_LAUNCHER: ccache
CMAKE_C_COMPILER_LAUNCHER: ccache
NUM_PROC: 2
BUILD_TYPE: Release
OPENVINO_REPO: ${{ github.workspace }}/openvino
BUILD_DIR: ${{ github.workspace }}/build
@ -62,11 +61,6 @@ jobs:
git submodule update --init -- ${{ env.OPENVINO_REPO }}/thirdparty/open_model_zoo
popd
- name: Create Directories
run: |
mkdir -p ${{ env.BUILD_DIR }}
mkdir -p ${{ env.INSTALL_DIR }}
- name: Setup Python 3.11
uses: actions/setup-python@v4
with:
@ -124,13 +118,6 @@ jobs:
restore-keys: |
${{ github.job }}-linux-arm64
- name: Get tools versions
run: |
ninja --version
ccache --version
python3 --version
cmake --version
- name: Install conan and dependencies
run: |
python3 -m pip install conan
@ -183,7 +170,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE=${{ env.BUILD_DIR }}/dependencies/conan_toolchain.cmake \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DARM_COMPUTE_SCONS_JOBS=${{ env.NUM_PROC }} \
-DARM_COMPUTE_SCONS_JOBS=${{ steps.cpu-cores.outputs.count }} \
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
-DENABLE_PYTHON_PACKAGING=ON \