Repository navigation
[MISC] Cleanup deprecated parameters - #53559
Conversation
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review for a one-time review, or @claude review always to subscribe this PR to a review on every future push.
Tip: disable this comment in your organization's Code Review settings.
Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai>
Signed-off-by: Cyrus Leung <cyrus.tl.leung@gmail.com>
|
/ci run |
|
✅ Triggered Buildkite CI #85303 for commit |
|
Hi @jeejeelee, the pre-commit checks have failed. Please run: uv pip install pre-commit>=4.5.1
pre-commit install
pre-commit run --all-filesThen, commit the changes and push to your branch. For future commits, |
|
Hi @jeejeelee, the pre-commit checks have failed. Please run: uv pip install pre-commit>=4.5.1
pre-commit install
pre-commit run --all-filesThen, commit the changes and push to your branch. For future commits, |
Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai>
yewentao256
left a comment
There was a problem hiding this comment.
LGTM, thanks for the work!
|
/ci run |
|
✅ Triggered Buildkite CI #85341 for commit |
… group_mm_kwargs_by_modality to group_and_batch_mm_kwargs Root cause: vllm#53559 (4f686e1) deleted the deprecated group_mm_kwargs_by_modality alias, so importing HPUModelRunner raises ImportError. Upstream: vllm-project/vllm#53559 Fix: import and call group_and_batch_mm_kwargs, the signature- and yield-identical replacement upstream renamed it to in vllm#36158. Signed-off-by: Paweł Olejniczak <pawelx.olejniczak@intel.com>
…PU HunYuan, Import cli_args from (+3 more) (#1759) This PR consolidates 5 hourly-CI fixes against vllm@`17da48596c98946d3e3e6896e2ebd341e809f3bd` per the single-rolling-PR rule (invariant I9). ## Bug 1: Drop HPU HunYuan V1 overrides deleted upstream - **State machine id**: hunyuan_v1_model_module_removed_plugin_reg - **Commit**: c352fb7 ### Root cause vllm#53615 (48d7132) migrated HunYuan V1/VL to the Transformers modeling backend and deleted vllm/model_executor/models/hunyuan_v1.py, so the eager import in vllm_gaudi/models/__init__.py aborted plugin registration and killed 48 of 51 jobs in CI run 32990520142 before any test could run. ### Culprit Regression introduced by [PR #53615](vllm-project/vllm#53615). ### Fix remove vllm_gaudi/models/hunyuan_v1.py and its two register_model calls; upstream's registry now serves both architectures via the Transformers backend and the HPU subclass only specialized the now-deleted HunYuanAttention. ## Bug 2: Import cli_args from vllm.entrypoints.launchers - **State machine id**: entrypoints_openai_cli_args_module_moved - **Commit**: 935d821 ### Root cause upstream moved vllm/entrypoints/openai/cli_args.py to vllm/entrypoints/launchers/cli_args.py with no compatibility re-export, so multi_model_api_server.py raised ModuleNotFoundError at import time and took down run_unit_tests plus e2e run_online_model_swap_test. ### Culprit Regression introduced by [PR #53659](vllm-project/vllm#53659). ### Fix import make_arg_parser and validate_parsed_serve_args from the new vllm.entrypoints.launchers.cli_args path; both symbols are unchanged there. ## Bug 3: Rename group_mm_kwargs_by_modality to group_and_batch_mm_kwargs - **State machine id**: group_mm_kwargs_by_modality_import_removed - **Commit**: 0988519 ### Root cause vllm#53559 (4f686e1) deleted the deprecated group_mm_kwargs_by_modality alias, so importing HPUModelRunner raises ImportError. ### Culprit Regression introduced by [PR #53559](vllm-project/vllm#53559). ### Fix import and call group_and_batch_mm_kwargs, the signature- and yield-identical replacement upstream renamed it to in vllm#36158. ## Bug 4: Index flattened LoRA _embeddings_indices - **State machine id**: hpu_lora_embeddings_indices_zero_dim_indexerror - **Commit**: fb5e4b0 ### Root cause vLLM PR #53843 flattened PunicaWrapperBase._embeddings_indices from [2, max_num_batched_tokens] to 1-D, so the HPU override's [1] select yielded a 0-dim tensor and slicing it raised IndexError. ### Culprit Regression introduced by [PR #53843](vllm-project/vllm#53843). ### Fix drop the stale row select and slice the 1-D indices directly, mirroring upstream's own forward update. ## Bug 5: Override synchronize_device for HPU - **State machine id**: synchronize_device_torch_accelerator_unsupported - **Commit**: e01570f ### Root cause vllm#52914 added WorkerBase.synchronize_device() defaulting to torch.accelerator.synchronize() plus an EngineCore._finish_pause() that collective_rpc's it on every pause, and HPU rejects a device-wide wait. ### Culprit Regression introduced by [PR #52914](vllm-project/vllm#52914). ### Fix HPUWorker.synchronize_device() waits via torch.hpu.synchronize(). --------- Signed-off-by: Paweł Olejniczak <pawelx.olejniczak@intel.com>
Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai> Signed-off-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk>
Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai> Signed-off-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk> Signed-off-by: mikeshawcode <michaelwshaw2@gmail.com>
…nflicts Took the branch's vllm/envs.py wholesale: main's legacy TYPE_CHECKING block and environment_variables dict are already superseded by the pydantic *Settings models here. Then ported main's semantic delta from the 57 main-side commits that touched vllm/envs.py since 03a8d0b: vllm-project#52431 VLLM_USE_MODELSCOPE: description (bool already accepts "1") vllm-project#52216 prefix_cache_retention_interval promoted to an arg (see vllm-project#55353) vllm-project#48484 + VLLM_REPLICATE_EMBED vllm-project#52633 + VLLM_CPU_CI_ENV vllm-project#52182 - VLLM_TEST_FORCE_FP8_MARLIN vllm-project#52523 VLLM_API_KEY not a compile factor (branch already marked it) vllm-project#52998 VLLM_ALLREDUCE_USE_FLASHINFER default -> True vllm-project#53040 + VLLM_DISABLE_DSV4_MEGAMOE_SHARED_EXPERT_FUSION vllm-project#53053 + VLLM_KIMI_K3_GEMM_AR vllm-project#50501 + VLLM_XPU_INC_WNA16_BACKEND (case-sensitive Literal) vllm-project#52018 + VLLM_B12X_MOE_FP4_FORCE_A16 vllm-project#43018 + VLLM_KV_OFFLOAD_MAX_BATCH_DESCRIPTORS vllm-project#51718 VLLM_KV_CACHE_LAYOUT Literal widened to 8 layouts + description vllm-project#51896 + VLLM_MAX_MEDIA_DOWNLOAD_SIZE_MB vllm-project#53219 VLLM_ENABLE_COHERE_API: description vllm-project#53559 - VLLM_TRITON_ATTN_USE_TD shim (already absent on the branch) vllm-project#53561 VLLM_MAX_AUDIO_CLIP_FILESIZE_MB: description vllm-project#53378 VLLM_ELASTIC_EP_SCALE_UP_LAUNCH not a compile factor vllm-project#53141 VLLM_ROCM_USE_AITER_FP4_ASM_GEMM removed; restored by vllm-project#57055 vllm-project#54160 + VLLM_ENABLE_HPC_OPS vllm-project#53536 + VLLM_XPU_FORCE_N_CONTIG_WEIGHT vllm-project#53576 + VLLM_ALLREDUCE_USE_FLASHINFER_PCIE_IPC vllm-project#54632 + VLLM_MAX_EMBED_DECODE_BYTES (not a compile factor) vllm-project#54579 + VLLM_ENABLE_SCALE_OUT_ENDPOINTS; removed by vllm-project#55176 (net zero) vllm-project#53491 VLLM_GPU_SYNC_CHECK: description vllm-project#54371 + VLLM_PLE_CPU_OFFLOAD; reworked vllm-project#56512, dropped vllm-project#57937 (net zero) vllm-project#48247 VLLM_ROCM_USE_AITER_CUSTOM_AR: description vllm-project#55353 - VLLM_MM_HASHER_ALGORITHM (+ _lower_mm_hasher), - VLLM_PREFIX_CACHE_RETENTION_INTERVAL vllm-project#54985 - VLLM_NIXL_EP_MAX_NUM_RANKS vllm-project#56512 VLLM_PLE_CPU_OFFLOAD rework (net zero, see vllm-project#54371) vllm-project#55176 - VLLM_ENABLE_SCALE_OUT_ENDPOINTS (net zero, see vllm-project#54579) vllm-project#53940 + VLLM_ROCM_USE_AITER_MOE_SITUV2 (case-insensitive Literal) vllm-project#41074 + VLLM_SKIP_VERSION_SUFFIX (not a compile factor) vllm-project#48599 - envs.validate_environ (moved to Platform.validate_environ, which reads the branch's environment_variables shim) vllm-project#52136 pydocstyle docstring restyle of legacy helpers (no-op here) vllm-project#57212 docstring rejoin of legacy helpers (no-op here) vllm-project#56913 + FORCE_COLOR (alias, non-"0" is True, not a compile factor) vllm-project#57055 VLLM_ROCM_USE_AITER_FP4_ASM_GEMM restored (net zero, see vllm-project#53141) vllm-project#57142 shm buffer name autogen -> new _generate_shm_name() (<=30 chars) vllm-project#56685 VLLM_HUMMING_INPUT_QUANT_CONFIG: description vllm-project#57937 - VLLM_PLE_CPU_OFFLOAD (net zero, see vllm-project#54371) vllm-project#50814 + VLLM_MXFP4_EMULATION_DEQUANT_AT_LOAD vllm-project#57428 + VLLM_ENABLE_GEMM_RS, - VLLM_KIMI_K3_GEMM_RS vllm-project#51600 - VLLM_XPU_ENABLE_XPU_GRAPH vllm-project#58582 + VLLM_TRITON_JIT_WARMUP_NUM_THREADS (not a compile factor) vllm-project#55145 + VLLM_XPU_PP_MICROBATCH vllm-project#58201 VLLM_ROCM_USE_AITER_MOE_SITUV2 6-way choice, - VLLM_ROCM_USE_AITER_MOE_SITUV2_A8W4 vllm-project#58919 + VLLM_MOONCAKE_CONNECTOR_TIMEOUT vllm-project#56861 + VLLM_ROCM_AITER_MLA_DCP_VERIFY (case-insensitive Literal) vllm-project#53492 + VLLM_ROCM_USE_AITER_TRITON_SPARSE_MLA vllm-project#57991 VLLM_DEEPEP_V2_ALLOW_HYBRID_MODE default True (branch already True) + description vllm-project#58819 + VLLM_ROCM_USE_AITER_MOE_A4W4_DSV4 (tri-state, bool(int(v))) vllm-project#50300 + VLLM_CHAT_TEMPLATE_RENDER_TIMEOUT vllm-project#54024 VLLM_CPU_INT4_W4A8: description vllm-project#59781 - VLLM_ENGINE_ITERATION_TIMEOUT_S vllm-project#57995 + VLLM_FLASHINFER_MOE_A2A_LOW_PRECISION_COMBINE vllm-project#59965 VLLM_ROCM_AITER_MLA_DCP_VERIFY default route (final "auto") Also VLLM_SSM_CONV_STATE_LAYOUT's description follows vllm-project#51718's layout rename. Parity: 311 branch fields vs 311 main runtime entries, no difference in either direction. Every var's value matches main's lambdas in an empty environment and under 15 override scenarios, except case normalization of the two lowercased ROCm choices (both callers already call .lower()). Intentionally not ported: main's new consumer tests that match env_with_choices' error text (test_invalid_backend_value_raises, test_dcp_verify_env_rejects_unknown_route, and the ROCm-gated test_aiter_moe_situv2_rejects_unknown_activation) fail on this branch: pydantic's ValidationError names the field, not the env var. Invalid values are still rejected. Tracked as a branch-wide follow-up. Other conflicts and merge fallout: - requirements/docs.txt, requirements/test/{cpu,cuda,rocm,xpu}.txt: took main's lockfiles and regenerated them with the pip-compile pre-commit hooks; they differ from main only by the branch's pydantic-settings lines. - tests/test_envs_pydantic.py: dropped the mm-hasher test, pointed the validate_environ tests at Platform.validate_environ, updated the shm-name prefix assertion. - check-test-tethering (new on main): wired test_envs_pydantic.py into the CPU params/env job; allowlisted tests/docs/test_env_vars_gen.py, which cannot run from a CI job's tests/ cwd (tests/docs shadows docs/). Tests: pytest tests/test_envs.py tests/test_envs_pydantic.py tests/docs/test_env_vars_gen.py -> 55 passed; pre-commit run --files on all changed files -> clean. AI assistance (Claude) was used for this merge resolution. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: Vinay Damodaran <vrdn@hey.com>
Purpose
Test Plan
Test Result
Essential Elements of an Effective PR Description Checklist
supported_models.mdandexamplesfor a new model.