Merge pull request #847 from xmos/macbuildfix

Fix macos slowdown and arm64
xmos · Oct 26, 2023 · 9fd4739 · 9fd4739
2 parents 14b2d56 + 9d097cd
commit 9fd4739
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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