third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 80d065658df96c9e4b03ffdcdb8eb0890355ca5d into 67691e410db7a50b07a64858820b14de9aa91314

Browse Source
This commit is contained in:
Yap Sok Ann 2024-11-14 16:59:12 +05:30 committed by GitHub
commit 305b19080c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/types.go
View File

@ -227,6 +227,7 @@ type Options struct {
MirostatEta float32 `json:"mirostat_eta,omitempty"`
PenalizeNewline bool `json:"penalize_newline,omitempty"`
Stop []string `json:"stop,omitempty"`
CachePrompt bool `json:"cache_prompt,omitempty"`
}
// Runner options which must be set when the model is loaded into memory
@ -605,6 +606,7 @@ func DefaultOptions() Options {
MirostatEta: 0.1,
PenalizeNewline: true,
Seed: -1,
CachePrompt: true,
Runner: Runner{
// options set when the model is loaded

1
cmd/interactive.go
View File

@ -107,6 +107,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
fmt.Fprintln(os.Stderr, " /set parameter repeat_last_n <int> Set how far back to look for repetitions")
fmt.Fprintln(os.Stderr, " /set parameter num_gpu <int> The number of layers to send to the GPU")
fmt.Fprintln(os.Stderr, " /set parameter stop <string> <string> ... Set the stop parameters")
fmt.Fprintln(os.Stderr, " /set parameter cache_prompt <bool> Set the cache_prompt parameter of llama.cpp")
fmt.Fprintln(os.Stderr, "")
}

2
llm/server.go
View File

@ -720,7 +720,7 @@ func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn fu
"seed": req.Options.Seed,
"stop": req.Options.Stop,
"image_data": req.Images,
"cache_prompt": true,
"cache_prompt": req.Options.CachePrompt,
}
// Make sure the server is ready

3
server/routes_test.go
View File

@ -82,7 +82,7 @@ func Test_Routes(t *testing.T) {
fname := createTestFile(t, "ollama-model")
r := strings.NewReader(fmt.Sprintf("FROM %s\nPARAMETER seed 42\nPARAMETER top_p 0.9\nPARAMETER stop foo\nPARAMETER stop bar", fname))
r := strings.NewReader(fmt.Sprintf("FROM %s\nPARAMETER seed 42\nPARAMETER top_p 0.9\nPARAMETER stop foo\nPARAMETER stop bar\nPARAMETER cache_prompt false", fname))
modelfile, err := parser.ParseFile(r)
if err != nil {
t.Fatalf("failed to parse file: %v", err)
@ -396,6 +396,7 @@ func Test_Routes(t *testing.T) {
}
sort.Strings(params)
expectedParams := []string{
"cache_prompt false",
"seed 42",
"stop \"bar\"",
"stop \"foo\"",