metal : switch back to default.metallib (ggml/681)

ggml-ci

diff --git a/extra/sync-ggml.last b/extra/sync-ggml.last
index 354246a264eb4c40793d3ef850660e3771915b39..fe7f3202f4bb6dd29c91c2e1dc7435c1200051f3 100644 (file)
--- a/extra/sync-ggml.last
+++ b/extra/sync-ggml.last
@@ -1 +1 @@
-3fd01e00e40583ccd4b393a7c6502d6a4455a1d5
+f96711108d55bdbbd277e6be07204dce6a94fb93

diff --git a/ggml-metal.m b/ggml-metal.m
index 55cc1a872b21e711366f5638a82d142255a1d39b..fbbdcd8c4672687d2969fbebbd83966696975a5a 100644 (file)
--- a/ggml-metal.m
+++ b/ggml-metal.m
@@ -258,14 +258,14 @@ struct ggml_metal_context * ggml_metal_init(int n_cb) {
         bundle = [NSBundle bundleForClass:[GGMLMetalClass class]];
 #endif
         NSError * error = nil;
-        NSString * libPath = [bundle pathForResource:@"ggml" ofType:@"metallib"];
+        NSString * libPath = [bundle pathForResource:@"default" ofType:@"metallib"];
         if (libPath != nil) {
             // pre-compiled library found
             NSURL * libURL = [NSURL fileURLWithPath:libPath];
             GGML_METAL_LOG_INFO("%s: loading '%s'\n", __func__, [libPath UTF8String]);
             ctx->library = [ctx->device newLibraryWithURL:libURL error:&error];
         } else {
-            GGML_METAL_LOG_INFO("%s: ggml.metallib not found, loading from source\n", __func__);
+            GGML_METAL_LOG_INFO("%s: default.metallib not found, loading from source\n", __func__);
 
             NSString * sourcePath;
             NSString * ggmlMetalPathResources = [[NSProcessInfo processInfo].environment objectForKey:@"GGML_METAL_PATH_RESOURCES"];
@@ -295,7 +295,7 @@ struct ggml_metal_context * ggml_metal_init(int n_cb) {
 #endif
             // try to disable fast-math
             // NOTE: this seems to have no effect whatsoever
-            //       instead, in order to disable fast-math, we have to build ggml.metallib from the command line
+            //       instead, in order to disable fast-math, we have to build default.metallib from the command line
             //       using xcrun -sdk macosx metal -fno-fast-math -c ggml-metal.metal -o ggml-metal.air
             //       and go through the "pre-compiled library found" path above
             //[options setFastMathEnabled:false];