Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llama : introduce anonymous namespace in llama.cpp #9602

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/llama.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2247,6 +2247,8 @@ static ggml_backend_buffer_type_t llama_default_buffer_type_cpu(bool host_buffer
GGML_UNUSED(host_buffer);
}

namespace {

//
// globals
//
Expand All @@ -2267,7 +2269,7 @@ struct llama_state {
void * log_callback_user_data = nullptr;
};

static llama_state g_state;
llama_state g_state;

// available llama models
enum e_model {
Expand Down Expand Up @@ -2333,9 +2335,9 @@ enum e_model {
MODEL_27B,
};

static const size_t kiB = 1024;
static const size_t MiB = 1024*kiB;
static const size_t GiB = 1024*MiB;
const size_t kiB = 1024;
const size_t MiB = 1024*kiB;
const size_t GiB = 1024*MiB;

struct llama_hparams {
bool vocab_only;
Expand Down Expand Up @@ -2839,6 +2841,8 @@ struct llama_control_vector {
}
};

}

struct llama_model {
e_model type = MODEL_UNKNOWN;
llm_arch arch = LLM_ARCH_UNKNOWN;
Expand Down
Loading