Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-25 05:48:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

build : fix reference to old llama_util.h

Browse Source
This commit is contained in:
Georgi Gerganov 2023-04-29 13:53:12 +03:00
parent 84ca9c2ecf
commit 305eb5afd5
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -337,7 +337,7 @@ endif()
add_library(llama add_library(llama
llama.cpp llama.cpp
llama.h llama.h
llama_util.h) llama-util.h)
target_include_directories(llama PUBLIC .) target_include_directories(llama PUBLIC .)
target_compile_features(llama PUBLIC cxx_std_11) # don't bump target_compile_features(llama PUBLIC cxx_std_11) # don't bump

2
Makefile
View File

@ -168,7 +168,7 @@ $(info )
ggml.o: ggml.c ggml.h ggml-cuda.h ggml.o: ggml.c ggml.h ggml-cuda.h
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
llama.o: llama.cpp ggml.h ggml-cuda.h llama.h llama_util.h llama.o: llama.cpp ggml.h ggml-cuda.h llama.h llama-util.h
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
common.o: examples/common.cpp examples/common.h common.o: examples/common.cpp examples/common.h

10
examples/save-load-state/save-load-state.cpp
View File

@ -66,6 +66,7 @@ int main(int argc, char ** argv) {
// first run // first run
printf("\n%s", params.prompt.c_str()); printf("\n%s", params.prompt.c_str());
for (auto i = 0; i < params.n_predict; i++) { for (auto i = 0; i < params.n_predict; i++) {
auto logits = llama_get_logits(ctx); auto logits = llama_get_logits(ctx);
auto n_vocab = llama_n_vocab(ctx); auto n_vocab = llama_n_vocab(ctx);
@ -86,6 +87,7 @@ int main(int argc, char ** argv) {
} }
n_past += 1; n_past += 1;
} }
printf("\n\n"); printf("\n\n");
// free old model // free old model
@ -101,7 +103,13 @@ int main(int argc, char ** argv) {
fprintf(stderr, "\n%s : failed to validate state size\n", __func__); fprintf(stderr, "\n%s : failed to validate state size\n", __func__);
return 1; return 1;
} }
fread(state_mem, 1, state_size, fp_read);
const size_t ret = fread(state_mem, 1, state_size, fp_read);
if (ret != state_size) {
fprintf(stderr, "\n%s : failed to read state\n", __func__);
return 1;
}
llama_set_state_data(ctx2, state_mem); // could also read directly from memory mapped file llama_set_state_data(ctx2, state_mem); // could also read directly from memory mapped file
fclose(fp_read); fclose(fp_read);
} }