From 18599be8d5edba918fcaac9e0f55ecd6ab4e045c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E6=81=AF?= Date: Fri, 30 Aug 2024 14:15:24 +0800 Subject: [PATCH] mirror modify --- cosyvoice/bin/export_trt.py | 14 ++++++++++++++ cosyvoice/cli/model.py | 6 +----- cosyvoice/flow/flow_matching.py | 1 - 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cosyvoice/bin/export_trt.py b/cosyvoice/bin/export_trt.py index 1bf958c..c737373 100644 --- a/cosyvoice/bin/export_trt.py +++ b/cosyvoice/bin/export_trt.py @@ -1,3 +1,17 @@ +# Copyright (c) 2024 Antgroup Inc (authors: Zhoubofan, hexisyztem@icloud.com) +# +# 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. + import argparse import logging import os diff --git a/cosyvoice/cli/model.py b/cosyvoice/cli/model.py index bf18ea3..50ae0b1 100644 --- a/cosyvoice/cli/model.py +++ b/cosyvoice/cli/model.py @@ -20,11 +20,6 @@ from contextlib import nullcontext import uuid from cosyvoice.utils.common import fade_in_out -try: - import tensorrt as trt -except ImportError: - ... - class CosyVoiceModel: def __init__(self, @@ -72,6 +67,7 @@ class CosyVoiceModel: self.llm.llm = llm_llm def load_trt(self, model_dir, use_fp16): + import tensorrt as trt trt_file_name = 'estimator_fp16.plan' if use_fp16 else 'estimator_fp32.plan' trt_file_path = os.path.join(model_dir, trt_file_name) if not os.path.isfile(trt_file_path): diff --git a/cosyvoice/flow/flow_matching.py b/cosyvoice/flow/flow_matching.py index 18efe75..a31506a 100755 --- a/cosyvoice/flow/flow_matching.py +++ b/cosyvoice/flow/flow_matching.py @@ -102,7 +102,6 @@ class ConditionalCFM(BASECFM): if self.estimator is not None: return self.estimator.forward(x, mask, mu, t, spks, cond) else: - print("-----------") assert self.training is False, 'tensorrt cannot be used in training' bs = x.shape[0] hs = x.shape[1]