chore: cleanups following review

Signed-off-by: Alexandre Milesi <[email protected]>

Author: milesial

vllm/multimodal/profiling.py

@@ -256,7 +256,7 @@ def get_decoder_dummy_data(
             multi_modal_placeholders=mm_inputs["mm_placeholders"],
         )
 
-    def get_mm_max_tokens(
+    def _get_mm_max_tokens(
         self,
         seq_len: int,
         mm_counts: Optional[Mapping[str, int]] = None,
@@ -292,11 +292,22 @@ def get_mm_max_tokens(
         return self._get_mm_num_tokens(mm_inputs,
                                        mm_embeddings_only=mm_embeddings_only)
 
-    def get_max_placeholder_tokens(
+    def get_mm_max_contiguous_tokens(
         self,
         seq_len: int,
         mm_counts: Optional[Mapping[str, int]] = None,
     ):
-        return self.get_mm_max_tokens(seq_len,
-                                      mm_counts,
-                                      mm_embeddings_only=False)
+        """
+        Returns the maximum length of the multimodal (image placeholders+text)
+        tokens, including any break/text tokens in-between image embeddings.
+
+        <im_start> [IMG] [IMG] [IMG] <row_break> [IMG] [IMG] [IMG] <im_end>
+        Returns 9, even when the number of image embeddings is 6.
+        
+        This is important to take into account when profiling and
+        initializing the encoder cache size.
+        """
+
+        return self._get_mm_max_tokens(seq_len,
+                                       mm_counts,
+                                       mm_embeddings_only=False)

vllm/multimodal/registry.py

@@ -129,7 +129,7 @@ def get_max_tokens_per_item_by_modality(
         seq_len = model_config.max_model_len
         mm_limits = self.get_mm_limits_per_prompt(model_config)
 
-        return profiler.get_max_placeholder_tokens(
+        return profiler.get_mm_max_contiguous_tokens(
             seq_len,
             {
                 modality: 1