diff --git a/CMakeLists.txt b/CMakeLists.txt index 839aad003..f2bb5f354 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ if (LLAMA_METAL) configure_file(ggml-metal.metal bin/ggml-metal.metal COPYONLY) set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} - ${FOUNDATION_LIBRARY} + ${FOUNDATION_LIBRARY} ${METAL_FRAMEWORK} ${METALKIT_FRAMEWORK} ) @@ -700,6 +700,7 @@ target_compile_features(llama PUBLIC cxx_std_20) # don't bump target_link_libraries(llama PRIVATE ggml ${LLAMA_EXTRA_LIBS} + -ldynet ) if (BUILD_SHARED_LIBS) diff --git a/Makefile b/Makefile index ed91090be..203318320 100644 --- a/Makefile +++ b/Makefile @@ -541,6 +541,8 @@ $(info ) ggml.o: ggml.cpp ggml.h ggml-cuda.h $(CXX) $(CXXFLAGS) -c $< -o $@ +libdynet.o: libdynet.cpp ggml.h ggml-cuda.h + $(CXX) $(CXXFLAGS) -c $< -o $@ ggml-alloc.o: ggml-alloc.cpp ggml.h ggml-alloc.h $(CXX) $(CXXFLAGS) -c $< -o $@ @@ -551,7 +553,7 @@ ggml-backend.o: ggml-backend.cpp ggml.h ggml-backend.h ggml-quants.o: ggml-quants.cpp ggml.h ggml-quants.h $(CXX) $(CXXFLAGS) -c $< -o $@ -OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o +OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o libdynet.o llama.o: llama.cpp ggml.h ggml-alloc.h ggml-backend.h ggml-cuda.h ggml-metal.h llama.h $(CXX) $(CXXFLAGS) -c $< -o $@ @@ -584,8 +586,8 @@ clean: # Examples # -main: examples/main/main.cpp ggml.o llama.o $(COMMON_DEPS) console.o grammar-parser.o $(OBJS) - $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) +main: examples/main/main.cpp ggml.o llama.o $(COMMON_DEPS) console.o grammar-parser.o $(OBJS) + $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) -ldynet @echo @echo '==== Run ./main -h for help. ====' @echo diff --git a/examples/main/CMakeLists.txt b/examples/main/CMakeLists.txt index d532980b7..cb6c6d166 100644 --- a/examples/main/CMakeLists.txt +++ b/examples/main/CMakeLists.txt @@ -1,5 +1,5 @@ set(TARGET main) add_executable(${TARGET} main.cpp) install(TARGETS ${TARGET} RUNTIME) -target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) -target_compile_features(${TARGET} PRIVATE cxx_std_11) +target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT} ) +target_compile_features(${TARGET} PRIVATE cxx_std_20)