fix: rename metal resource & gguf_ defs for avoid conflit with llama.rn

mybigday · Oct 25, 2023 · d45e235 · d45e235
1 parent 57c08c9
commit d45e235
Show file tree

Hide file tree

Showing 6 changed files with 426 additions and 412 deletions.
diff --git a/cpp/ggml-metal.metal → cpp/ggml-metal-whisper.metal b/cpp/ggml-metal.metal → cpp/ggml-metal-whisper.metal
diff --git a/cpp/ggml-metal.m b/cpp/ggml-metal.m
@@ -115,9 +115,9 @@
 static NSString * const msl_library_source = @"see metal.metal";
 
 // Here to assist with NSBundle Path Hack
-@interface GGMLMetalClass : NSObject
+@interface WSPGGMLMetalClass : NSObject
 @end
-@implementation GGMLMetalClass
+@implementation WSPGGMLMetalClass
 @end
 
 struct wsp_ggml_metal_context * wsp_ggml_metal_init(int n_cb) {
@@ -155,7 +155,7 @@ @implementation GGMLMetalClass
     {
         NSError * error = nil;
 
-        NSBundle * bundle = [NSBundle bundleForClass:[GGMLMetalClass class]];
+        NSBundle * bundle = [NSBundle bundleForClass:[WSPGGMLMetalClass class]];
         NSString * llamaBundlePath = [bundle pathForResource:@"llama_llama" ofType:@"bundle"];
         NSBundle * llamaBundle = [NSBundle bundleWithPath:llamaBundlePath];
         NSString * libPath = [llamaBundle pathForResource:@"default" ofType:@"metallib"];
@@ -177,8 +177,8 @@ @implementation GGMLMetalClass
         NSError * error = nil;
 
         //NSString * path = [[NSBundle mainBundle] pathForResource:@"../../examples/metal/metal" ofType:@"metal"];
-        NSBundle * bundle = [NSBundle bundleForClass:[GGMLMetalClass class]];
-        NSString * path   = [bundle pathForResource:@"ggml-metal" ofType:@"metal"];
+        NSBundle * bundle = [NSBundle bundleForClass:[WSPGGMLMetalClass class]];
+        NSString * path   = [bundle pathForResource:@"ggml-metal-whisper" ofType:@"metal"];
         metal_printf("%s: loading '%s'\n", __func__, [path UTF8String]);
 
         NSString * src  = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error];