minja: fix vigogne (google/minja#22)

ochafik · Jan 18, 2025 · cc50356 · cc50356
1 parent e3c475c
commit cc50356
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/common/minja.hpp b/common/minja.hpp
@@ -1305,12 +1305,10 @@ struct ArgumentsExpression {
 };
 
 static std::string strip(const std::string & s) {
-  static std::regex trailing_spaces_regex("^\\s+|\\s+$");
-  return std::regex_replace(s, trailing_spaces_regex, "");
-  // auto start = s.find_first_not_of(" \t\n\r");
-  // if (start == std::string::npos) return "";
-  // auto end = s.find_last_not_of(" \t\n\r");
-  // return s.substr(start, end - start + 1);
+  auto start = s.find_first_not_of(" \t\n\r");
+  if (start == std::string::npos) return "";
+  auto end = s.find_last_not_of(" \t\n\r");
+  return s.substr(start, end - start + 1);
 }
 
 static std::string html_escape(const std::string & s) {

diff --git a/tests/test-chat-template.cpp b/tests/test-chat-template.cpp
@@ -68,7 +68,6 @@ int main(void) {
             /* .expected_output_jinja= */ "[INST] <<SYS>>\nYou are a helpful assistant\n<</SYS>>\n\nHello [/INST] Hi there </s>[INST] Who are you [/INST] I am an assistant </s>[INST] Another question [/INST]",
             /* .bos_token= */ "",
             /* .eos_token= */ "</s>",
-            /* .supported_with_jinja= */ false, // Mysteriously fails on windows-latest in llama.cpp's CI, although that template works fine in Minja's CI on windows-latest
         },
         {
             /* .name= */ "mlabonne/AlphaMonarch-7B",