Merge branch 'master' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	Makefile
#	ggml-opencl.cpp
#	llama.cpp
This commit is contained in:
Concedo 2023-05-23 18:19:16 +08:00
commit 5bf9784381
2 changed files with 81 additions and 66 deletions

View file

@ -1153,8 +1153,6 @@ static void llama_model_load_internal(
fprintf(stderr, "ggml_opencl: total VRAM used: %zu MB\n", vram_total / 1024 / 1024);
}
#else
(void) n_gpu_layers;
#endif
if (progress_callback) {