llama+metal: python bindings work

`ggml-metal.metal` is now searched for next to the .so/.dylib by adding ggerganov/llama.cpp#1782 to our fork.
nomic-ai · Jun 9, 2023 · 99f901a · 99f901a
1 parent d782f2b
commit 99f901a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/gpt4all-backend/llama.cpp-mainline b/gpt4all-backend/llama.cpp-mainline
diff --git a/gpt4all-bindings/python/setup.py b/gpt4all-bindings/python/setup.py
@@ -44,7 +44,7 @@ def copy_prebuilt_C_lib(src_dir, dest_dir, dest_build_dir):
                 d = os.path.join(dest_dir, item)
                 shutil.copy2(s, d)
                 files_copied += 1
-            if item.endswith(lib_ext):
+            if item.endswith(lib_ext) or item.endswith('.metal'):
                 s = os.path.join(dirpath, item)
                 d = os.path.join(dest_build_dir, item)
                 shutil.copy2(s, d)
@@ -88,4 +88,4 @@ def copy_prebuilt_C_lib(src_dir, dest_dir, dest_build_dir):
     },
     package_data={'llmodel': [os.path.join(DEST_CLIB_DIRECTORY, "*")]},
     include_package_data=True
-)
+)
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
@@ -142,6 +142,7 @@ if(METAL_SHADER_FILE)
     set_target_properties(chat PROPERTIES
         RESOURCE ${METAL_SHADER_FILE}
     )
+    configure_file(${METAL_SHADER_FILE} bin/ggml-metal.metal COPYONLY)
 endif()
 
 target_compile_definitions(chat
+6 −0		CMakeLists.txt
+1 −1		flake.nix
+9 −0		ggml-cuda.cu
+8 −1		ggml-metal.m
+9 −0		ggml-opencl.cpp
+2 −0		ggml-opencl.h
+5 −1		llama.cpp