Rollback default marker placement changes

Author: tdakhran

tools/mtmd/mtmd-cli.cpp

@@ -313,7 +313,7 @@ int main(int argc, char ** argv) {
         g_is_generating = true;
         if (params.prompt.find(mtmd_default_marker()) == std::string::npos) {
             for (size_t i = 0; i < params.image.size(); i++) {
-                params.prompt = mtmd::mtmd_add_default_marker(ctx.ctx_vision.get(), params.prompt);
+                params.prompt += mtmd_default_marker();
             }
         }
         common_chat_msg msg;
@@ -378,7 +378,7 @@ int main(int argc, char ** argv) {
                 std::string media_path = line.substr(7);
                 if (ctx.load_media(media_path)) {
                     LOG("%s %s loaded\n", media_path.c_str(), is_image ? "image" : "audio");
-                    content = mtmd::mtmd_add_default_marker(ctx.ctx_vision.get(), content);
+                    content += mtmd_default_marker();
                 }
                 // else, error is already printed by libmtmd
                 continue;

tools/mtmd/mtmd.cpp

@@ -1103,12 +1103,3 @@ void mtmd_log_set(ggml_log_callback log_callback, void * user_data) {
     g_logger_state.log_callback = log_callback ? log_callback : clip_log_callback_default;
     g_logger_state.log_callback_user_data = user_data;
 }
-
-std::string mtmd::mtmd_add_default_marker(mtmd_context *ctx, const std::string &str) {
-    // for LFM2 image embeddings positioned before the text
-    if (ctx && ctx->ctx_v && clip_get_projector_type(ctx->ctx_v) == PROJECTOR_TYPE_LFM2) {
-        return mtmd_default_marker() + str;
-    }
-
-    return str + mtmd_default_marker();
-}

tools/mtmd/mtmd.h

@@ -299,9 +299,6 @@ struct input_chunks {
     }
 };
 
-// insert mtmd_default_marker() into given string, position depends on the projector
-std::string mtmd_add_default_marker(mtmd_context *ctx, const std::string &str);
-
 } // namespace mtmd
 
 #endif