From 9d097cd137e6813476396ed50873054a60b692c0 Mon Sep 17 00:00:00 2001 From: panickal-xmos Date: Thu, 26 Oct 2023 17:05:37 +0100 Subject: [PATCH] Fix macos slowdown and arm64 --- .github/workflows/build-and-test.yml | 4 ++-- .github/workflows/release-beta.yml | 2 +- python/xmos_ai_tools/xinterpreters/CMakeLists.txt | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e2a53cc97..79599ce47 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -53,7 +53,7 @@ jobs: mkdir -p build cd build cmake .. - cmake --build . -t install --parallel --config Release + cmake --build . -t install --parallel 3 --config Release - name: Build xformer shell: bash @@ -208,7 +208,7 @@ jobs: mkdir -p build cd build cmake .. - cmake --build . -t install --parallel --config Release + cmake --build . -t install --parallel 2 --config Release - name: Build xformer shell: cmd diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml index 6d53c626b..82985c4ad 100644 --- a/.github/workflows/release-beta.yml +++ b/.github/workflows/release-beta.yml @@ -291,7 +291,7 @@ jobs: mkdir -p build cd build cmake .. - cmake --build . -t install --parallel --config Release + cmake --build . -t install --parallel 2 --config Release cd %GITHUB_WORKSPACE%/xformer set BAZEL_VC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC diff --git a/python/xmos_ai_tools/xinterpreters/CMakeLists.txt b/python/xmos_ai_tools/xinterpreters/CMakeLists.txt index c05a41328..2cb407639 100644 --- a/python/xmos_ai_tools/xinterpreters/CMakeLists.txt +++ b/python/xmos_ai_tools/xinterpreters/CMakeLists.txt @@ -19,8 +19,7 @@ endif() if(DEFINED ENV{CMAKE_ENABLE_DARWIN_TARGET_ARM64}) - set(CMAKE_OSX_ARCHITECTURES "arm64" - CACHE STRING "The list of target architectures to build") + set(BUILD_FLAGS ${BUILD_FLAGS} "-target" "arm64-apple-macos11") endif() set(TOP_DIR