diff --git a/.gitignore b/.gitignore index f1322f7ab..7b72fdff5 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,4 @@ koboldcpp.dll koboldcpp_failsafe.dll koboldcpp_openblas.dll koboldcpp_openblas_noavx2.dll -koboldcpp_clblast.dll - -ggml-metal.m.patched +koboldcpp_clblast.dll \ No newline at end of file diff --git a/Makefile b/Makefile index f015d990a..69dee96a7 100644 --- a/Makefile +++ b/Makefile @@ -141,13 +141,6 @@ ifdef LLAMA_METAL ggml-metal.o: ggml-metal.m ggml-metal.h $(CC) $(CFLAGS) -c $< -o $@ - -ggml-metal.m: ggml-metal.m.patched - -ggml-metal.m.patched: ggml-metal.m.diff - if [ -e $@ ]; then patch -R ggml-metal.m $@; fi - patch ggml-metal.m $< - cp ggml-metal.m.diff $@ endif # LLAMA_METAL ifneq ($(filter aarch64%,$(UNAME_M)),) @@ -285,7 +278,7 @@ gpttype_adapter_clblast.o: gpttype_adapter.cpp $(CXX) $(CXXFLAGS) $(CLBLAST_FLAGS) -c $< -o $@ clean: - rm -vf *.o main quantize_llama quantize_gpt2 quantize_gptj quantize_neox quantize_mpt quantize-stats perplexity embedding benchmark-matmult save-load-state main.exe quantize_llama.exe quantize_gptj.exe quantize_gpt2.exe quantize_neox.exe quantize_mpt.exe koboldcpp.dll koboldcpp_openblas.dll koboldcpp_failsafe.dll koboldcpp_openblas_noavx2.dll koboldcpp_clblast.dll koboldcpp_clblast_noavx2.dll koboldcpp.so koboldcpp_openblas.so koboldcpp_failsafe.so koboldcpp_openblas_noavx2.so koboldcpp_clblast.so koboldcpp_clblast_noavx2.so ggml-metal.m.patched + rm -vf *.o main quantize_llama quantize_gpt2 quantize_gptj quantize_neox quantize_mpt quantize-stats perplexity embedding benchmark-matmult save-load-state main.exe quantize_llama.exe quantize_gptj.exe quantize_gpt2.exe quantize_neox.exe quantize_mpt.exe koboldcpp.dll koboldcpp_openblas.dll koboldcpp_failsafe.dll koboldcpp_openblas_noavx2.dll koboldcpp_clblast.dll koboldcpp_clblast_noavx2.dll koboldcpp.so koboldcpp_openblas.so koboldcpp_failsafe.so koboldcpp_openblas_noavx2.so koboldcpp_clblast.so koboldcpp_clblast_noavx2.so main: examples/main/main.cpp build-info.h ggml.o k_quants.o llama.o common.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) diff --git a/ggml-metal.m b/ggml-metal.m index 0953af6a4..16b4aa365 100644 --- a/ggml-metal.m +++ b/ggml-metal.m @@ -99,7 +99,7 @@ struct ggml_metal_context * ggml_metal_init(void) { NSError * error = nil; //NSString * path = [[NSBundle mainBundle] pathForResource:@"../../examples/metal/metal" ofType:@"metal"]; - NSString * path = [[NSBundle mainBundle] pathForResource:@"ggml-metal" ofType:@"metal"]; + NSString * path = @"./ggml-metal.metal"; fprintf(stderr, "%s: loading '%s'\n", __func__, [path UTF8String]); NSString * src = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error]; diff --git a/ggml-metal.m.diff b/ggml-metal.m.diff deleted file mode 100644 index 52070cac6..000000000 --- a/ggml-metal.m.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ggml-metal.m 2023-06-09 00:52:44 -+++ ggml-metal.m 2023-06-09 00:52:31 -@@ -99,7 +99,7 @@ - NSError * error = nil; - - //NSString * path = [[NSBundle mainBundle] pathForResource:@"../../examples/metal/metal" ofType:@"metal"]; -- NSString * path = [[NSBundle mainBundle] pathForResource:@"ggml-metal" ofType:@"metal"]; -+ NSString * path = @"./ggml-metal.metal"; - fprintf(stderr, "%s: loading '%s'\n", __func__, [path UTF8String]); - - NSString * src = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error];