Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
18d9a7e1
"examples/vscode:/vscode.git/clone" did not exist on "020259895384a1f99844ce6e04f0a226d7b3210b"
Unverified
Commit
18d9a7e1
authored
Apr 30, 2024
by
Jeffrey Morgan
Committed by
GitHub
Apr 30, 2024
Browse files
update llama.cpp submodule to `f364eb6` (#4060)
parent
8488388c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
llm/ext_server/server.cpp
llm/ext_server/server.cpp
+5
-2
llm/llama.cpp
llm/llama.cpp
+1
-1
No files found.
llm/ext_server/server.cpp
View file @
18d9a7e1
...
@@ -1032,7 +1032,7 @@ struct llama_server_context
...
@@ -1032,7 +1032,7 @@ struct llama_server_context
slot
.
has_next_token
=
false
;
slot
.
has_next_token
=
false
;
}
}
if
(
!
slot
.
cache_tokens
.
empty
()
&&
result
.
tok
==
llama_token_eos
(
model
))
if
(
llama_token_is_eog
(
model
,
result
.
tok
))
{
{
slot
.
stopped_eos
=
true
;
slot
.
stopped_eos
=
true
;
slot
.
has_next_token
=
false
;
slot
.
has_next_token
=
false
;
...
@@ -1144,12 +1144,15 @@ struct llama_server_context
...
@@ -1144,12 +1144,15 @@ struct llama_server_context
res
.
result_json
=
json
res
.
result_json
=
json
{
{
{
"content"
,
tkn
.
text_to_send
},
{
"stop"
,
false
},
{
"stop"
,
false
},
{
"slot_id"
,
slot
.
id
},
{
"slot_id"
,
slot
.
id
},
{
"multimodal"
,
multimodal
}
{
"multimodal"
,
multimodal
}
};
};
if
(
!
llama_token_is_eog
(
model
,
tkn
.
tok
))
{
res
.
result_json
[
"content"
]
=
tkn
.
text_to_send
;
}
if
(
slot
.
sparams
.
n_probs
>
0
)
if
(
slot
.
sparams
.
n_probs
>
0
)
{
{
std
::
vector
<
completion_token_output
>
probs_output
=
{};
std
::
vector
<
completion_token_output
>
probs_output
=
{};
...
...
llama.cpp
@
f364eb6f
Compare
f4ab2a41
...
f364eb6f
Subproject commit f
4ab2a41476600a98067a9474ea8f9e6db41bcfa
Subproject commit f
364eb6fb5d46118a76fa045f487318de4c24961
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment