From 7b1f0b408bbde9fa1906fe427c71c0684e950dfb Mon Sep 17 00:00:00 2001 From: Adam Ning Date: Thu, 17 Oct 2024 17:49:09 +0800 Subject: [PATCH] ENH: Speed up cli interaction (#2443) --- xinference/__init__.py | 4 ---- xinference/deploy/supervisor.py | 4 ++++ xinference/model/__init__.py | 4 ++++ xinference/utils.py | 5 ++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xinference/__init__.py b/xinference/__init__.py index eb1fe93d66..8d87113a8e 100644 --- a/xinference/__init__.py +++ b/xinference/__init__.py @@ -26,13 +26,9 @@ def _install(): from xoscar.backends.router import Router - from .model import _install as install_model - default_router = Router.get_instance_or_empty() Router.set_instance(default_router) - install_model() - _install() del _install diff --git a/xinference/deploy/supervisor.py b/xinference/deploy/supervisor.py index ed12a9f7c2..aac1e78d3e 100644 --- a/xinference/deploy/supervisor.py +++ b/xinference/deploy/supervisor.py @@ -31,6 +31,10 @@ logger = logging.getLogger(__name__) +from ..model import _install as install_model + +install_model() + async def _start_supervisor(address: str, logging_conf: Optional[Dict] = None): logging.config.dictConfig(logging_conf) # type: ignore diff --git a/xinference/model/__init__.py b/xinference/model/__init__.py index 5d8180f40b..d751b2f663 100644 --- a/xinference/model/__init__.py +++ b/xinference/model/__init__.py @@ -29,3 +29,7 @@ def _install(): image_install() rerank_install() video_install() + + +_install() +del _install diff --git a/xinference/utils.py b/xinference/utils.py index 79a46fde6d..3514a6984e 100644 --- a/xinference/utils.py +++ b/xinference/utils.py @@ -13,9 +13,8 @@ # limitations under the License. -import torch - - def cuda_count(): + import torch + # even if install torch cpu, this interface would return 0. return torch.cuda.device_count()