Merge branch 'master' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	README.md
#	llama.cpp
This commit is contained in:
Concedo 2023-07-10 20:08:27 +08:00
commit 50097e6c7f
4 changed files with 38 additions and 16 deletions

View file

@ -1291,11 +1291,7 @@ static bool llama_eval_internal(
int n_threads,
const char * cgraph_fname) {
// // enforce that the first token is BOS
// if (n_past == 0 && tokens[0] != llama_token_bos()) {
// fprintf(stderr, "%s: first token must be BOS\n", __func__);
// return false;
// }
LLAMA_ASSERT((!tokens && embd) || (tokens && !embd));
const int64_t t_start_us = ggml_time_us();