From 3898e97bee7707dd3dce87cc5297929af8176733 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 24 Dec 2024 10:59:51 +0100 Subject: [PATCH] Migrate to macos arm64 --- .github/workflows/mac.yml | 18 ++++++++---------- tests/python_tests/requirements.txt | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 7a4ee31beb..030a203865 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -1,4 +1,4 @@ -name: macOS (12, Python 3.9) +name: macOS arm64 (14, Python 3.11) on: workflow_dispatch: pull_request: @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true env: - PYTHON_VERSION: '3.9' + PYTHON_VERSION: '3.11' OV_BRANCH: 0080d90974ca84f9a6d359da3388a2a18a93b753 OV_TARBALL: '' @@ -58,9 +58,9 @@ jobs: defaults: run: shell: bash - runs-on: 'macos-12-large' + runs-on: 'macos-14-xlarge' env: - MACOSX_DEPLOYMENT_TARGET: '10.15' + MACOSX_DEPLOYMENT_TARGET: '11.0' CMAKE_BUILD_TYPE: 'Release' CMAKE_GENERATOR: 'Ninja Multi-Config' CMAKE_CXX_COMPILER_LAUNCHER: ccache @@ -108,9 +108,9 @@ jobs: # github.ref_name is 'ref/PR_#' in case of the PR, and 'branch_name' when executed on push save: ${{ github.ref_name == 'master' && 'true' || 'false' }} verbose: 2 - key: ccache-mac + key: ccache-mac-arm64 restore-keys: | - ccache-mac + ccache-mac-arm64 - name: CMake configure - OpenVINO run: | @@ -130,8 +130,6 @@ jobs: -DENABLE_OV_PYTORCH_FRONTEND=ON \ -DENABLE_OV_TF_FRONTEND=ON \ -DENABLE_OV_TF_LITE_FRONTEND=OFF \ - -DENABLE_INTEL_GPU=OFF \ - -DENABLE_INTEL_NPU=OFF \ -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ @@ -182,7 +180,7 @@ jobs: defaults: run: shell: bash - runs-on: macos-13 + runs-on: macos-14 env: OV_INSTALL_DIR: ${{ github.workspace }}/ov @@ -247,7 +245,7 @@ jobs: defaults: run: shell: bash - runs-on: macos-13 + runs-on: macos-14 env: OV_INSTALL_DIR: ${{ github.workspace }}/ov diff --git a/tests/python_tests/requirements.txt b/tests/python_tests/requirements.txt index f59a7d7daa..00bffb6646 100644 --- a/tests/python_tests/requirements.txt +++ b/tests/python_tests/requirements.txt @@ -1,7 +1,7 @@ --extra-index-url https://download.pytorch.org/whl/cpu diffusers==0.31.0 optimum-intel @ git+https://github.com/huggingface/optimum-intel.git -numpy<2.0.0; platform_system == 'Darwin' +numpy<2.0.0; platform_system == "Darwin" and platform_machine == "x86_64" onnx==1.17.0 pytest