]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
build : add ACCELERATE_NEW_LAPACK to fix warning on macOS Sonoma (#3342)
authorJag Chadha <redacted>
Wed, 27 Sep 2023 15:34:32 +0000 (11:34 -0400)
committerGitHub <redacted>
Wed, 27 Sep 2023 15:34:32 +0000 (18:34 +0300)
CMakeLists.txt
Makefile
Package.swift

index 47425c9c60ac9ab3687f09256f4b3944eb913579..c4a649a9762758d6d353fa04e40253f8f9551edc 100644 (file)
@@ -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")
index e07db8afa16f509bcf2e733b422616d77b0af19b..f170f229399424e10b0343568021def17ba6cb12 100644 (file)
--- 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
index fb95ef7ebc59f05ffa63c48e74eefd36f098fe65..442463ba3430f8858ac0cd4ee9c90eb12e561033 100644 (file)
@@ -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")