llama : add llama_sampling and combine it with llama_grammar

ggml-ci
ggerganov · Aug 10, 2024 · 97ab664 · 97ab664
1 parent 911b437
commit 97ab664
Show file tree

Hide file tree

Showing 45 changed files with 1,611 additions and 1,554 deletions.
diff --git a/Makefile b/Makefile
@@ -923,7 +923,6 @@ OBJ_COMMON = \
 	common/ngram-cache.o \
 	common/sampling.o \
 	common/train.o \
-	common/grammar-parser.o \
 	common/build-info.o \
 	common/json-schema-to-grammar.o
 
@@ -1163,11 +1162,6 @@ common/console.o: \
 	common/console.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-common/grammar-parser.o: \
-	common/grammar-parser.cpp \
-	common/grammar-parser.h
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
 common/json-schema-to-grammar.o: \
 	common/json-schema-to-grammar.cpp \
 	common/json-schema-to-grammar.h

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -58,8 +58,6 @@ add_library(${TARGET} STATIC
     sampling.cpp
     console.h
     console.cpp
-    grammar-parser.h
-    grammar-parser.cpp
     json.hpp
     json-schema-to-grammar.cpp
     train.h

diff --git a/common/common.cpp b/common/common.cpp
@@ -2159,7 +2159,7 @@ struct llama_init_result llama_init_from_gpt_params(gpt_params & params) {
         llama_decode(lctx, llama_batch_get_one(tmp.data(), std::min(tmp.size(), (size_t) params.n_batch), 0, 0));
         llama_kv_cache_clear(lctx);
         llama_synchronize(lctx);
-        llama_reset_timings(lctx);
+        llama_reset_timings(lctx, nullptr);
     }
 
     iparams.model   = model;