Skip to content

vendor : update vendored copy of google/minja#15011

Merged
CISC merged 3 commits into
ggml-org:masterfrom
l-austenfeld:master
Aug 1, 2025
Merged

vendor : update vendored copy of google/minja#15011
CISC merged 3 commits into
ggml-org:masterfrom
l-austenfeld:master

Conversation

@l-austenfeld
Copy link
Copy Markdown
Contributor

Updated the vendored copy of google/minja to the latest version.

This pulls in fixes for the SmolLM3 chat template (see: google/minja#74), namely the in operator on strings and the string.replace function.
This also fixes chat templates like Deepseek R1, which use {% if "</think>" in message["content"] %} to detect and then strip reasoning content in older assistant messages.

The other changes pulled in are google/minja#72 and google/minja#75 which fix a bug with an older version of the Qwen chat template.

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
Comment thread vendor/minja/minja.hpp Outdated
Comment thread vendor/minja/minja.hpp Outdated
Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
Comment thread vendor/minja/chat-template.hpp
Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
@CISC
Copy link
Copy Markdown
Member

CISC commented Aug 1, 2025

Thank you very much, will merge when CI goes green!

Edit: Nvm the failing webgpu one, it's out of commission atm. :)

@l-austenfeld
Copy link
Copy Markdown
Contributor Author

I mean, I managed to mess up copy pasting two files (lesson learned: installed the editorconfig plugin) so I don't know how much you should be thanking me.

Anyways, thank you for looking at this so quickly.

@CISC
Copy link
Copy Markdown
Member

CISC commented Aug 1, 2025

I mean, I managed to mess up copy pasting two files (lesson learned: installed the editorconfig plugin) so I don't know how much you should be thanking me.

Nah, no worries. :)

@CISC CISC merged commit c76b420 into ggml-org:master Aug 1, 2025
46 of 47 checks passed
Nexesenex pushed a commit to Nexesenex/croco.cpp that referenced this pull request Aug 2, 2025
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
blime4 referenced this pull request in blime4/llama.cpp Feb 5, 2026
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
Seunghhon pushed a commit to Seunghhon/llama.cpp that referenced this pull request Apr 26, 2026
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
ljubomirj pushed a commit to ljubomirj/llama.cpp that referenced this pull request May 6, 2026
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
my-other-github-account pushed a commit to my-other-github-account/llama.cpp that referenced this pull request May 15, 2026
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
my-other-github-account pushed a commit to my-other-github-account/llama.cpp that referenced this pull request May 15, 2026
* vendor : update vendored copy of google/minja

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Re-remove trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

* Remove another trailing whitespace

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>

---------

Signed-off-by: Lennart Austenfeld <l.austenfeld@googlemail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants