From 0dd7505ad4945ee522a130f5066801ac9e861ab3 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Wed, 17 Apr 2024 23:53:37 +0300 Subject: [PATCH] llamafile : tmp disable due to MoE bug ggml-ci --- CMakeLists.txt | 16 +++++++++++----- Makefile | 4 ++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58a1805ba..f134a153b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,11 +43,17 @@ else() set(LLAMA_METAL_DEFAULT OFF) endif() -if (CMAKE_SYSTEM_NAME MATCHES "ANDROID") - set(LLAMA_LLAMAFILE_DEFAULT OFF) -else() - set(LLAMA_LLAMAFILE_DEFAULT ON) -endif() +# TODO: fix this for Android CI +# https://github.com/ggerganov/llama.cpp/pull/6716#issuecomment-2061509191 +#if (CMAKE_SYSTEM_NAME MATCHES "ANDROID") +# set(LLAMA_LLAMAFILE_DEFAULT OFF) +#else() +# set(LLAMA_LLAMAFILE_DEFAULT ON) +#endif() + +# TODO: temporary disable until MoE is fixed +# https://github.com/ggerganov/llama.cpp/pull/6716 +set(LLAMA_LLAMAFILE_DEFAULT OFF) # general option(BUILD_SHARED_LIBS "build shared libraries" OFF) diff --git a/Makefile b/Makefile index fa1e3339e..760015f29 100644 --- a/Makefile +++ b/Makefile @@ -384,6 +384,10 @@ ifdef LLAMA_OPENBLAS MK_LDFLAGS += $(shell pkg-config --libs openblas) endif # LLAMA_OPENBLAS +# TODO: temporary disable until MoE is fixed +# https://github.com/ggerganov/llama.cpp/pull/6716 +LLAMA_NO_LLAMAFILE := 1 + ifndef LLAMA_NO_LLAMAFILE MK_CPPFLAGS += -DGGML_USE_LLAMAFILE OBJS += sgemm.o