llama+metal: python bindings work

apage43 · apage43 · commit 99f901a34fc1 · 2023-06-09T13:02:51.000-07:00
`ggml-metal.metal` is now searched for next to the .so/.dylib by adding ggml-org/llama.cpp#1782 to our fork.
diff --git a/gpt4all-backend/llama.cpp-mainline b/gpt4all-backend/llama.cpp-mainline
@@ -1 +1 @@
-Subproject commit b33dee282f5d8032b5f780152732dc45cbf2d349
+Subproject commit 37bdb72c4f43d68c1bba119372c183d68ff126ea
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

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ if(METAL_SHADER_FILE)`
`142`	`142`	`set_target_properties(chat PROPERTIES`
`143`	`143`	`RESOURCE ${METAL_SHADER_FILE}`
`144`	`144`	`)`
	`145`	`+ configure_file(${METAL_SHADER_FILE} bin/ggml-metal.metal COPYONLY)`
`145`	`146`	`endif()`
`146`	`147`
`147`	`148`	`target_compile_definitions(chat`