Merge branch 'master' into concedo_experimental

# Conflicts:
#	Makefile
#	ggml.c
#	llama.cpp
This commit is contained in:
Concedo 2023-05-14 11:34:41 +08:00
commit e01e373e63
16 changed files with 6698 additions and 350 deletions

View file

@ -54,9 +54,10 @@ extern "C" {
typedef void (*llama_progress_callback)(float progress, void *ctx);
struct llama_context_params {
int n_ctx; // text context
int n_parts; // -1 for default
int seed; // RNG seed, -1 for random
int n_ctx; // text context
int n_parts; // -1 for default
int n_gpu_layers; // number of layers to store in VRAM
int seed; // RNG seed, -1 for random
bool f16_kv; // use fp16 for KV cache
bool logits_all; // the llama_eval() call computes all logits, not just the last one