mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-30 08:42:00 +00:00 
			
		
		
		
	llama : refactor llama_context, llama_kv_cache, llm_build_context (#12181)
* llama : refactor llama_context, llama_kv_cache, llm_build_context ggml-ci * graph : don't mutate the KV cache during defrag ggml-ci * context : reduce virtuals + remove test function ggml-ci * context : move interface implementation to source file + factory ggml-ci * graph : move KV cache build functions to llama_context impl ggml-ci * graph : remove model reference from build_pooling ggml-ci * graph : remove llama_model reference ggml-ci * kv_cache : provide rope factors ggml-ci * graph : rework inputs to use only unique_ptr, remove attn input abstraction ggml-ci * context : remove llama_context_i abstraction ggml-ci * context : clean-up ggml-ci * graph : clean-up ggml-ci * llama : remove redundant keywords (struct, enum) ggml-ci * model : adapt gemma3 ggml-ci * graph : restore same attention ops as on master ggml-ci * llama : remove TODO + fix indent ggml-ci
This commit is contained in:
		| @@ -210,7 +210,7 @@ actor LlamaContext { | ||||
|             } | ||||
|             batch.logits[Int(batch.n_tokens) - 1] = 1 // true | ||||
|  | ||||
|             llama_kv_cache_clear(context) | ||||
|             llama_kv_self_clear(context) | ||||
|  | ||||
|             let t_pp_start = DispatchTime.now().uptimeNanoseconds / 1000; | ||||
|  | ||||
| @@ -223,7 +223,7 @@ actor LlamaContext { | ||||
|  | ||||
|             // bench text generation | ||||
|  | ||||
|             llama_kv_cache_clear(context) | ||||
|             llama_kv_self_clear(context) | ||||
|  | ||||
|             let t_tg_start = DispatchTime.now().uptimeNanoseconds / 1000; | ||||
|  | ||||
| @@ -242,7 +242,7 @@ actor LlamaContext { | ||||
|  | ||||
|             let t_tg_end = DispatchTime.now().uptimeNanoseconds / 1000; | ||||
|  | ||||
|             llama_kv_cache_clear(context) | ||||
|             llama_kv_self_clear(context) | ||||
|  | ||||
|             let t_pp = Double(t_pp_end - t_pp_start) / 1000000.0 | ||||
|             let t_tg = Double(t_tg_end - t_tg_start) / 1000000.0 | ||||
| @@ -292,7 +292,7 @@ actor LlamaContext { | ||||
|     func clear() { | ||||
|         tokens_list.removeAll() | ||||
|         temporary_invalid_cchars.removeAll() | ||||
|         llama_kv_cache_clear(context) | ||||
|         llama_kv_self_clear(context) | ||||
|     } | ||||
|  | ||||
|     private func tokenize(text: String, add_bos: Bool) -> [llama_token] { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Georgi Gerganov
					Georgi Gerganov