[3/n] lora moe - Support Qwen3-VL-30B-A3B-Instruct (#21469)
Co-authored-by: Baizhou Zhang <sobereddiezhang@gmail.com>
This commit is contained in:
Ethan (Yusheng) Su
co-authored by
Baizhou Zhang
Baizhou Zhang
parent
ca3ba05a7a
commit
cffc95edf4
@@ -1,233 +0,0 @@
|
||||
import random
|
||||
import unittest
|
||||
from typing import Sequence
|
||||
|
||||
from sglang.srt.models.qwen3_vl import Qwen3VLForConditionalGeneration
|
||||
from sglang.srt.models.qwen3_vl_moe import Qwen3VLMoeForConditionalGeneration
|
||||
from sglang.test.lora_utils import (
|
||||
TORCH_DTYPES,
|
||||
LoRAAdaptor,
|
||||
LoRAModelCase,
|
||||
ensure_reproducibility,
|
||||
)
|
||||
from sglang.test.runners import HFRunner, SRTRunner
|
||||
from sglang.test.test_utils import CustomTestCase, calculate_rouge_l
|
||||
|
||||
|
||||
class TestLoRAQwen3VLGating(CustomTestCase):
|
||||
"""Unit tests for should_apply_lora gating on Qwen3‑VL dense and MoE variants."""
|
||||
|
||||
def _assert_pattern(
|
||||
self, pattern, positives: Sequence[str], negatives: Sequence[str]
|
||||
):
|
||||
for name in positives:
|
||||
self.assertTrue(bool(pattern.match(name)), f"Expected to match: {name}")
|
||||
for name in negatives:
|
||||
self.assertFalse(bool(pattern.match(name)), f"Should not match: {name}")
|
||||
|
||||
def test_qwen3_vl_should_apply_lora_regex(self):
|
||||
positives = (
|
||||
"model.layers.0.self_attn.qkv_proj",
|
||||
"model.layers.1.self_attn.o_proj",
|
||||
"model.layers.2.mlp.gate_up_proj",
|
||||
"model.layers.3.mlp.down_proj",
|
||||
)
|
||||
negatives = (
|
||||
"visual.blocks.0.attn.qkv_proj",
|
||||
"model.layers.x.self_attn.qkv_proj",
|
||||
"model.layers.0.attn.qkv_proj",
|
||||
"model.layers.0.mlp.not_proj",
|
||||
"model.layers.0.self_attn.q_proj",
|
||||
)
|
||||
self._assert_pattern(
|
||||
Qwen3VLForConditionalGeneration._lora_pattern, positives, negatives
|
||||
)
|
||||
|
||||
def test_qwen3_vl_moe_should_apply_lora_regex(self):
|
||||
positives = (
|
||||
"model.layers.0.self_attn.qkv_proj",
|
||||
"model.layers.5.self_attn.o_proj",
|
||||
)
|
||||
negatives = (
|
||||
"model.layers.0.mlp.gate_up_proj",
|
||||
"model.layers.0.mlp.down_proj",
|
||||
"visual.blocks.0.attn.qkv_proj",
|
||||
"model.layers.x.self_attn.qkv_proj",
|
||||
"model.layers.0.attn.qkv_proj",
|
||||
)
|
||||
self._assert_pattern(
|
||||
Qwen3VLMoeForConditionalGeneration._lora_pattern_moe, positives, negatives
|
||||
)
|
||||
|
||||
|
||||
TEST_MULTIPLE_BATCH_PROMPTS = [
|
||||
"""
|
||||
### Instruction:
|
||||
Tell me about llamas and alpacas
|
||||
### Response:
|
||||
Llamas are large, long-necked animals with a woolly coat. They have two toes on each foot instead of three like other camelids (camels, dromedaries). Llamas live in the Andean mountains of South America where they graze on grasses and shrubs. Alpaca is another name for domesticated llama. The word "alpaca" comes from an Incan language meaning "golden fleece." Alpacas look very similar to llamas but are smaller than their wild relatives. Both species were used by ancient people as pack animals and for meat. Today both llamas and alpacas are raised primarily for their fiber which can be spun into yarn or knitted into clothing.
|
||||
### Question 2:
|
||||
What do you know about llamas?
|
||||
### Answer:
|
||||
""",
|
||||
"""
|
||||
### Instruction:
|
||||
Write a poem about the transformers Python library.
|
||||
Mention the word "large language models" in that poem.
|
||||
### Response:
|
||||
The Transformers are large language models,
|
||||
They're used to make predictions on text.
|
||||
""",
|
||||
"AI is a field of computer science focused on",
|
||||
"Computer science is the study of",
|
||||
"Write a short story.",
|
||||
"What are the main components of a computer?",
|
||||
]
|
||||
|
||||
|
||||
LORA_MODEL_VARIANTS = [
|
||||
(
|
||||
"Qwen3-VL",
|
||||
LoRAModelCase(
|
||||
base="Qwen/Qwen3-VL-4B-Instruct",
|
||||
adaptors=[
|
||||
LoRAAdaptor(
|
||||
name="mryufei/Qwen3-VL-4B-Instruct-trl-sft",
|
||||
prefill_tolerance=3e-1,
|
||||
),
|
||||
],
|
||||
max_loras_per_batch=1,
|
||||
),
|
||||
),
|
||||
# TODO: Move 30B MoE to 2 GPU runner
|
||||
# (
|
||||
# "Qwen3-VL-MoE",
|
||||
# LoRAModelCase(
|
||||
# base="Qwen/Qwen3-VL-30B-A3B-Instruct",
|
||||
# adaptors=[
|
||||
# LoRAAdaptor(
|
||||
# name="sosoai/qwen3_vl_30b_lora",
|
||||
# prefill_tolerance=3e-1,
|
||||
# ),
|
||||
# ],
|
||||
# max_loras_per_batch=1,
|
||||
# ),
|
||||
# ),
|
||||
]
|
||||
|
||||
LORA_MAX_NEW_TOKENS = 32
|
||||
|
||||
|
||||
def _run_lora_multiple_batch_on_model_cases(
|
||||
model_cases: Sequence[LoRAModelCase], *, max_new_tokens: int, variant_label: str
|
||||
):
|
||||
for model_case in model_cases:
|
||||
for torch_dtype in TORCH_DTYPES:
|
||||
backend = "csgmv"
|
||||
base_path = model_case.base
|
||||
lora_adapter_paths = [adaptor.name for adaptor in model_case.adaptors]
|
||||
|
||||
batches = [
|
||||
(
|
||||
[
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
],
|
||||
[None, lora_adapter_paths[0], None],
|
||||
),
|
||||
(
|
||||
[
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
],
|
||||
[lora_adapter_paths[0], None, None],
|
||||
),
|
||||
(
|
||||
[
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
random.choice(TEST_MULTIPLE_BATCH_PROMPTS),
|
||||
],
|
||||
[None, None, None],
|
||||
),
|
||||
]
|
||||
|
||||
print(
|
||||
f"\n=== {variant_label} LoRA parity on '{base_path}', backend={backend}, dtype={torch_dtype} ==="
|
||||
)
|
||||
|
||||
ensure_reproducibility()
|
||||
srt_runner = SRTRunner(
|
||||
base_path,
|
||||
torch_dtype=torch_dtype,
|
||||
model_type="generation",
|
||||
lora_paths=lora_adapter_paths,
|
||||
max_loras_per_batch=model_case.max_loras_per_batch,
|
||||
lora_backend=backend,
|
||||
sleep_on_idle=True,
|
||||
attention_backend="torch_native",
|
||||
disable_radix_cache=True,
|
||||
)
|
||||
|
||||
ensure_reproducibility()
|
||||
hf_runner = HFRunner(
|
||||
base_path,
|
||||
torch_dtype=torch_dtype,
|
||||
model_type="generation",
|
||||
patch_model_do_sample_false=True,
|
||||
)
|
||||
|
||||
with srt_runner, hf_runner:
|
||||
for i, (prompts, lora_paths) in enumerate(batches):
|
||||
print(
|
||||
f"\n--- Running Batch {i + 1} --- prompts: {prompts}, lora_paths: {lora_paths}"
|
||||
)
|
||||
|
||||
srt_outputs = srt_runner.batch_forward(
|
||||
prompts,
|
||||
max_new_tokens=max_new_tokens,
|
||||
lora_paths=lora_paths,
|
||||
)
|
||||
|
||||
hf_outputs = hf_runner.forward(
|
||||
prompts,
|
||||
max_new_tokens=max_new_tokens,
|
||||
lora_paths=lora_paths,
|
||||
)
|
||||
|
||||
print("SRT outputs:", [s for s in srt_outputs.output_strs])
|
||||
print("HF outputs:", [s for s in hf_outputs.output_strs])
|
||||
|
||||
for srt_out, hf_out in zip(
|
||||
srt_outputs.output_strs, hf_outputs.output_strs
|
||||
):
|
||||
srt_str = srt_out.strip()
|
||||
hf_str = hf_out.strip()
|
||||
rouge_tol = model_case.rouge_l_tolerance
|
||||
rouge_score = calculate_rouge_l([srt_str], [hf_str])[0]
|
||||
if rouge_score < rouge_tol:
|
||||
raise AssertionError(
|
||||
f"ROUGE-L score {rouge_score} below tolerance {rouge_tol} "
|
||||
f"for base '{base_path}', adaptor '{lora_paths}', backend '{backend}', prompt: '{prompts}...'"
|
||||
)
|
||||
|
||||
print(f"--- Batch {i + 1} Comparison Passed --- ")
|
||||
|
||||
|
||||
class TestLoRAQwen3VLIntegration(CustomTestCase):
|
||||
"""Parity integration tests for Qwen3‑VL dense and MoE LoRA adapters."""
|
||||
|
||||
def test_ci_lora_models(self):
|
||||
for label, model_case in LORA_MODEL_VARIANTS:
|
||||
with self.subTest(variant=label):
|
||||
_run_lora_multiple_batch_on_model_cases(
|
||||
[model_case],
|
||||
max_new_tokens=LORA_MAX_NEW_TOKENS,
|
||||
variant_label=label,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user