Upgrade to vllm 0.17.0 corex v4.1 overlay

vllm/entrypoints/cli/benchmark/main.py

@@ -2,8 +2,6 @@
 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 import argparse
-import importlib
-import logging
 import typing
 
 from vllm.entrypoints.cli.benchmark.base import BenchmarkSubcommandBase
@@ -15,30 +13,6 @@ if typing.TYPE_CHECKING:
 else:
     FlexibleArgumentParser = argparse.ArgumentParser
 
-logger = logging.getLogger(__name__)
-
-
-def _load_benchmark_subcommands() -> None:
-    modules = [
-        "vllm.entrypoints.cli.benchmark.latency",
-        "vllm.entrypoints.cli.benchmark.mm_processor",
-        "vllm.entrypoints.cli.benchmark.serve",
-        "vllm.entrypoints.cli.benchmark.startup",
-        "vllm.entrypoints.cli.benchmark.sweep",
-        "vllm.entrypoints.cli.benchmark.throughput",
-    ]
-
-    for module_name in modules:
-        try:
-            importlib.import_module(module_name)
-        except ModuleNotFoundError as e:
-            logger.warning(
-                "Skipping benchmark subcommand module %s because an optional "
-                "dependency could not be imported: %r",
-                module_name,
-                e,
-            )
-
 
 class BenchmarkSubcommand(CLISubcommand):
     """The `bench` subcommand for the vLLM CLI."""
@@ -64,8 +38,6 @@ class BenchmarkSubcommand(CLISubcommand):
         )
         bench_subparsers = bench_parser.add_subparsers(required=True, dest="bench_type")
 
-        _load_benchmark_subcommands()
-
         for cmd_cls in BenchmarkSubcommandBase.__subclasses__():
             cmd_subparser = bench_subparsers.add_parser(
                 cmd_cls.name,