Merge branch 'master' into concedo_experimental

# Conflicts:
#	.ecrc
#	.github/workflows/build.yml
#	CMakeLists.txt
#	README.md
#	llama.cpp
#	tests/test-c.c
This commit is contained in:
Concedo 2024-01-30 19:18:10 +08:00
commit 54cc31f9dc
48 changed files with 4272 additions and 73 deletions

View file

@ -50,7 +50,8 @@
#define LLAMA_SESSION_MAGIC LLAMA_FILE_MAGIC_GGSN
#define LLAMA_SESSION_VERSION 4
#if defined(GGML_USE_CUBLAS) || defined(GGML_USE_CLBLAST) || defined(GGML_USE_METAL) || defined(GGML_USE_VULKAN) || defined(GGML_USE_SYCL)
#if defined(GGML_USE_CUBLAS) || defined(GGML_USE_CLBLAST) || defined(GGML_USE_METAL) || defined(GGML_USE_VULKAN) || \
defined(GGML_USE_SYCL) || defined(GGML_USE_KOMPUTE)
// Defined when llama.cpp is compiled with support for offloading model layers to GPU.
#define LLAMA_SUPPORTS_GPU_OFFLOAD
#endif