release : v1.4.3

ggerganov · Nov 7, 2023 · 9752de4 · 9752de4
1 parent 44b39fd
commit 9752de4
Show file tree

Hide file tree

Showing 8 changed files with 399 additions and 146 deletions.
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ publish: publish-trigger
 		\n\
 		cd /path/to/whisper.cpp/bindings/ios\n\
 		git commit\n\
-		git tag 1.4.2\n\
+		git tag 1.4.3\n\
 		git push origin master --tags\n\
 		"
 

diff --git a/Sources/test-objc/main.m b/Sources/test-objc/main.m
@@ -15,7 +15,9 @@
 
 int main(void) {
     // load the model (use correct path)
-    struct whisper_context * ctx = whisper_init_from_file("models/for-tests-ggml-base.en.bin");
+    struct whisper_context_params cparams = whisper_context_default_params();
+
+    struct whisper_context * ctx = whisper_init_from_file_with_params("models/for-tests-ggml-base.en.bin", cparams);
     CHECK_T(ctx != NULL);
 
     // run the model

diff --git a/Sources/test-swift/main.swift b/Sources/test-swift/main.swift
@@ -3,7 +3,9 @@
 import Foundation
 import whisper
 
-let ctx = whisper_init_from_file("models/for-tests-ggml-base.en.bin")
+let cparams = whisper_context_default_params()
+
+let ctx = whisper_init_from_file_with_params("models/for-tests-ggml-base.en.bin", cparams)
 
 var params = whisper_full_default_params(WHISPER_SAMPLING_GREEDY)
 

diff --git a/Sources/whisper/ggml-metal.m b/Sources/whisper/ggml-metal.m
@@ -1030,7 +1030,7 @@ void ggml_metal_graph_compute(
                             [encoder setBytes:&ne00 length:sizeof(ne00) atIndex:2];
                             [encoder setBytes:&ne01 length:sizeof(ne01) atIndex:3];
                             [encoder setBytes:&ne02 length:sizeof(ne02) atIndex:4];
-                            [encoder setThreadgroupMemoryLength:nth/32*sizeof(float) atIndex:0];
+                            [encoder setThreadgroupMemoryLength:GGML_PAD(nth/32*sizeof(float), 16) atIndex:0];
 
                             [encoder dispatchThreadgroups:MTLSizeMake(ne01*ne02*ne03, 1, 1) threadsPerThreadgroup:MTLSizeMake(nth, 1, 1)];
                         } break;
@@ -1342,7 +1342,7 @@ void ggml_metal_graph_compute(
                             [encoder setBytes:&ne00 length:sizeof( int64_t) atIndex:2];
                             [encoder setBytes:&nb01 length:sizeof(uint64_t) atIndex:3];
                             [encoder setBytes:&eps  length:sizeof(   float) atIndex:4];
-                            [encoder setThreadgroupMemoryLength:nth/32*sizeof(float) atIndex:0];
+                            [encoder setThreadgroupMemoryLength:GGML_PAD(nth/32*sizeof(float), 16) atIndex:0];
 
                             const int64_t nrows = ggml_nrows(src0);
 
@@ -1361,7 +1361,7 @@ void ggml_metal_graph_compute(
                             [encoder setBytes:&ne00    length:sizeof( int64_t) atIndex:2];
                             [encoder setBytes:&nb01    length:sizeof(uint64_t) atIndex:3];
                             [encoder setBytes:&eps     length:sizeof(   float) atIndex:4];
-                            [encoder setThreadgroupMemoryLength:nth*sizeof(float) atIndex:0];
+                            [encoder setThreadgroupMemoryLength:GGML_PAD(nth*sizeof(float), 16) atIndex:0];
 
                             const int64_t nrows = ggml_nrows(src0);