fix build on darwin arm

seasonjs · Nov 30, 2023 · ac8f5dd · ac8f5dd
1 parent e2acba2
commit ac8f5dd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -151,6 +151,7 @@ jobs:
         uses: Jimver/[email protected]
         with:
           cuda: '12.2.0'
+          method: 'local'
 
       - name: Peek cuda-toolkit info
         id: peek_cuda_toolkit

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,9 @@
 cmake_minimum_required(VERSION 3.12)
+
+if (APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+endif ()
+
 project("stable-diffusion-build")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -52,4 +57,4 @@ set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON)
 set_target_properties(stable-diffusion PROPERTIES POSITION_INDEPENDENT_CODE ON)
 set_target_properties(${SD_ABI} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
-target_link_libraries(${SD_ABI} PRIVATE ggml stable-diffusion ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${SD_ABI} PRIVATE stable-diffusion ${CMAKE_THREAD_LIBS_INIT})