mirror of
https://github.com/ollama/ollama.git
synced 2025-11-10 21:47:42 +01:00
removed nit comments
This commit is contained in:
@@ -130,18 +130,11 @@ func (s *Server) NewSequence(prompt string, images []llm.ImageData, params NewSe
|
|||||||
// Ensure that at least 1 input can be discarded during shift
|
// Ensure that at least 1 input can be discarded during shift
|
||||||
params.numKeep = min(params.numKeep, s.cache.numCtx-1)
|
params.numKeep = min(params.numKeep, s.cache.numCtx-1)
|
||||||
|
|
||||||
// Basic runner-side guard: if truncation is enabled and num_ctx <= 1, return an error
|
|
||||||
if params.truncate && s.cache.numCtx <= 1 {
|
|
||||||
return nil, fmt.Errorf("input after truncation exceeds maximum context length")
|
|
||||||
}
|
|
||||||
|
|
||||||
if int32(len(inputs)) > s.cache.numCtx {
|
if int32(len(inputs)) > s.cache.numCtx {
|
||||||
if !params.truncate {
|
if !params.truncate {
|
||||||
return nil, errorInputTooLong
|
return nil, errorInputTooLong
|
||||||
}
|
}
|
||||||
|
|
||||||
// Embeddings and generation both return the same too-long error when truncate is enabled
|
|
||||||
|
|
||||||
discard := int32(len(inputs)) - s.cache.numCtx
|
discard := int32(len(inputs)) - s.cache.numCtx
|
||||||
promptStart := params.numKeep + discard
|
promptStart := params.numKeep + discard
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user