From 40f7ac12cf46feb02d3a8d0cf8aea5e2ec1ef43b Mon Sep 17 00:00:00 2001 From: hw_whx Date: Thu, 6 Feb 2025 16:11:06 +0800 Subject: [PATCH 1/2] feat: try to register mindie_turbo while initializing NPUWorker Signed-off-by: hw_whx --- vllm_ascend/utils.py | 34 ++++++++++++++++++++++++++++++++++ vllm_ascend/worker.py | 6 ++++++ 2 files changed, 40 insertions(+) create mode 100644 vllm_ascend/utils.py diff --git a/vllm_ascend/utils.py b/vllm_ascend/utils.py new file mode 100644 index 00000000000..350258b2482 --- /dev/null +++ b/vllm_ascend/utils.py @@ -0,0 +1,34 @@ +# +# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. +# This file is a part of the vllm-ascend project. +# Adapted from vllm-project/vllm/vllm/worker/worker.py +# Copyright 2023 The vLLM team. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from vllm.logger import init_logger + +logger = init_logger(__name__) + + +def try_register_lib(lib_name: str, lib_info: str = None): + import importlib + try: + module_spec = importlib.util.find_spec(lib_name) + if module_spec is not None: + importlib.import_module(lib_name) + if lib_info is not None: + logger.info(lib_info) + except Exception: + pass diff --git a/vllm_ascend/worker.py b/vllm_ascend/worker.py index e81b42dcd37..c5884e36d47 100644 --- a/vllm_ascend/worker.py +++ b/vllm_ascend/worker.py @@ -47,6 +47,7 @@ WorkerInput) from vllm_ascend.model_runner import NPUModelRunner +from vllm_ascend.utils import try_register_lib logger = init_logger(__name__) @@ -69,6 +70,11 @@ def __init__( ) -> None: WorkerBase.__init__(self, vllm_config=vllm_config) + # Try to import mindie_turbo to accelerate vLLM inference. + try_register_lib( + "mindie_turbo", + "MindIE Turbo is installed. vLLM inference will be accelerated with MindIE Turbo." + ) # distribute related config self.parallel_config.rank = rank self.local_rank = local_rank From c03527a376efe893e392564b33289fe266c4efcb Mon Sep 17 00:00:00 2001 From: hw_whx Date: Fri, 7 Feb 2025 10:26:03 +0800 Subject: [PATCH 2/2] fix ci problems Signed-off-by: hw_whx --- vllm_ascend/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vllm_ascend/utils.py b/vllm_ascend/utils.py index 350258b2482..d12e72c01e0 100644 --- a/vllm_ascend/utils.py +++ b/vllm_ascend/utils.py @@ -22,13 +22,14 @@ logger = init_logger(__name__) -def try_register_lib(lib_name: str, lib_info: str = None): +def try_register_lib(lib_name: str, lib_info: str = ""): import importlib + import importlib.util try: module_spec = importlib.util.find_spec(lib_name) if module_spec is not None: importlib.import_module(lib_name) - if lib_info is not None: + if lib_info: logger.info(lib_info) except Exception: pass