[Rebase] Rebase to vLLM 0.30.0 (#7820)

Signed-off-by: tzhouam <tzhouam@connect.ust.hk>
Signed-off-by: Gao Han <hgaoaf@connect.ust.hk>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Gao Han <hgaoaf@connect.ust.hk>

tests/diffusion/models/glm_image/test_glm_image_quantization.py

@@ -178,7 +178,13 @@ class TestGlmImageAdaLayerNormZeroQuantization:
 
     def test_accepts_quant_config_parameter(self, mocker: MockerFixture):
         """Verify the class accepts quant_config parameter."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         layer = GlmImageAdaLayerNormZero(
             embedding_dim=512,
             dim=2560,
@@ -220,7 +226,13 @@ class TestGlmImageAdaLayerNormContinuousQuantization:
 
     def test_accepts_quant_config_parameter(self, mocker: MockerFixture):
         """Verify the class accepts quant_config parameter."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         layer = GlmImageAdaLayerNormContinuous(
             embedding_dim=2560,
             conditioning_embedding_dim=512,
@@ -260,7 +272,13 @@ class TestGlmImageAttentionQuantization:
 
     def test_accepts_quant_config_parameter(self, mocker: MockerFixture):
         """Verify GlmImageAttention accepts quant_config parameter."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         attn = GlmImageAttention(
             dim=2560,
             num_heads=64,
@@ -286,7 +304,13 @@ class TestColumnParallelModulesQuantization:
 
     def test_column_parallel_gelu_accepts_quant_config(self, mocker: MockerFixture):
         """Verify ColumnParallelGELU accepts quant_config."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         layer = ColumnParallelGELU(
             dim_in=2560,
             dim_out=10240,
@@ -297,7 +321,13 @@ class TestColumnParallelModulesQuantization:
 
     def test_column_parallel_silu_accepts_quant_config(self, mocker: MockerFixture):
         """Verify ColumnParallelSiLU accepts quant_config."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         layer = ColumnParallelSiLU(
             dim_in=2560,
             dim_out=10240,
@@ -312,7 +342,13 @@ class TestGlmImageFeedForwardQuantization:
 
     def test_accepts_quant_config_parameter(self, mocker: MockerFixture):
         """Verify GlmImageFeedForward accepts quant_config parameter."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         ff = GlmImageFeedForward(
             dim=2560,
             dim_out=2560,
@@ -358,7 +394,13 @@ class TestGlmImageTransformerBlockQuantization:
 
     def test_accepts_quant_config_parameter(self, mocker: MockerFixture):
         """Verify GlmImageTransformerBlock accepts quant_config parameter."""
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         parallel_config = DiffusionParallelConfig(
             tensor_parallel_size=1,
             sequence_parallel_size=1,
@@ -534,7 +576,13 @@ class TestGlmImageTransformer2DModelQuantization:
         """Verify the model accepts quant_config parameter."""
         from vllm_omni.diffusion.data import OmniDiffusionConfig
 
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         parallel_config = DiffusionParallelConfig(
             tensor_parallel_size=1,
             sequence_parallel_size=1,
@@ -607,7 +655,13 @@ class TestGlmImageTransformer2DModelQuantization:
         """Verify norm_out (output layer) does NOT use quantization to preserve precision."""
         from vllm_omni.diffusion.data import OmniDiffusionConfig
 
+        # vLLM 0.30 resolves online quantization in resolve_quant_method():
+        # a non-None online_quantization_config whose resolve_quant_method_cls()
+        # returns a target raises on a checkpoint-quantized layer. A bare
+        # MagicMock satisfies both, so declare no online quantization -- these
+        # tests only assert the layer accepts and stores a quant_config.
         mock_quant_config = mocker.MagicMock()
+        mock_quant_config.online_quantization_config = None
         parallel_config = DiffusionParallelConfig(
             tensor_parallel_size=1,
             sequence_parallel_size=1,

tests/diffusion/models/minimax_h3/test_minimax_h3_contract.py

@@ -1380,6 +1380,8 @@ def test_text_encoder_linear_delegates_quantization_to_vllm_factory():
     method = UnquantizedLinearMethod()
     quant_config = Mock()
     quant_config.get_quant_method.return_value = method
+    # vLLM 0.30: no online quantization for this checkpoint-quantized layer
+    quant_config.online_quantization_config = None
     prefix = "text_encoder.text_model.layers.0.mlp.gate_up_proj"
 
     with (
@@ -1396,7 +1398,9 @@ def test_text_encoder_linear_delegates_quantization_to_vllm_factory():
         )
 
     assert linear.quant_method is method
-    quant_config.get_quant_method.assert_called_once_with(linear, prefix=prefix)
+    # vLLM 0.30 resolves the method through resolve_quant_method(), which calls
+    # get_quant_method(layer, prefix) POSITIONALLY; 0.29 passed prefix= by keyword.
+    quant_config.get_quant_method.assert_called_once_with(linear, prefix)
 
 
 def test_distributed_layerwise_offload_stages_vae_component():