kemuriririn commited on
Commit
cad7a5b
·
1 Parent(s): f58a4a7
Files changed (2) hide show
  1. app.py +1 -1
  2. cosyvoice/cli/cosyvoice.py +5 -0
app.py CHANGED
@@ -54,7 +54,7 @@ sys.path.append('{}/third_party/Matcha-TTS'.format(ROOT_DIR))
54
  from huggingface_hub import snapshot_download
55
  snapshot_download('FunAudioLLM/CosyVoice2-0.5B', local_dir='pretrained_models/CosyVoice2-0.5B')
56
  snapshot_download('FunAudioLLM/CosyVoice-ttsfrd', local_dir='pretrained_models/CosyVoice-ttsfrd')
57
- os.system('cd pretrained_models/CosyVoice-ttsfrd/ && pip install ttsfrd_dependency-0.1-py3-none-any.whl && pip install ttsfrd-0.4.2-cp310-cp310-linux_x86_64.whl && tar -xvf resource.tar')
58
 
59
  from cosyvoice.cli.cosyvoice import CosyVoice2
60
  from cosyvoice.utils.file_utils import load_wav, logging
 
54
  from huggingface_hub import snapshot_download
55
  snapshot_download('FunAudioLLM/CosyVoice2-0.5B', local_dir='pretrained_models/CosyVoice2-0.5B')
56
  snapshot_download('FunAudioLLM/CosyVoice-ttsfrd', local_dir='pretrained_models/CosyVoice-ttsfrd')
57
+ os.system('cd pretrained_models/CosyVoice-ttsfrd/ && unzip resource.zip && pip install ttsfrd_dependency-0.1-py3-none-any.whl && pip install ttsfrd-0.4.2-cp310-cp310-linux_x86_64.whl && tar -xvf resource.tar')
58
 
59
  from cosyvoice.cli.cosyvoice import CosyVoice2
60
  from cosyvoice.utils.file_utils import load_wav, logging
cosyvoice/cli/cosyvoice.py CHANGED
@@ -140,6 +140,7 @@ class CosyVoice2(CosyVoice):
140
  model_dir = snapshot_download(model_dir)
141
  with open('{}/cosyvoice.yaml'.format(model_dir), 'r') as f:
142
  configs = load_hyperpyyaml(f, overrides={'qwen_pretrain_path': os.path.join(model_dir, 'CosyVoice-BlankEN')})
 
143
  self.frontend = CosyVoiceFrontEnd(configs['get_tokenizer'],
144
  configs['feat_extractor'],
145
  '{}/campplus.onnx'.format(model_dir),
@@ -147,14 +148,18 @@ class CosyVoice2(CosyVoice):
147
  '{}/spk2info.pt'.format(model_dir),
148
  instruct,
149
  configs['allowed_special'])
 
150
  self.sample_rate = configs['sample_rate']
151
  if torch.cuda.is_available() is False and load_jit is True:
152
  load_jit = False
153
  logging.warning('cpu do not support jit, force set to False')
154
  self.model = CosyVoice2Model(configs['llm'], configs['flow'], configs['hift'])
 
 
155
  self.model.load('{}/llm.pt'.format(model_dir),
156
  '{}/flow.pt'.format(model_dir),
157
  '{}/hift.pt'.format(model_dir))
 
158
  if load_jit:
159
  self.model.load_jit('{}/flow.encoder.fp32.zip'.format(model_dir))
160
  if load_trt is True and load_onnx is True:
 
140
  model_dir = snapshot_download(model_dir)
141
  with open('{}/cosyvoice.yaml'.format(model_dir), 'r') as f:
142
  configs = load_hyperpyyaml(f, overrides={'qwen_pretrain_path': os.path.join(model_dir, 'CosyVoice-BlankEN')})
143
+ print(f"Loading configs:{configs}")
144
  self.frontend = CosyVoiceFrontEnd(configs['get_tokenizer'],
145
  configs['feat_extractor'],
146
  '{}/campplus.onnx'.format(model_dir),
 
148
  '{}/spk2info.pt'.format(model_dir),
149
  instruct,
150
  configs['allowed_special'])
151
+ print("Loaded frontend")
152
  self.sample_rate = configs['sample_rate']
153
  if torch.cuda.is_available() is False and load_jit is True:
154
  load_jit = False
155
  logging.warning('cpu do not support jit, force set to False')
156
  self.model = CosyVoice2Model(configs['llm'], configs['flow'], configs['hift'])
157
+ print("Loaded model")
158
+
159
  self.model.load('{}/llm.pt'.format(model_dir),
160
  '{}/flow.pt'.format(model_dir),
161
  '{}/hift.pt'.format(model_dir))
162
+ print(f"Model llm from {model_dir}/llm.pt, flow from {model_dir}/flow.pt, hift from {model_dir}/hift.pt")
163
  if load_jit:
164
  self.model.load_jit('{}/flow.encoder.fp32.zip'.format(model_dir))
165
  if load_trt is True and load_onnx is True: