mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-11-03 09:22:01 +00:00 
			
		
		
		
	Merge branch 'master' into xsn/private_batch_api
This commit is contained in:
		@@ -126,7 +126,7 @@ int main(int argc, char ** argv) {
 | 
			
		||||
 | 
			
		||||
                const auto t_pp_start = ggml_time_us();
 | 
			
		||||
 | 
			
		||||
                llama_kv_cache_clear(ctx);
 | 
			
		||||
                llama_kv_self_clear(ctx);
 | 
			
		||||
 | 
			
		||||
                if (!decode_helper(ctx, batch, ctx_params.n_batch)) {
 | 
			
		||||
                    LOG_ERR("%s: llama_decode() failed\n", __func__);
 | 
			
		||||
@@ -135,7 +135,7 @@ int main(int argc, char ** argv) {
 | 
			
		||||
 | 
			
		||||
                if (is_pp_shared) {
 | 
			
		||||
                    for (int32_t i = 1; i < pl; ++i) {
 | 
			
		||||
                        llama_kv_cache_seq_cp(ctx, 0, i, -1, -1);
 | 
			
		||||
                        llama_kv_self_seq_cp(ctx, 0, i, -1, -1);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user