This commit is contained in:
Concedo 2024-12-10 00:09:09 +08:00
parent 5a263a5bd4
commit 6a99372332
2 changed files with 7 additions and 9 deletions

View file

@ -23,7 +23,7 @@ jobs:
- name: Build
id: make_build
run: |
make LLAMA_METAL=1
make LLAMA_METAL=1 LLAMA_PORTABLE=1
chmod +x './create_ver_file.sh'
. create_ver_file.sh
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --add-data './koboldcpp_default.so:.' --add-data './ggml-metal-merged.metal:.' --add-data './kcpp_adapters:./kcpp_adapters' --add-data './koboldcpp.py:.' --add-data './klite.embd:.' --add-data './kcpp_docs.embd:.' --add-data './kcpp_sdui.embd:.' --add-data './taesd.embd:.' --add-data './taesd_xl.embd:.' --add-data './rwkv_vocab.embd:.' --add-data './rwkv_world_vocab.embd:.' --version-file './version.txt' --clean --console koboldcpp.py -n "koboldcpp-mac-arm64"

View file

@ -308,16 +308,14 @@ ggml-metal.o: ggml/src/ggml-metal/ggml-metal.m ggml/src/ggml-metal/ggml-metal-im
$(CC) $(CFLAGS) -c $< -o $@
endif # LLAMA_METAL
ifneq ($(filter arm64% aarch64%,$(UNAME_M)),)
ifneq ($(filter aarch64%,$(UNAME_M)),)
# Apple M1, M2, etc.
# Raspberry Pi 3, 4, Zero 2 (64-bit)
ifdef LLAMA_PORTABLE
CFLAGS +=
CXXFLAGS +=
else
CFLAGS += -mcpu=native
CXXFLAGS += -mcpu=native
endif
ifdef LLAMA_PORTABLE
else
CFLAGS += -mcpu=native
CXXFLAGS += -mcpu=native
endif
endif
ifneq ($(filter armv6%,$(UNAME_M)),)