mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-06-11 22:35:46 +08:00
[BugFix] Don't change title of top-level process (#22032)
Signed-off-by: Nick Hill <nhill@redhat.com>
This commit is contained in:
parent
8026a335a1
commit
3146519add
@ -18,7 +18,8 @@ from vllm.entrypoints.utils import (VLLM_SUBCMD_PARSER_EPILOG,
|
|||||||
show_filtered_argument_or_group_from_help)
|
show_filtered_argument_or_group_from_help)
|
||||||
from vllm.logger import init_logger
|
from vllm.logger import init_logger
|
||||||
from vllm.usage.usage_lib import UsageContext
|
from vllm.usage.usage_lib import UsageContext
|
||||||
from vllm.utils import FlexibleArgumentParser, decorate_logs, get_tcp_uri
|
from vllm.utils import (FlexibleArgumentParser, decorate_logs, get_tcp_uri,
|
||||||
|
set_process_title)
|
||||||
from vllm.v1.engine.core import EngineCoreProc
|
from vllm.v1.engine.core import EngineCoreProc
|
||||||
from vllm.v1.engine.utils import CoreEngineProcManager, launch_core_engines
|
from vllm.v1.engine.utils import CoreEngineProcManager, launch_core_engines
|
||||||
from vllm.v1.executor.abstract import Executor
|
from vllm.v1.executor.abstract import Executor
|
||||||
@ -74,7 +75,7 @@ def run_headless(args: argparse.Namespace):
|
|||||||
|
|
||||||
if args.api_server_count > 1:
|
if args.api_server_count > 1:
|
||||||
raise ValueError("api_server_count can't be set in headless mode")
|
raise ValueError("api_server_count can't be set in headless mode")
|
||||||
# set_process_title("Headless_ProcManager")
|
|
||||||
# Create the EngineConfig.
|
# Create the EngineConfig.
|
||||||
engine_args = vllm.AsyncEngineArgs.from_cli_args(args)
|
engine_args = vllm.AsyncEngineArgs.from_cli_args(args)
|
||||||
usage_context = UsageContext.OPENAI_API_SERVER
|
usage_context = UsageContext.OPENAI_API_SERVER
|
||||||
@ -139,8 +140,6 @@ def run_multi_api_server(args: argparse.Namespace):
|
|||||||
|
|
||||||
orig_disable_mm_preprocessor_cache = args.disable_mm_preprocessor_cache
|
orig_disable_mm_preprocessor_cache = args.disable_mm_preprocessor_cache
|
||||||
|
|
||||||
# set_process_title("ProcManager")
|
|
||||||
|
|
||||||
if num_api_servers > 1:
|
if num_api_servers > 1:
|
||||||
setup_multiprocess_prometheus()
|
setup_multiprocess_prometheus()
|
||||||
|
|
||||||
@ -225,7 +224,9 @@ def run_api_server_worker_proc(listen_address,
|
|||||||
**uvicorn_kwargs) -> None:
|
**uvicorn_kwargs) -> None:
|
||||||
"""Entrypoint for individual API server worker processes."""
|
"""Entrypoint for individual API server worker processes."""
|
||||||
|
|
||||||
# Add process-specific prefix to stdout and stderr.
|
# Set process title and add process-specific prefix to stdout and stderr.
|
||||||
|
server_index = client_config.get("client_index", 0) if client_config else 0
|
||||||
|
set_process_title("APIServer", str(server_index))
|
||||||
decorate_logs()
|
decorate_logs()
|
||||||
|
|
||||||
uvloop.run(
|
uvloop.run(
|
||||||
|
|||||||
@ -102,7 +102,7 @@ from vllm.transformers_utils.tokenizer import MistralTokenizer
|
|||||||
from vllm.usage.usage_lib import UsageContext
|
from vllm.usage.usage_lib import UsageContext
|
||||||
from vllm.utils import (Device, FlexibleArgumentParser, decorate_logs,
|
from vllm.utils import (Device, FlexibleArgumentParser, decorate_logs,
|
||||||
get_open_zmq_ipc_path, is_valid_ipv6_address,
|
get_open_zmq_ipc_path, is_valid_ipv6_address,
|
||||||
set_process_title, set_ulimit)
|
set_ulimit)
|
||||||
from vllm.v1.metrics.prometheus import get_prometheus_registry
|
from vllm.v1.metrics.prometheus import get_prometheus_registry
|
||||||
from vllm.version import __version__ as VLLM_VERSION
|
from vllm.version import __version__ as VLLM_VERSION
|
||||||
|
|
||||||
@ -1824,7 +1824,7 @@ async def run_server_worker(listen_address,
|
|||||||
ToolParserManager.import_tool_parser(args.tool_parser_plugin)
|
ToolParserManager.import_tool_parser(args.tool_parser_plugin)
|
||||||
|
|
||||||
server_index = client_config.get("client_index", 0) if client_config else 0
|
server_index = client_config.get("client_index", 0) if client_config else 0
|
||||||
set_process_title("APIServer", str(server_index))
|
|
||||||
# Load logging config for uvicorn if specified
|
# Load logging config for uvicorn if specified
|
||||||
log_config = load_log_config(args.log_config_file)
|
log_config = load_log_config(args.log_config_file)
|
||||||
if log_config is not None:
|
if log_config is not None:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user