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
a18e6b3a
Commit
a18e6b3a
authored
Jul 09, 2023
by
Jeffrey Morgan
Browse files
llama: remove unnecessary std::vector
parent
5fb96255
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
22 deletions
+49
-22
llama/binding/binding.cpp
llama/binding/binding.cpp
+26
-12
llama/binding/binding.h
llama/binding/binding.h
+23
-10
No files found.
llama/binding/binding.cpp
View file @
a18e6b3a
// MIT License
// Copyright (c) 2023 go-skynet authors
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "common.h"
#include "llama.h"
...
...
@@ -513,16 +535,6 @@ void llama_free_params(void *params_ptr) {
delete
params
;
}
std
::
vector
<
std
::
string
>
create_vector
(
const
char
**
strings
,
int
count
)
{
std
::
vector
<
std
::
string
>
*
vec
=
new
std
::
vector
<
std
::
string
>
;
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
vec
->
push_back
(
std
::
string
(
strings
[
i
]));
}
return
*
vec
;
}
void
delete_vector
(
std
::
vector
<
std
::
string
>
*
vec
)
{
delete
vec
;
}
int
load_state
(
void
*
ctx
,
char
*
statefile
,
char
*
modes
)
{
llama_context
*
state
=
(
llama_context
*
)
ctx
;
const
llama_context
*
constState
=
static_cast
<
const
llama_context
*>
(
state
);
...
...
@@ -613,9 +625,11 @@ void *llama_allocate_params(
if
(
ignore_eos
)
{
params
->
logit_bias
[
llama_token_eos
()]
=
-
INFINITY
;
}
if
(
antiprompt_count
>
0
)
{
params
->
antiprompt
=
create_vector
(
antiprompt
,
antiprompt_count
);
for
(
int
i
=
0
;
i
<
antiprompt_count
;
i
++
)
{
params
->
antiprompt
.
push_back
(
antiprompt
[
i
]);
}
params
->
tfs_z
=
tfs_z
;
params
->
typical_p
=
typical_p
;
params
->
presence_penalty
=
presence_penalty
;
...
...
llama/binding/binding.h
View file @
a18e6b3a
#ifdef __cplusplus
#include <string>
#include <vector>
// MIT License
// Copyright (c) 2023 go-skynet authors
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
extern
"C"
{
#endif
#include <stdbool.h>
...
...
@@ -40,9 +58,4 @@ void llama_binding_free_model(void *state);
int
llama_predict
(
void
*
params_ptr
,
void
*
state_pr
,
char
*
result
,
bool
debug
);
#ifdef __cplusplus
}
std
::
vector
<
std
::
string
>
create_vector
(
const
char
**
strings
,
int
count
);
void
delete_vector
(
std
::
vector
<
std
::
string
>
*
vec
);
#endif
\ No newline at end of file
}
\ No newline at end of file
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