build common_chat_templates_ptr earlier

Olivier Chafik · Olivier Chafik · commit d2969b8730db · 2025-02-17T15:45:18.000Z
diff --git a/common/chat.cpp b/common/chat.cpp
@@ -411,7 +411,7 @@ common_chat_templates_ptr common_chat_templates_init(
         token_bos = get_token(llama_vocab_bos(vocab), "BOS", "bos_token");
         token_eos = get_token(llama_vocab_eos(vocab), "EOS", "eos_token");
     }
-    auto * tmpls = new common_chat_templates();
+    common_chat_templates_ptr tmpls(new common_chat_templates(), common_chat_templates_free);
     tmpls->has_explicit_template = has_explicit_template;
     try {
         tmpls->template_default = std::make_unique<minja::chat_template>(default_template_src, token_bos, token_eos);
@@ -426,7 +426,7 @@ common_chat_templates_ptr common_chat_templates_init(
             LOG_ERR("%s: failed to parse tool use chat template (ignoring it): %s\n", __func__, e.what());
         }
     }
-    return {tmpls, common_chat_templates_free};
+    return tmpls;
 }
 
 std::string common_chat_format_name(common_chat_format format) {

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ common_chat_templates_ptr common_chat_templates_init(`
`411`	`411`	`token_bos = get_token(llama_vocab_bos(vocab), "BOS", "bos_token");`
`412`	`412`	`token_eos = get_token(llama_vocab_eos(vocab), "EOS", "eos_token");`
`413`	`413`	`}`
`414`		`- auto * tmpls = new common_chat_templates();`
	`414`	`+ common_chat_templates_ptr tmpls(new common_chat_templates(), common_chat_templates_free);`
`415`	`415`	`tmpls->has_explicit_template = has_explicit_template;`
`416`	`416`	`try {`
`417`	`417`	`tmpls->template_default = std::make_unique<minja::chat_template>(default_template_src, token_bos, token_eos);`
`@@ -426,7 +426,7 @@ common_chat_templates_ptr common_chat_templates_init(`
`426`	`426`	`LOG_ERR("%s: failed to parse tool use chat template (ignoring it): %s\n", __func__, e.what());`
`427`	`427`	`}`
`428`	`428`	`}`
`429`		`- return {tmpls, common_chat_templates_free};`
	`429`	`+ return tmpls;`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`std::string common_chat_format_name(common_chat_format format) {`