mirror of
https://github.com/ggerganov/whisper.cpp.git
synced 2024-12-19 04:37:51 +00:00
ggml : make consts static (#317)
These shouldn't be able to be referenced outside the compilation unit.
This commit is contained in:
parent
1480a5f1af
commit
493d94130d
18
ggml.c
18
ggml.c
@ -307,7 +307,7 @@ int64_t ggml_cycles_per_ms(void) {
|
|||||||
#define CACHE_LINE_SIZE 64
|
#define CACHE_LINE_SIZE 64
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const size_t CACHE_LINE_SIZE_F32 = CACHE_LINE_SIZE/sizeof(float);
|
static const size_t CACHE_LINE_SIZE_F32 = CACHE_LINE_SIZE/sizeof(float);
|
||||||
|
|
||||||
//
|
//
|
||||||
// fundamental operations
|
// fundamental operations
|
||||||
@ -1165,8 +1165,8 @@ inline static void ggml_vec_sgn_f32 (const int n, float * y, const float * x) {
|
|||||||
inline static void ggml_vec_step_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? 1.f : 0.f; }
|
inline static void ggml_vec_step_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? 1.f : 0.f; }
|
||||||
inline static void ggml_vec_relu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : 0.f; }
|
inline static void ggml_vec_relu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : 0.f; }
|
||||||
|
|
||||||
const ggml_float GELU_COEF_A = 0.044715;
|
static const ggml_float GELU_COEF_A = 0.044715;
|
||||||
const ggml_float SQRT_2_OVER_PI = 0.79788456080286535587989211986876;
|
static const ggml_float SQRT_2_OVER_PI = 0.79788456080286535587989211986876;
|
||||||
|
|
||||||
inline static float ggml_gelu_f32(float x) {
|
inline static float ggml_gelu_f32(float x) {
|
||||||
return 0.5*x*(1.0 + tanh(SQRT_2_OVER_PI*x*(1.0 + GELU_COEF_A*x*x)));
|
return 0.5*x*(1.0 + tanh(SQRT_2_OVER_PI*x*(1.0 + GELU_COEF_A*x*x)));
|
||||||
@ -1227,7 +1227,7 @@ inline static void ggml_vec_norm_inv_f32(const int n, float * s, const float * x
|
|||||||
// data types
|
// data types
|
||||||
//
|
//
|
||||||
|
|
||||||
const size_t GGML_TYPE_SIZE[GGML_TYPE_COUNT] = {
|
static const size_t GGML_TYPE_SIZE[GGML_TYPE_COUNT] = {
|
||||||
sizeof(int8_t ),
|
sizeof(int8_t ),
|
||||||
sizeof(int16_t),
|
sizeof(int16_t),
|
||||||
sizeof(int32_t),
|
sizeof(int32_t),
|
||||||
@ -1235,7 +1235,7 @@ const size_t GGML_TYPE_SIZE[GGML_TYPE_COUNT] = {
|
|||||||
sizeof(float ),
|
sizeof(float ),
|
||||||
};
|
};
|
||||||
|
|
||||||
const char * GGML_OP_LABEL[GGML_OP_COUNT] = {
|
static const char * GGML_OP_LABEL[GGML_OP_COUNT] = {
|
||||||
"NONE",
|
"NONE",
|
||||||
|
|
||||||
"DUP",
|
"DUP",
|
||||||
@ -1275,7 +1275,7 @@ const char * GGML_OP_LABEL[GGML_OP_COUNT] = {
|
|||||||
"FLASH_FF",
|
"FLASH_FF",
|
||||||
};
|
};
|
||||||
|
|
||||||
const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
|
static const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
|
||||||
"none",
|
"none",
|
||||||
|
|
||||||
"x",
|
"x",
|
||||||
@ -1328,7 +1328,7 @@ struct ggml_object {
|
|||||||
char padding[8];
|
char padding[8];
|
||||||
};
|
};
|
||||||
|
|
||||||
const size_t GGML_OBJECT_SIZE = sizeof(struct ggml_object);
|
static const size_t GGML_OBJECT_SIZE = sizeof(struct ggml_object);
|
||||||
|
|
||||||
static_assert(sizeof(struct ggml_object)%GGML_MEM_ALIGN == 0, "ggml_object size must be a multiple of GGML_MEM_ALIGN");
|
static_assert(sizeof(struct ggml_object)%GGML_MEM_ALIGN == 0, "ggml_object size must be a multiple of GGML_MEM_ALIGN");
|
||||||
static_assert(sizeof(struct ggml_tensor)%GGML_MEM_ALIGN == 0, "ggml_tensor size must be a multiple of GGML_MEM_ALIGN");
|
static_assert(sizeof(struct ggml_tensor)%GGML_MEM_ALIGN == 0, "ggml_tensor size must be a multiple of GGML_MEM_ALIGN");
|
||||||
@ -1383,8 +1383,8 @@ struct ggml_state {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// global state
|
// global state
|
||||||
struct ggml_state g_state;
|
static struct ggml_state g_state;
|
||||||
atomic_int g_state_barrier = 0;
|
static atomic_int g_state_barrier = 0;
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user