Skip to content

Commit 229aab3

Browse files
authored
make : fix combination of LLAMA_METAL and LLAMA_MPI (#2208)
Fixes #2166 by moving commands after the CFLAGS are changed.
1 parent 6979666 commit 229aab3

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ ifdef LLAMA_MPI
151151
CFLAGS += -DGGML_USE_MPI -Wno-cast-qual
152152
CXXFLAGS += -DGGML_USE_MPI -Wno-cast-qual
153153
OBJS += ggml-mpi.o
154-
155-
ggml-mpi.o: ggml-mpi.c ggml-mpi.h
156-
$(CC) $(CFLAGS) -c $< -o $@
157154
endif # LLAMA_MPI
158155

159156
ifdef LLAMA_OPENBLAS
@@ -226,9 +223,6 @@ ifdef LLAMA_METAL
226223
CXXFLAGS += -DGGML_USE_METAL
227224
LDFLAGS += -framework Foundation -framework Metal -framework MetalKit -framework MetalPerformanceShaders
228225
OBJS += ggml-metal.o
229-
230-
ggml-metal.o: ggml-metal.m ggml-metal.h
231-
$(CC) $(CFLAGS) -c $< -o $@
232226
endif # LLAMA_METAL
233227

234228
ifneq ($(filter aarch64%,$(UNAME_M)),)
@@ -253,6 +247,16 @@ ifneq ($(filter armv8%,$(UNAME_M)),)
253247
CFLAGS += -mfp16-format=ieee -mno-unaligned-access
254248
endif
255249

250+
ifdef LLAMA_METAL
251+
ggml-metal.o: ggml-metal.m ggml-metal.h
252+
$(CC) $(CFLAGS) -c $< -o $@
253+
endif # LLAMA_METAL
254+
255+
ifdef LLAMA_MPI
256+
ggml-mpi.o: ggml-mpi.c ggml-mpi.h
257+
$(CC) $(CFLAGS) -c $< -o $@
258+
endif # LLAMA_MPI
259+
256260
ifdef LLAMA_NO_K_QUANTS
257261
k_quants.o: k_quants.c k_quants.h
258262
$(CC) $(CFLAGS) -c $< -o $@

0 commit comments

Comments
 (0)