From 314174ddc51528d69ea6300b36815163554475ba Mon Sep 17 00:00:00 2001 From: root Date: Thu, 8 Feb 2024 19:55:47 +0000 Subject: [PATCH] add missing enum ggml_numa_strategies declaration and revert sync problem with master --- ggml.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ggml.c b/ggml.c index 3fa71f264..452cec282 100644 --- a/ggml.c +++ b/ggml.c @@ -1912,7 +1912,7 @@ struct ggml_numa_node { }; struct ggml_numa_nodes { - uint32_t numa_strategy; + enum ggml_numa_strategies numa_strategy; struct ggml_numa_node nodes[GGML_NUMA_MAX_NODES]; uint32_t n_nodes; 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] ) { // start and end correction dims - dims[0] = MAX(0, 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 start = floorf(ggml_rope_yarn_corr_dim(n_dims, n_orig_ctx, beta_fast, 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(