Skip to content

Commit dce3404

Browse files
committed
f
Signed-off-by: oliver könig <okoenig@nvidia.com>
1 parent 63b5219 commit dce3404

5 files changed

Lines changed: 38 additions & 14 deletions

File tree

nemo_export/trt_llm/converter/model_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from typing import Any, Dict, List, Optional, Tuple
1717

1818
import numpy as np
19-
import tensorrt_llm
2019
import torch
2120

2221
from nemo_export.trt_llm.converter.model_to_trt_llm_ckpt import (
@@ -27,6 +26,7 @@
2726
from nemo_export_deploy_common.import_utils import UnavailableError
2827

2928
try:
29+
import tensorrt_llm
3030
from tensorrt_llm._utils import pad_vocab_size
3131
from tensorrt_llm.functional import non_gated_version
3232
from tensorrt_llm.layers import MoeConfig

nemo_export/trt_llm/converter/utils.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818
import numpy as np
1919
import tensorrt_llm
2020
import torch
21-
from tensorrt_llm._utils import mpi_comm, torch_to_numpy
21+
22+
from nemo_export_deploy_common.import_utils import UnavailableError
23+
24+
try:
25+
from tensorrt_llm._utils import mpi_comm, torch_to_numpy
26+
except (ImportError, ModuleNotFoundError) as e:
27+
raise UnavailableError("tensorrt_llm is not available. Please install it with `pip install tensorrt-llm`.") from e
2228

2329
# A global dicts to store exported weights.
2430
# This is set to be a global variable to avoid extra code modification from tensorrt_llm.

nemo_export/trt_llm/tensorrt_llm_run.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,23 @@
2424

2525
import numpy as np
2626
import tensorrt as trt
27-
import tensorrt_llm
2827
import torch
29-
from mpi4py.futures import MPIPoolExecutor
30-
from tensorrt_llm.builder import Engine
31-
from tensorrt_llm.lora_manager import LoraManager
32-
from tensorrt_llm.quantization import QuantMode
3328
from transformers import PreTrainedTokenizer
3429

3530
from nemo_export_deploy_common.import_utils import UnavailableError
3631

3732
LOGGER = logging.getLogger("NeMo")
3833

3934
try:
35+
from mpi4py.futures import MPIPoolExecutor
36+
except (ImportError, ModuleNotFoundError) as e:
37+
raise UnavailableError("mpi4py is not available. Please install it with `pip install mpi4py`.") from e
38+
39+
try:
40+
import tensorrt_llm
41+
from tensorrt_llm.builder import Engine
42+
from tensorrt_llm.lora_manager import LoraManager
43+
from tensorrt_llm.quantization import QuantMode
4044
from tensorrt_llm.runtime import (
4145
ModelConfig,
4246
ModelRunner,

nemo_export/vllm/model_loader.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@
1818

1919
import safetensors.torch
2020
import torch
21-
from vllm.config import ModelConfig
22-
from vllm.model_executor.model_loader import BaseModelLoader, get_model
23-
from vllm.model_executor.model_loader.utils import set_default_torch_dtype
2421

2522
from nemo_export.utils import load_model_weights
2623
from nemo_export.vllm.model_config import NemoModelConfig
24+
from nemo_export_deploy_common.import_utils import UnavailableError
25+
26+
try:
27+
from vllm.config import ModelConfig
28+
from vllm.model_executor.model_loader import BaseModelLoader, get_model
29+
from vllm.model_executor.model_loader.utils import set_default_torch_dtype
30+
except (ImportError, ModuleNotFoundError):
31+
raise UnavailableError("vllm is not installed. Please install it with `pip install vllm`.")
2732

2833
LOGGER = logging.getLogger("NeMo")
2934

nemo_export/vllm_hf_exporter.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@
1616
from typing import List
1717

1818
import numpy as np
19-
from pytriton.decorators import batch, first_value
20-
from pytriton.model_config import Tensor
21-
from vllm import LLM, SamplingParams
22-
from vllm.lora.request import LoRARequest
2319

2420
from nemo_deploy import ITritonDeployable
2521
from nemo_deploy.utils import cast_output, str_ndarray2list
22+
from nemo_export_deploy_common.import_utils import UnavailableError
23+
24+
try:
25+
from pytriton.decorators import batch, first_value
26+
from pytriton.model_config import Tensor
27+
except (ImportError, ModuleNotFoundError):
28+
raise UnavailableError("pytriton is not installed. Please install it with `pip install nvidia-pytriton`.")
29+
30+
try:
31+
from vllm import LLM, SamplingParams
32+
from vllm.lora.request import LoRARequest
33+
except (ImportError, ModuleNotFoundError):
34+
raise UnavailableError("vllm is not installed. Please install it with `pip install vllm`.")
2635

2736

2837
class vLLMHFExporter(ITritonDeployable):

0 commit comments

Comments
 (0)