Make it use metal again by buildVariant.

nomic-ai · Jun 9, 2023 · 4b4056d · 4b4056d
1 parent d345a24
commit 4b4056d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/gpt4all-backend/llmodel.cpp b/gpt4all-backend/llmodel.cpp
@@ -123,11 +123,15 @@ LLModel *LLModel::construct(const std::string &modelPath, std::string buildVaria
 
     //TODO: Auto-detect CUDA/OpenCL
     if (buildVariant == "auto") {
+#if defined(__APPLE__) && defined(__arm64__) // FIXME: See if metal works for intel macs
+        buildVariant = "metal";
+#else
         if (requires_avxonly()) {
             buildVariant = "avxonly";
         } else {
             buildVariant = "default";
         }
+#endif
     }
     // Read magic
     std::ifstream f(modelPath, std::ios::binary);

diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
@@ -59,10 +59,10 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 add_subdirectory(../gpt4all-backend llmodel)
 
 set(METAL_SHADER_FILE)
-
-if(LLAMA_METAL)
-set(METAL_SHADER_FILE ../gpt4all-backend/llama.cpp-mainline/ggml-metal.metal)
+if(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+  set(METAL_SHADER_FILE ../gpt4all-backend/llama.cpp-mainline/ggml-metal.metal)
 endif()
+
 qt_add_executable(chat
     main.cpp
     chat.h chat.cpp