diff options
Diffstat (limited to 'src/llama.cpp')
| -rw-r--r-- | src/llama.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/llama.cpp b/src/llama.cpp index 498bb437..8c4a966d 100644 --- a/src/llama.cpp +++ b/src/llama.cpp @@ -3201,11 +3201,7 @@ static bool llama_kv_cache_init( const uint32_t kv_lora_rank = hparams.n_lora_kv; LLAMA_LOG_INFO("%s: layer %d: n_embd_head_qk_rope = %d, kv_lora_rank = %d\n", __func__, i, n_embd_head_qk_rope, kv_lora_rank); #if MLA_USE_TRANSPOSED_CACHE - // TODO: The k-cache is contiguous and not permuted, so strictly speaking, it should be possible to quantize it. - // Sadly, at this point something goes wrong with quantized k-cache, so for now we set the k-cache - // type to type_v, which is guaranteed to be f16 or bf16 without FA. - //ggml_tensor * kv = ggml_new_tensor_1d(ctx, cache.type_k, (kv_lora_rank + n_embd_head_qk_rope)*kv_size); - ggml_tensor * kv = ggml_new_tensor_1d(ctx, cache.type_v, (kv_lora_rank + n_embd_head_qk_rope)*kv_size); + ggml_tensor * kv = ggml_new_tensor_1d(ctx, cache.type_k, (kv_lora_rank + n_embd_head_qk_rope)*kv_size); #else ggml_tensor * kv = ggml_new_tensor_1d(ctx, cache.type_v, (kv_lora_rank + n_embd_head_qk_rope)*kv_size); #endif @@ -13495,7 +13491,7 @@ struct llm_build_context { #if MLA_USE_TRANSPOSED_CACHE ggml_tensor * kv_cache_trans_view = ggml_view_2d(ctx0, kv_self.kvt_l[il], n_tokens, kv_lora_rank, - ggml_row_size(kv_self.kv_l[il]->type, kv_self.size), ggml_row_size(kv_self.kv_l[il]->type, kv_head)); + ggml_row_size(kv_self.kvt_l[il]->type, kv_self.size), ggml_row_size(kv_self.kvt_l[il]->type, kv_head)); cb(kv_cache_trans_view, "kv_cache_trans_view", il); // note: storing transposed c^KV in the transposed KV cache @@ -13503,7 +13499,7 @@ struct llm_build_context { ggml_tensor * kv_cache_trans = ggml_view_2d(ctx0, kv_self.kvt_l[il], n_kv, kv_lora_rank, - ggml_row_size(kv_self.kv_l[il]->type, kv_self.size), + ggml_row_size(kv_self.kvt_l[il]->type, kv_self.size), 0); cb(kv_cache_trans, "kv_cache_trans", il); #endif @@ -18047,21 +18043,26 @@ struct llama_context * llama_new_context_with_model( size_t memory_size_kv = 0; size_t memory_size_kvt = 0; + ggml_type kv_type = GGML_TYPE_COUNT; + ggml_type kvt_type = GGML_TYPE_COUNT; + for (auto & kv : ctx->kv_self.kv_l) { memory_size_kv += ggml_nbytes(kv); + kv_type = kv->type; } #if MLA_USE_TRANSPOSED_CACHE for (auto & kvt : ctx->kv_self.kvt_l) { memory_size_kvt += ggml_nbytes(kvt); + kvt_type = kvt->type; } #endif if (memory_size_kv + memory_size_kvt > 0) { LLAMA_LOG_INFO("%s: KV self size = %7.2f MiB, c^KV (%s): %7.2f MiB, kv^T (%s): %7.2f MiB\n", __func__, (float)(memory_size_kv + memory_size_kvt) / (1024.0f * 1024.0f), - ggml_type_name(type_v), (float)memory_size_kv / (1024.0f * 1024.0f), - ggml_type_name(type_v), (float)memory_size_kvt / (1024.0f * 1024.0f)); + ggml_type_name(kv_type), (float)memory_size_kv / (1024.0f * 1024.0f), + ggml_type_name(kvt_type), (float)memory_size_kvt / (1024.0f * 1024.0f)); } } |