summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJag Chadha <jagtesh@gmail.com>2023-09-27 11:34:32 -0400
committerGitHub <noreply@github.com>2023-09-27 18:34:32 +0300
commit527e57cfd8a9a26bf622c0510c21c2508a24be26 (patch)
treece3a8c3e8db22b8ada94f5bb7a197b7adfad3d43
parentffe88a36a913e5792aa383f0726bdbcf632e7191 (diff)
build : add ACCELERATE_NEW_LAPACK to fix warning on macOS Sonoma (#3342)
-rw-r--r--CMakeLists.txt2
-rw-r--r--Makefile2
-rw-r--r--Package.swift2
3 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47425c9c..c4a649a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,6 +162,8 @@ if (APPLE AND LLAMA_ACCELERATE)
message(STATUS "Accelerate framework found")
add_compile_definitions(GGML_USE_ACCELERATE)
+ add_compile_definitions(ACCELERATE_NEW_LAPACK)
+ add_compile_definitions(ACCELERATE_LAPACK_ILP64)
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} ${ACCELERATE_FRAMEWORK})
else()
message(WARNING "Accelerate framework not found")
diff --git a/Makefile b/Makefile
index e07db8af..f170f229 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,8 @@ ifndef LLAMA_NO_ACCELERATE
# `-framework Accelerate` works both with Apple Silicon and Mac Intel
ifeq ($(UNAME_S),Darwin)
MK_CPPFLAGS += -DGGML_USE_ACCELERATE
+ MK_CPPFLAGS += -DACCELERATE_NEW_LAPACK
+ MK_CPPFLAGS += -DACCELERATE_LAPACK_ILP64
MK_LDFLAGS += -framework Accelerate
endif
endif # LLAMA_NO_ACCELERATE
diff --git a/Package.swift b/Package.swift
index fb95ef7e..442463ba 100644
--- a/Package.swift
+++ b/Package.swift
@@ -45,6 +45,8 @@ let package = Package(
.unsafeFlags(["-Wno-shorten-64-to-32"]),
.define("GGML_USE_K_QUANTS"),
.define("GGML_USE_ACCELERATE")
+ .define("ACCELERATE_NEW_LAPACK")
+ .define("ACCELERATE_LAPACK_ILP64")
] + additionalSettings,
linkerSettings: [
.linkedFramework("Accelerate")