summaryrefslogtreecommitdiff
path: root/llama.cpp
diff options
context:
space:
mode:
authorGeorgi Gerganov <ggerganov@gmail.com>2023-11-28 10:32:03 +0200
committerGitHub <noreply@github.com>2023-11-28 10:32:03 +0200
commit8406b0924bf323f37d536dee8b8165c1f3d9d11d (patch)
tree23b753a4e289a89c9e511760b8d2e6583fda9768 /llama.cpp
parentb38a16dfcff88d547f78f52d1bea31b84a05aff7 (diff)
ggml : re-enable BLAS for CPU when src0 != F32 + remove redundant full offload checks in llama.cpp (#4240)
* ggml : use blas even if src0 is not F32 * llama : use n_threads_batch only when n_tokens >= 32 ggml-ci * llama : revert n_threads_batch logic ggml-ci
Diffstat (limited to 'llama.cpp')
-rw-r--r--llama.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/llama.cpp b/llama.cpp
index f2b5967d..cb544228 100644
--- a/llama.cpp
+++ b/llama.cpp
@@ -5550,18 +5550,8 @@ static int llama_decode_internal(
n_threads = std::min(4, n_threads);
}
- // If all tensors can be run on the GPU then using more than 1 thread is detrimental.
- const bool full_offload_supported =
- model.arch == LLM_ARCH_LLAMA ||
- model.arch == LLM_ARCH_BAICHUAN ||
- model.arch == LLM_ARCH_FALCON ||
- model.arch == LLM_ARCH_REFACT ||
- model.arch == LLM_ARCH_MPT ||
- model.arch == LLM_ARCH_STARCODER ||
- model.arch == LLM_ARCH_STABLELM;
-
const bool fully_offloaded = model.n_gpu_layers >= (int) hparams.n_layer + 3;
- if (ggml_cpu_has_cublas() && full_offload_supported && fully_offloaded) {
+ if (ggml_cpu_has_cublas() && fully_offloaded) {
n_threads = 1;
}