Skip to content

Commit 5f8720f

Browse files
committed
add rpc-server to Makefile
1 parent a7060df commit 5f8720f

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

Makefile

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ ifeq ($(UNAME_S),Darwin)
6767
endif
6868
endif
6969

70+
ifdef LLAMA_RPC
71+
BUILD_TARGETS += rpc-server
72+
endif
73+
7074
default: $(BUILD_TARGETS)
7175

7276
test: $(TEST_TARGETS)
@@ -417,11 +421,10 @@ ifdef LLAMA_BLIS
417421
endif # LLAMA_BLIS
418422

419423
ifdef LLAMA_RPC
420-
MK_CPPFLAGS += -DGGML_USE_RPC
421-
OBJS += ggml-rpc.o
424+
MK_CPPFLAGS += -DGGML_USE_RPC
425+
OBJS += ggml-rpc.o
422426
endif # LLAMA_RPC
423427

424-
425428
ifdef LLAMA_CUBLAS
426429
# LLAMA_CUBLAS is deprecated and will be removed in the future
427430
LLAMA_CUDA := 1
@@ -632,6 +635,10 @@ ggml-metal-embed.o: ggml-metal.metal ggml-common.h
632635
endif
633636
endif # LLAMA_METAL
634637

638+
OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o unicode.o unicode-data.o
639+
COMMON_H_DEPS = common/common.h common/sampling.h common/log.h llama.h
640+
COMMON_DEPS = common.o sampling.o grammar-parser.o build-info.o json-schema-to-grammar.o
641+
635642
ifndef LLAMA_NO_LLAMAFILE
636643
sgemm.o: sgemm.cpp sgemm.h ggml.h
637644
$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -640,8 +647,13 @@ endif
640647
ifdef LLAMA_RPC
641648
ggml-rpc.o: ggml-rpc.cpp ggml-rpc.h
642649
$(CXX) $(CXXFLAGS) -c $< -o $@
643-
endif # LLAMA_RPC
644650

651+
rpc-server.o: examples/rpc/rpc-server.cpp ggml-rpc.h
652+
$(CXX) $(CXXFLAGS) -c $< -o $@
653+
654+
rpc-server: rpc-server.o ggml.o llama.o $(COMMON_DEPS) $(OBJS)
655+
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
656+
endif # LLAMA_RPC
645657

646658
GF_CC := $(CC)
647659
include scripts/get-flags.mk
@@ -722,14 +734,9 @@ unicode.o: unicode.cpp unicode.h
722734
unicode-data.o: unicode-data.cpp unicode-data.h
723735
$(CXX) $(CXXFLAGS) -c $< -o $@
724736

725-
OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o unicode.o unicode-data.o
726-
727737
llama.o: llama.cpp unicode.h ggml.h ggml-alloc.h ggml-backend.h ggml-cuda.h ggml-metal.h llama.h
728738
$(CXX) $(CXXFLAGS) -c $< -o $@
729739

730-
COMMON_H_DEPS = common/common.h common/sampling.h common/log.h llama.h
731-
COMMON_DEPS = common.o sampling.o grammar-parser.o build-info.o json-schema-to-grammar.o
732-
733740
common.o: common/common.cpp $(COMMON_H_DEPS)
734741
$(CXX) $(CXXFLAGS) -c $< -o $@
735742

0 commit comments

Comments
 (0)