Skip to content

Commit 4687efd

Browse files
committed
feat(makefile): add backend specific settings section
1 parent b42d4c8 commit 4687efd

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

Makefile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ LLAMA_OPTIONS = $(LLAMA) -DBUILD_SHARED_LIBS=OFF -DLLAMA_CURL=OFF -DLLAMA_BUILD_
4444
WHISPER_OPTIONS = $(WHISPER) -DBUILD_SHARED_LIBS=OFF -DWHISPER_BUILD_EXAMPLES=OFF -DWHISPER_BUILD_TESTS=OFF -DWHISPER_BUILD_SERVER=OFF -DWHISPER_RPC=OFF
4545
MINIAUDIO_OPTIONS = $(MINIAUDIO) -DBUILD_SHARED_LIBS=OFF -DMINIAUDIO_BUILD_EXAMPLES=OFF -DMINIAUDIO_BUILD_TESTS=OFF
4646
# Module-specific linker flags
47-
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -lcommon -lllama -lggml -lggml-base -lggml-cpu
47+
LLAMA_LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -lcommon -lllama -lggml -lggml-base
4848
WHISPER_LDFLAGS = -L./$(BUILD_WHISPER)/src -lwhisper
4949
MINIAUDIO_LDFLAGS = -L./$(BUILD_MINIAUDIO) -lminiaudio
5050
LDFLAGS = $(LLAMA_LDFLAGS) $(WHISPER_LDFLAGS) $(MINIAUDIO_LDFLAGS)
5151

5252
# Files
5353
SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
5454
OBJ_FILES = $(patsubst %.c, $(BUILD_DIR)/%.o, $(notdir $(SRC_FILES)))
55-
LLAMA_LIBS = $(BUILD_LLAMA)/common/libcommon.a $(BUILD_LLAMA)/ggml/src/libggml.a $(BUILD_LLAMA)/ggml/src/libggml-base.a $(BUILD_LLAMA)/ggml/src/libggml-cpu.a $(BUILD_LLAMA)/src/libllama.a
55+
LLAMA_LIBS = $(BUILD_LLAMA)/common/libcommon.a $(BUILD_LLAMA)/ggml/src/libggml.a $(BUILD_LLAMA)/ggml/src/libggml-base.a $(BUILD_LLAMA)/src/libllama.a
5656
WHISPER_LIBS = $(BUILD_WHISPER)/src/libwhisper.a
5757
MINIAUDIO_LIBS = $(BUILD_MINIAUDIO)/libminiaudio.a
5858

@@ -125,14 +125,18 @@ else # linux
125125
MINIAUDIO_LDFLAGS += -lpthread -lm
126126
LLAMA_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
127127
WHISPER_OPTIONS += -DGGML_OPENMP=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
128-
# Add Vulkan library for linux-vulkan build
129-
ifneq (,$(findstring VULKAN,$(LLAMA)))
130-
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-vulkan/libggml-vulkan.a
131-
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-vulkan -lggml-vulkan -lvulkan
132-
endif
133128
STRIP = strip --strip-unneeded $@
134129
endif
135130

131+
# Backend specific settings
132+
ifneq (,$(findstring VULKAN,$(LLAMA)))
133+
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/ggml-vulkan/libggml-vulkan.a
134+
LLAMA_LDFLAGS += -L./$(BUILD_LLAMA)/ggml/src/ggml-vulkan -lggml-vulkan
135+
else # CPU
136+
LLAMA_LDFLAGS += -lggml-cpu
137+
LLAMA_LIBS += $(BUILD_LLAMA)/ggml/src/libggml-cpu.a
138+
endif
139+
136140
# Windows .def file generation
137141
$(DEF_FILE):
138142
ifeq ($(PLATFORM),windows)

0 commit comments

Comments
 (0)