helper: use mtmd_image_tokens_get_n_pos

ngxson · ngxson · commit 076e3b937c35 · 2025-05-04T23:36:21.000+02:00
diff --git a/tools/llava/mtmd.cpp b/tools/llava/mtmd.cpp
@@ -681,8 +681,7 @@ int32_t mtmd_helper_eval_chunk_single(mtmd_context * ctx,
             i_batch++;
         }
 
-        // for mrope, one image is one single **temporal** position
-        n_past += mtmd_decode_use_mrope(ctx) ? 1 : n_tokens;
+        n_past += mtmd_image_tokens_get_n_pos(image_tokens);
         *new_n_past = n_past;
 
         if (mtmd_decode_use_non_causal(ctx)) {

Original file line number	Diff line number	Diff line change
`@@ -681,8 +681,7 @@ int32_t mtmd_helper_eval_chunk_single(mtmd_context * ctx,`
`681`	`681`	`i_batch++;`
`682`	`682`	`}`
`683`	`683`
`684`		`- // for mrope, one image is one single temporal position`
`685`		`- n_past += mtmd_decode_use_mrope(ctx) ? 1 : n_tokens;`
	`684`	`+ n_past += mtmd_image_tokens_get_n_pos(image_tokens);`
`686`	`685`	`*new_n_past = n_past;`
`687`	`686`
`688`	`687`	`if (mtmd_decode_use_non_causal(ctx)) {`