Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	common/sampling.h
#	llama.h
#	tests/test-chat-template.cpp
This commit is contained in:
Concedo 2024-04-24 21:29:07 +08:00
commit a681cdd9ef
20 changed files with 788 additions and 355 deletions

View file

@ -241,7 +241,6 @@ int main(int argc, char ** argv) {
return 1;
}
session_tokens.resize(n_token_count_out);
llama_set_rng_seed(ctx, params.seed);
LOG_TEE("%s: loaded a session with prompt size of %d tokens\n", __func__, (int)session_tokens.size());
}
}