|
|
@@ -2470,7 +2470,8 @@ size_t ggml_get_max_tensor_size(const struct ggml_context * ctx) {
|
|
|
size_t max_size = 0;
|
|
|
|
|
|
for (struct ggml_tensor * tensor = ggml_get_first_tensor(ctx); tensor != NULL; tensor = ggml_get_next_tensor(ctx, tensor)) {
|
|
|
- max_size = MAX(max_size, ggml_nbytes(tensor));
|
|
|
+ size_t bytes = ggml_nbytes(tensor);
|
|
|
+ max_size = MAX(max_size, bytes);
|
|
|
}
|
|
|
|
|
|
return max_size;
|
|
|
@@ -11887,8 +11888,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(
|