Skip to content

Commit fe18c29

Browse files
committed
talk-llama : sync llama.cpp
1 parent 234f9bd commit fe18c29

14 files changed

+4267
-1162
lines changed

Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -1080,10 +1080,12 @@ lsp: examples/lsp/lsp.cpp \
10801080
$(CXX) $(CXXFLAGS) $(CFLAGS_SDL) -c $< -o $(call GET_OBJ_FILE, $<)
10811081
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(LDFLAGS_SDL)
10821082

1083-
talk: examples/talk/talk.cpp examples/talk/gpt-2.cpp \
1084-
$(OBJ_GGML) $(OBJ_WHISPER) $(OBJ_COMMON) $(OBJ_SDL)
1085-
$(CXX) $(CXXFLAGS) $(CFLAGS_SDL) -c $< -o $(call GET_OBJ_FILE, $<)
1086-
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(LDFLAGS_SDL)
1083+
# TODO: disabled until update
1084+
# https://github.com/ggerganov/whisper.cpp/issues/1818
1085+
#talk: examples/talk/talk.cpp examples/talk/gpt-2.cpp \
1086+
# $(OBJ_GGML) $(OBJ_WHISPER) $(OBJ_COMMON) $(OBJ_SDL)
1087+
# $(CXX) $(CXXFLAGS) $(CFLAGS_SDL) -c $< -o $(call GET_OBJ_FILE, $<)
1088+
# $(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(LDFLAGS_SDL)
10871089

10881090
talk-llama: examples/talk-llama/talk-llama.cpp examples/talk-llama/llama.cpp examples/talk-llama/llama-vocab.cpp examples/talk-llama/llama-grammar.cpp examples/talk-llama/llama-sampling.cpp examples/talk-llama/unicode.cpp examples/talk-llama/unicode-data.cpp \
10891091
$(OBJ_GGML) $(OBJ_WHISPER) $(OBJ_COMMON) $(OBJ_SDL)

examples/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ endif (WHISPER_SDL2)
127127
add_subdirectory(quantize)
128128
set_target_properties(quantize PROPERTIES FOLDER "examples")
129129
if (WHISPER_SDL2)
130-
add_subdirectory(talk)
131-
set_target_properties(talk PROPERTIES FOLDER "examples")
130+
# TODO: disabled until update
131+
# https://github.com/ggerganov/whisper.cpp/issues/1818
132+
#add_subdirectory(talk)
133+
#set_target_properties(talk PROPERTIES FOLDER "examples")
132134
add_subdirectory(talk-llama)
133135
set_target_properties(talk-llama PROPERTIES FOLDER "examples")
134136
add_subdirectory(lsp)

0 commit comments

Comments
 (0)