Unverified Commit 577d4982 authored by wangxiyuan's avatar wangxiyuan Committed by GitHub
Browse files

[Plugin] Make plugin group clear (#26757)


Signed-off-by: default avatarwangxiyuan <wangxiyuan1007@gmail.com>
parent fd85c9f4
...@@ -6,7 +6,7 @@ from itertools import chain ...@@ -6,7 +6,7 @@ from itertools import chain
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from vllm import envs from vllm import envs
from vllm.plugins import load_plugins_by_group from vllm.plugins import PLATFORM_PLUGINS_GROUP, load_plugins_by_group
from vllm.utils import resolve_obj_by_qualname, supports_xccl from vllm.utils import resolve_obj_by_qualname, supports_xccl
from .interface import CpuArchEnum, Platform, PlatformEnum from .interface import CpuArchEnum, Platform, PlatformEnum
...@@ -188,7 +188,7 @@ builtin_platform_plugins = { ...@@ -188,7 +188,7 @@ builtin_platform_plugins = {
def resolve_current_platform_cls_qualname() -> str: def resolve_current_platform_cls_qualname() -> str:
platform_plugins = load_plugins_by_group("vllm.platform_plugins") platform_plugins = load_plugins_by_group(PLATFORM_PLUGINS_GROUP)
activated_plugins = [] activated_plugins = []
......
...@@ -9,7 +9,14 @@ import vllm.envs as envs ...@@ -9,7 +9,14 @@ import vllm.envs as envs
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Default plugins group will be loaded in all processes(process0, engine core
# process and worker processes)
DEFAULT_PLUGINS_GROUP = "vllm.general_plugins" DEFAULT_PLUGINS_GROUP = "vllm.general_plugins"
# IO processor plugins group will be loaded in process0 only
IO_PROCESSOR_PLUGINS_GROUP = "vllm.io_processor_plugins"
# Platform plugins group will be loaded in all processes when
# `vllm.platforms.current_platform` is called and the value not initialized,
PLATFORM_PLUGINS_GROUP = "vllm.platform_plugins"
# make sure one process only loads plugins once # make sure one process only loads plugins once
plugins_loaded = False plugins_loaded = False
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import logging import logging
from vllm.config import VllmConfig from vllm.config import VllmConfig
from vllm.plugins import load_plugins_by_group from vllm.plugins import IO_PROCESSOR_PLUGINS_GROUP, load_plugins_by_group
from vllm.plugins.io_processors.interface import IOProcessor from vllm.plugins.io_processors.interface import IOProcessor
from vllm.utils import resolve_obj_by_qualname from vllm.utils import resolve_obj_by_qualname
...@@ -37,7 +37,7 @@ def get_io_processor( ...@@ -37,7 +37,7 @@ def get_io_processor(
# Load all installed plugin in the group # Load all installed plugin in the group
multimodal_data_processor_plugins = load_plugins_by_group( multimodal_data_processor_plugins = load_plugins_by_group(
"vllm.io_processor_plugins" IO_PROCESSOR_PLUGINS_GROUP
) )
loadable_plugins = {} loadable_plugins = {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment