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

add missing enum ggml_numa_strategies declaration and revert sync problem with master

Browse source
This commit is contained in:
root 2024-02-08 19:55:47 +00:00
parent 7bbe511b8e
commit 314174ddc5
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ggml.c
View file

@ -1912,7 +1912,7 @@ struct ggml_numa_node {
}; };
struct ggml_numa_nodes { struct ggml_numa_nodes {
uint32_t numa_strategy; enum ggml_numa_strategies numa_strategy;
struct ggml_numa_node nodes[GGML_NUMA_MAX_NODES]; struct ggml_numa_node nodes[GGML_NUMA_MAX_NODES];
uint32_t n_nodes; uint32_t n_nodes;
uint32_t total_cpus; // hardware threads on system uint32_t total_cpus; // hardware threads on system
@ -11912,8 +11912,10 @@ GGML_CALL void ggml_rope_yarn_corr_dims(
int n_dims, int n_orig_ctx, float freq_base, float beta_fast, float beta_slow, float dims[2] int n_dims, int n_orig_ctx, float freq_base, float beta_fast, float beta_slow, float dims[2]
) { ) {
// start and end correction dims // start and end correction dims
dims[0] = MAX(0, floorf(ggml_rope_yarn_corr_dim(n_dims, n_orig_ctx, beta_fast, freq_base))); float start = floorf(ggml_rope_yarn_corr_dim(n_dims, n_orig_ctx, beta_fast, freq_base));
dims[1] = MIN(n_dims - 1, ceilf(ggml_rope_yarn_corr_dim(n_dims, n_orig_ctx, beta_slow, freq_base))); float end = ceilf(ggml_rope_yarn_corr_dim(n_dims, n_orig_ctx, beta_slow, freq_base));
dims[0] = MAX(0, start);
dims[1] = MIN(n_dims - 1, end);
} }
static void ggml_compute_forward_rope_f32( static void ggml_compute_forward_rope_f32(