vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replaced use of auto with exact type to avoid using -std=c++14

Browse source
This commit is contained in:
Arik Poznanski 2023-04-13 12:37:05 +03:00
parent fe24af09ba
commit acbab12a89
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
llama.cpp
View file

@ -42,7 +42,7 @@ static const size_t MB = 1024*1024;
// TODO: dynamically determine these sizes // TODO: dynamically determine these sizes
// needs modifications in ggml // needs modifications in ggml
auto& MEM_REQ_SCRATCH0() std::map<e_model, size_t>& MEM_REQ_SCRATCH0()
{ {
static std::map<e_model, size_t> _MEM_REQ_SCRATCH0 = { static std::map<e_model, size_t> _MEM_REQ_SCRATCH0 = {
{ MODEL_7B, 512ull * MB }, { MODEL_7B, 512ull * MB },
@ -53,7 +53,7 @@ auto& MEM_REQ_SCRATCH0()
return _MEM_REQ_SCRATCH0; return _MEM_REQ_SCRATCH0;
} }
auto& MEM_REQ_SCRATCH1() std::map<e_model, size_t>& MEM_REQ_SCRATCH1()
{ {
static std::map<e_model, size_t> _MEM_REQ_SCRATCH1 = { static std::map<e_model, size_t> _MEM_REQ_SCRATCH1 = {
{ MODEL_7B, 512ull * MB }, { MODEL_7B, 512ull * MB },
@ -65,7 +65,7 @@ auto& MEM_REQ_SCRATCH1()
}; };
// 2*n_embd*n_ctx*n_layer*sizeof(float16) // 2*n_embd*n_ctx*n_layer*sizeof(float16)
auto& MEM_REQ_KV_SELF() std::map<e_model, size_t>& MEM_REQ_KV_SELF()
{ {
static std::map<e_model, size_t> _MEM_REQ_KV_SELF = { static std::map<e_model, size_t> _MEM_REQ_KV_SELF = {
{ MODEL_7B, 1026ull * MB }, { MODEL_7B, 1026ull * MB },
@ -78,7 +78,7 @@ auto& MEM_REQ_KV_SELF()
// this is mostly needed for temporary mul_mat buffers to dequantize the data // this is mostly needed for temporary mul_mat buffers to dequantize the data
// not actually needed if BLAS is disabled // not actually needed if BLAS is disabled
auto& MEM_REQ_EVAL() std::map<e_model, size_t>& MEM_REQ_EVAL()
{ {
static std::map<e_model, size_t> _MEM_REQ_EVAL = { static std::map<e_model, size_t> _MEM_REQ_EVAL = {
{ MODEL_7B, 768ull * MB }, { MODEL_7B, 768ull * MB },

2
tests/test-tokenizer-0.cpp
View file

@ -5,7 +5,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
auto& k_tests() std::map<std::string, std::vector<llama_token>>& k_tests()
{ {
static std::map<std::string, std::vector<llama_token>> _k_tests = { static std::map<std::string, std::vector<llama_token>> _k_tests = {
{ "Hello World", { 1, 10994, 2787, }, }, { "Hello World", { 1, 10994, 2787, }, },