Merge upstream main into feat/spec-decode-under-pipeline-parallel

Resolve conflicts after the DSpark lazy-import refactor and Qwen3 DFlash model subclassing while preserving embedding sharing and global draft-layer numbering.

Co-authored-by: Cursor <noreply@cursor.com>
Signed-off-by: Yongqin Wang <yongqinwang@roblox.com>

Author: yongqinwang-cmd

.buildkite/ci_config_rocm.yaml

@@ -25,7 +25,6 @@ run_all_patterns:
   - "rust/"
   - "rust-toolchain.toml"
   - "tools/build_rust.py"
-  - "tools/install_protoc.sh"
   - "tools/install_torchcodec_rocm.sh"
   - "tests/vllm_test_utils/"
   - "vllm/envs.py"

.buildkite/hardware_tests/cpu.yaml

@@ -11,6 +11,10 @@ steps:
   - CMakeLists.txt
   - vllm/_custom_ops.py
   - tests/kernels/attention/test_cpu_attn.py
+  - tests/v1/attention/test_group_head_counts.py
+  - tests/kernels/attention/test_amx_mla.py
+  - vllm/v1/attention/backends/mla/amx_mla.py
+  - vllm/model_executor/layers/attention/mla_attention.py
   - tests/kernels/moe/test_cpu_fused_moe.py
   - tests/kernels/moe/test_cpu_quant_fused_moe.py
   - tests/kernels/test_onednn.py
@@ -27,6 +31,8 @@ steps:
     - |
       bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 30m "
       pytest -x -v -s tests/kernels/attention/test_cpu_attn.py
+      pytest -x -v -s tests/v1/attention/test_group_head_counts.py
+      pytest -x -v -s tests/kernels/attention/test_amx_mla.py
       pytest -x -v -s tests/kernels/moe/test_cpu_fused_moe.py
       pytest -x -v -s tests/kernels/moe/test_cpu_quant_fused_moe.py
       pytest -x -v -s tests/kernels/mamba/test_cpu_short_conv.py

.buildkite/hardware_tests/intel_xpu_ci/test-intel.yaml

@@ -57,6 +57,29 @@ steps:
       - >-
         bash .buildkite/scripts/hardware_ci/run-intel-test.sh
         'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh v1'
+    parallelism: 2
+  - label: "XPU W8A8 FP8 Linear Examples"
+    depends_on:
+      - image-build-xpu
+    timeout_in_minutes: 60
+    optional: true
+    device: intel_gpu
+    agent_tags:
+      label: production
+      gpu: 1+
+      mem: 24+
+    no_plugin: true
+    env:
+      REGISTRY: "public.ecr.aws/q9t5s3a7"
+      REPO: "vllm-ci-test-repo"
+      VLLM_TEST_DEVICE: "xpu"
+    source_file_dependencies:
+      - .buildkite/hardware_tests/intel_xpu_ci/test-intel.yaml
+      - .buildkite/scripts/hardware_ci/run-intel-ci-test.sh
+    commands:
+      - >-
+        bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+        'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh w8a8-fp8-linear'
   - label: "XPU server test"
     depends_on:
       - image-build-xpu
@@ -78,3 +101,68 @@ steps:
       - >-
         bash .buildkite/scripts/hardware_ci/run-intel-test.sh
         'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh server'
+  - label: "XPU quantization test"
+    depends_on:
+      - image-build-xpu
+    timeout_in_minutes: 60
+    optional: true
+    device: intel_gpu
+    agent_tags:
+      label: production
+      gpu: 1+
+      mem: 16+
+    no_plugin: true
+    env:
+      REGISTRY: "public.ecr.aws/q9t5s3a7"
+      REPO: "vllm-ci-test-repo"
+    source_file_dependencies:
+      - .buildkite/hardware_tests/intel_xpu_ci/test-intel.yaml
+      - .buildkite/scripts/hardware_ci/run-intel-ci-test.sh
+    commands:
+      - >-
+        bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+        'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh quantization'
+  - label: "XPU compressed tensors FP8 test"
+    depends_on:
+      - image-build-xpu
+    timeout_in_minutes: 60
+    optional: true
+    device: intel_gpu
+    agent_tags:
+      label: production
+      gpu: 1+
+      mem: 16+
+    no_plugin: true
+    env:
+      REGISTRY: "public.ecr.aws/q9t5s3a7"
+      REPO: "vllm-ci-test-repo"
+      VLLM_TEST_DEVICE: "xpu"
+    source_file_dependencies:
+      - .buildkite/hardware_tests/intel_xpu_ci/test-intel.yaml
+      - .buildkite/scripts/hardware_ci/run-intel-ci-test.sh
+    commands:
+      - >-
+        bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+        'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh compressed-tensors-fp8'
+  - label: "XPU Graph"
+    depends_on:
+      - image-build-xpu
+    timeout_in_minutes: 60
+    optional: true
+    device: intel_gpu
+    agent_tags:
+      label: production
+      gpu: 1+
+      mem: 32+
+    no_plugin: true
+    env:
+      REGISTRY: "public.ecr.aws/q9t5s3a7"
+      REPO: "vllm-ci-test-repo"
+      VLLM_TEST_DEVICE: "xpu"
+    source_file_dependencies:
+      - .buildkite/hardware_tests/intel_xpu_ci/test-intel.yaml
+      - .buildkite/scripts/hardware_ci/run-intel-ci-test.sh
+    commands:
+      - >-
+        bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+        'bash .buildkite/scripts/hardware_ci/run-intel-ci-test.sh graph'

.buildkite/image_build/image_build_arm64.sh

@@ -26,7 +26,7 @@ else
     --platform linux/arm64 \
     --build-arg max_jobs=16 \
     --build-arg nvcc_threads=4 \
-    --build-arg BUILD_BASE_IMAGE=pytorch/manylinuxaarch64-builder:cuda13.0 \
+    --build-arg BUILD_BASE_IMAGE=pytorch/manylinuxaarch64-builder:cuda13.0-78e737ad29420ffc4800e677c51e2a852caf8359 \
     --build-arg torch_cuda_arch_list="9.0 10.0 11.0 12.0" \
     --build-arg USE_SCCACHE=1 \
     --build-arg buildkite_commit="$BUILDKITE_COMMIT" \

.buildkite/image_build/image_build_torch_nightly.sh

@@ -48,7 +48,7 @@ echo "Image not found, proceeding with build..."
 # --- CUDA 13.0 for nightly builds ---
 # Nightly CI uses CUDA 13.0 while regular CI stays on CUDA 12.9
 NIGHTLY_CUDA_VERSION="13.0.2"
-NIGHTLY_BUILD_BASE_IMAGE="pytorch/manylinux2_28-builder:cuda13.0"
+NIGHTLY_BUILD_BASE_IMAGE="pytorch/manylinux2_28-builder:cuda13.0-78e737ad29420ffc4800e677c51e2a852caf8359"
 NIGHTLY_FINAL_BASE_IMAGE="nvidia/cuda:${NIGHTLY_CUDA_VERSION}-base-ubuntu22.04"
 
 echo "--- :docker: Building torch nightly image (CUDA ${NIGHTLY_CUDA_VERSION})"

…ldkite/intel_jobs/basic_correctness.yaml …/intel_jobs/basic_correctness_intel.yaml.buildkite/intel_jobs/basic_correctness.yaml renamed to .buildkite/intel_jobs/basic_correctness_intel.yaml .buildkite/intel_jobs/basic_correctness.yaml renamed to .buildkite/intel_jobs/basic_correctness_intel.yaml

@@ -7,7 +7,7 @@ steps:
   device: intel_gpu
   agent_tags:
     label: production
-    gpu: 1+
+    gpu: 2+
     mem: 16+
   no_plugin: true
   working_dir: "."
@@ -24,4 +24,4 @@ steps:
       'cd tests &&
       export VLLM_WORKER_MULTIPROC_METHOD=spawn &&
       pytest -v -s basic_correctness/test_cpu_offload.py &&
-      pytest -v -s basic_correctness/test_mem.py::test_end_to_end'
+      pytest -v -s basic_correctness/test_mem.py'

.buildkite/intel_jobs/expert_parallelism_intel.yaml

@@ -24,4 +24,5 @@ steps:
     - >-
       bash .buildkite/scripts/hardware_ci/run-intel-test.sh
       'cd tests &&
-      pytest -v -s distributed/test_eplb_algo.py'
+      pytest -v -s distributed/test_eplb_algo.py &&
+      pytest -v -s distributed/test_eplb_utils.py'

.buildkite/intel_jobs/lm_eval_intel.yaml

@@ -0,0 +1,28 @@
+group: LM Eval
+depends_on:
+  - image-build-xpu
+steps:
+- label: "XPU GPQA Eval (GPT-OSS)"
+  key: xpu-gpqa-eval-gpt-oss
+  timeout_in_minutes: 60
+  device: intel_gpu
+  agent_tags:
+    label: production
+    gpu: 1+
+    mem: 24+
+  no_plugin: true
+  working_dir: "."
+  env:
+    REGISTRY: "public.ecr.aws/q9t5s3a7"
+    REPO: "vllm-ci-test-repo"
+    VLLM_TEST_DEVICE: "xpu"
+  source_file_dependencies:
+    - csrc/
+    - vllm/model_executor/layers/quantization
+    - tests/evals/gpt_oss/
+  commands:
+    - >-
+      bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+      'pip install "gpt-oss[eval]==0.0.5" &&
+      cd tests &&
+      pytest -s -v evals/gpt_oss/test_gpqa_correctness.py --config-list-file=configs/models-xpu.txt'

.buildkite/intel_jobs/misc_intel.yaml

@@ -8,7 +8,7 @@ steps:
   agent_tags:
     label: production
     gpu: 1+
-    mem: 16+
+    mem: 24+
   no_plugin: true
   working_dir: "."
   env:
@@ -22,6 +22,7 @@ steps:
     - tests/v1/kv_offload
     - tests/v1/worker
     - tests/v1/kv_connector/unit
+    - tests/v1/ec_connector/unit
     - tests/v1/metrics
     - tests/entrypoints/openai/correctness/test_lmeval.py
   commands:
@@ -30,7 +31,8 @@ steps:
       'pip install -r requirements/kv_connectors.txt &&
       export VLLM_WORKER_MULTIPROC_METHOD=spawn &&
       cd tests &&
-      pytest -v -s v1/executor'
+      pytest -v -s v1/executor &&
+      VLLM_BATCH_INVARIANT=1 pytest -v -s -m 'not cpu_test' v1/ec_connector/unit'
 
 - label: V1 Sample + Logits
   timeout_in_minutes: 90
@@ -69,10 +71,9 @@ steps:
       export VLLM_WORKER_MULTIPROC_METHOD=spawn &&
       cd tests &&
       pytest -v -s v1/logits_processors --ignore=v1/logits_processors/test_custom_online.py --ignore=v1/logits_processors/test_custom_offline.py &&
-      pytest -v -s v1/test_oracle.py &&
-      pytest -v -s v1/test_request.py &&
-      pytest -v -s v1/test_outputs.py &&
+      pytest -v -s v1/test_oracle.py v1/test_request.py v1/test_outputs.py &&
       pytest -v -s v1/sample'
+  parallelism: 4
 
 - label: Basic Models Tests (Initialization)
   timeout_in_minutes: 60

.buildkite/intel_jobs/models_multimodal_intel.yaml

@@ -29,12 +29,12 @@ steps:
 
 - label: "Multi-Modal Models (Standard) 2: qwen3 + gemma"
   key: multi-modal-models-standard-2-qwen3-gemma
-  timeout_in_minutes: 70
+  timeout_in_minutes: 90
   device: intel_gpu
   agent_tags:
     label: production
     gpu: 1+
-    mem: 16+
+    mem: 24+
   no_plugin: true
   working_dir: "."
   env:
@@ -48,6 +48,8 @@ steps:
     - >-
       bash .buildkite/scripts/hardware_ci/run-intel-test.sh
       'cd tests &&
+      pytest -v -s models/multimodal/generation/test_common.py -m core_model -k "qwen3 or gemma" &&
+      pytest -v -s models/multimodal/generation/test_mm_prefix_lm.py -m core_model &&
       pytest -v -s models/multimodal/generation/test_qwen2_5_vl.py -m core_model'
 
 - label: "Multi-Modal Models (Standard) 3: llava + qwen2_vl"
@@ -125,3 +127,29 @@ steps:
       pytest -v -s models/multimodal/processing/test_tensor_schema.py
       --num-shards=$$BUILDKITE_PARALLEL_JOB_COUNT --shard-id=$$BUILDKITE_PARALLEL_JOB'
   parallelism: 4
+
+- label: Multi-Modal Models (Extended Generation 1)
+  key: multi-modal-models-extended-generation-1
+  timeout_in_minutes: 60
+  device: intel_gpu
+  agent_tags:
+    label: production
+    gpu: 1+
+    mem: 24+
+  no_plugin: true
+  working_dir: "."
+  env:
+    REGISTRY: "public.ecr.aws/q9t5s3a7"
+    REPO: "vllm-ci-test-repo"
+    VLLM_TEST_DEVICE: "xpu"
+  optional: true
+  source_file_dependencies:
+  - vllm/
+  - "!vllm/distributed/kv_transfer/"
+  - tests/models/multimodal/generation
+  - tests/models/multimodal/test_mapping.py
+  commands:
+    - >-
+      bash .buildkite/scripts/hardware_ci/run-intel-test.sh
+      'cd tests &&
+      pytest -v -s models/multimodal/test_mapping.py'