From 765576e56568bac41e426ec29d245667c4c4c8da Mon Sep 17 00:00:00 2001 From: Ashraful Islam Date: Fri, 29 Dec 2023 14:05:05 -0600 Subject: [PATCH 1/3] updates Package.swift to use ggml as dependency --- Package.swift | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index bbb7fb03b99..4823f8396fc 100644 --- a/Package.swift +++ b/Package.swift @@ -13,9 +13,13 @@ let package = Package( products: [ .library(name: "whisper", targets: ["whisper"]), ], + dependencies: [ + .package(url: "https://github.com/1-ashraful-islam/ggml.git", .branch("master")) + ], targets: [ .target( name: "whisper", + dependencies: ["ggml"], path: ".", exclude: [ "bindings", @@ -32,14 +36,16 @@ let package = Package( "Makefile" ], sources: [ - "ggml.c", + // "ggml.c", "whisper.cpp", - "ggml-alloc.c", - "ggml-backend.c", - "ggml-quants.c", - "ggml-metal.m" + // "ggml-alloc.c", + // "ggml-backend.c", + // "ggml-quants.c", + // "ggml-metal.m" ], - resources: [.process("ggml-metal.metal")], + resources: [ + // .process("ggml-metal.metal") + ], publicHeadersPath: "spm-headers", cSettings: [ .unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]), From 0ce25d1e46fd096e01e9b758181494f013151e90 Mon Sep 17 00:00:00 2001 From: Ashraful Islam Date: Fri, 29 Dec 2023 14:12:58 -0600 Subject: [PATCH 2/3] cleans up the Package.swift file by removing redundant source files --- Package.swift | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Package.swift b/Package.swift index 4823f8396fc..641025ae0bc 100644 --- a/Package.swift +++ b/Package.swift @@ -36,16 +36,8 @@ let package = Package( "Makefile" ], sources: [ - // "ggml.c", "whisper.cpp", - // "ggml-alloc.c", - // "ggml-backend.c", - // "ggml-quants.c", - // "ggml-metal.m" ], - resources: [ - // .process("ggml-metal.metal") - ], publicHeadersPath: "spm-headers", cSettings: [ .unsafeFlags(["-Wno-shorten-64-to-32", "-O3", "-DNDEBUG"]), From 26b9c8926ccef19d37e07ce1c18988aedd4dc272 Mon Sep 17 00:00:00 2001 From: Ashraful Islam Date: Fri, 29 Dec 2023 14:30:07 -0600 Subject: [PATCH 3/3] updates ggml url src to ggerganov --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 641025ae0bc..a19dbf4acb8 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( .library(name: "whisper", targets: ["whisper"]), ], dependencies: [ - .package(url: "https://github.com/1-ashraful-islam/ggml.git", .branch("master")) + .package(url: "https://github.com/ggerganov/ggml.git", .branch("master")) ], targets: [ .target(