Merge branch 'upstream' into concedo_experimental

# Conflicts: # src/llama-context.cpp # tests/test-backend-ops.cpp
2026-09-19 01:05:09 +02:00 · 2025-06-22 23:26:15 +08:00
parent abc1d8ac25 af3373f1ad
commit fb13e3e51b
26 changed files with 543 additions and 447 deletions
@@ -2257,6 +2257,9 @@ struct clip_model_loader {
                    {
                        hparams.rope_theta = 10000.0f;
                        hparams.warmup_image_size = hparams.patch_size * 8;
+                        // Mistral Small 2506 needs 1024x1024 image size cap to prevent OOM
+                        // ref: https://github.com/ggml-org/llama.cpp/issues/14310
+                        hparams.image_size = 1024;
                        get_u32(KEY_SPATIAL_MERGE_SIZE, hparams.spatial_merge_size, false);
                    } break;
                case PROJECTOR_TYPE_GEMMA3: