jhansss commited on
Commit
025d5b1
·
1 Parent(s): 2548eae

Update Chinese-Japanese bilingual model path to be espnet/mixdata_svs_visinger2_spkemb_lang_pretrained

Browse files
Files changed (3) hide show
  1. server.py +1 -1
  2. svs_utils.py +2 -2
  3. util.py +2 -2
server.py CHANGED
@@ -39,7 +39,7 @@ SYSTEM_PROMPT = """
39
 
40
 
41
  config = argparse.Namespace(
42
- model_path="espnet/mixdata_svs_visinger2_spkembed_lang_pretrained",
43
  cache_dir="cache",
44
  device="cuda", # "cpu"
45
  melody_source="random_generate", # "random_select.take_lyric_continuation"
 
39
 
40
 
41
  config = argparse.Namespace(
42
+ model_path="espnet/mixdata_svs_visinger2_spkemb_lang_pretrained",
43
  cache_dir="cache",
44
  device="cuda", # "cpu"
45
  melody_source="random_generate", # "random_select.take_lyric_continuation"
svs_utils.py CHANGED
@@ -210,7 +210,7 @@ def svs_inference(answer_text, svs_model, config, **kwargs):
210
  if config.model_path == "espnet/aceopencpop_svs_visinger2_40singer_pretrain":
211
  sid = np.array([int(config.speaker)])
212
  output_dict = svs_model(batch, sids=sid)
213
- elif config.model_path == "espnet/mixdata_svs_visinger2_spkembed_lang_pretrained":
214
  langs = {
215
  "zh": 2,
216
  "jp": 1,
@@ -359,7 +359,7 @@ if __name__ == "__main__":
359
 
360
  # -------- demo code for generate audio from randomly selected song ---------#
361
  config = argparse.Namespace(
362
- model_path="espnet/mixdata_svs_visinger2_spkembed_lang_pretrained",
363
  cache_dir="cache",
364
  device="cuda", # "cpu"
365
  melody_source="random_select.touhou", #"random_generate" "random_select.take_lyric_continuation", "random_select.touhou"
 
210
  if config.model_path == "espnet/aceopencpop_svs_visinger2_40singer_pretrain":
211
  sid = np.array([int(config.speaker)])
212
  output_dict = svs_model(batch, sids=sid)
213
+ elif config.model_path == "espnet/mixdata_svs_visinger2_spkemb_lang_pretrained":
214
  langs = {
215
  "zh": 2,
216
  "jp": 1,
 
359
 
360
  # -------- demo code for generate audio from randomly selected song ---------#
361
  config = argparse.Namespace(
362
+ model_path="espnet/mixdata_svs_visinger2_spkemb_lang_pretrained",
363
  cache_dir="cache",
364
  device="cuda", # "cpu"
365
  melody_source="random_select.touhou", #"random_generate" "random_select.take_lyric_continuation", "random_select.touhou"
util.py CHANGED
@@ -61,7 +61,7 @@ def get_tokenizer(model, lang):
61
  return lambda text: split_pinyin_py(text)
62
  else:
63
  raise ValueError(f"Only support Chinese language for {model}")
64
- elif model == "espnet/mixdata_svs_visinger2_spkembed_lang_pretrained":
65
  if lang == "zh":
66
  with open(os.path.join("resource/all_plans.json"), "r") as f:
67
  all_plan_dict = json.load(f)
@@ -74,7 +74,7 @@ def get_tokenizer(model, lang):
74
  else:
75
  raise ValueError(f"Only support Chinese and Japanese language for {model}")
76
  else:
77
- raise ValueError(f"Only support espnet/aceopencpop_svs_visinger2_40singer_pretrain and espnet/mixdata_svs_visinger2_spkembed_lang_pretrained for now")
78
 
79
 
80
  def get_pinyin(texts):
 
61
  return lambda text: split_pinyin_py(text)
62
  else:
63
  raise ValueError(f"Only support Chinese language for {model}")
64
+ elif model == "espnet/mixdata_svs_visinger2_spkemb_lang_pretrained":
65
  if lang == "zh":
66
  with open(os.path.join("resource/all_plans.json"), "r") as f:
67
  all_plan_dict = json.load(f)
 
74
  else:
75
  raise ValueError(f"Only support Chinese and Japanese language for {model}")
76
  else:
77
+ raise ValueError(f"Only support espnet/aceopencpop_svs_visinger2_40singer_pretrain and espnet/mixdata_svs_visinger2_spkemb_lang_pretrained for now")
78
 
79
 
80
  def get_pinyin(texts):