mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-31 08:51:55 +00:00 
			
		
		
		
	Merge branch 'master' into compilade/bitnet-ternary
This commit is contained in:
		| @@ -95,13 +95,10 @@ extern "C" { | ||||
|         LLAMA_VOCAB_PRE_TYPE_CODESHELL      = 22, | ||||
|     }; | ||||
|  | ||||
|     // note: these values should be synchronized with ggml_rope | ||||
|     // TODO: maybe move this enum to ggml.h (ggml_rope_type) | ||||
|     enum llama_rope_type { | ||||
|         LLAMA_ROPE_TYPE_NONE = -1, | ||||
|         LLAMA_ROPE_TYPE_NORM =  0, | ||||
|         LLAMA_ROPE_TYPE_NEOX =  2, | ||||
|         LLAMA_ROPE_TYPE_GLM  =  4, | ||||
|         LLAMA_ROPE_TYPE_NORM = 0, | ||||
|         LLAMA_ROPE_TYPE_NEOX = GGML_ROPE_TYPE_NEOX, | ||||
|     }; | ||||
|  | ||||
|     enum llama_token_type { //TODO: remove, required until per token attributes are available from GGUF file | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Francis Couture-Harpin
					Francis Couture-Harpin