update

app.py

@@ -55,9 +55,6 @@ def get_args(
 
 	if args["time_start"] is None:
 		args["time_start"] = 0.0
-	# if args["time_end"] is None:
-	# 	args["time_end"] = args["time_start"] + args["max_generate_audio_seconds"]
-	# if args["time_start"] > args["time_end"]:
 	args["time_end"] = args["time_start"] + args["max_generate_audio_seconds"]
 
 	print(args)

inspiremusic/cli/inference.py

@@ -18,13 +18,11 @@ import torchaudio
 import time
 import logging
 import argparse
-
-from modelscope import snapshot_download
+import shutil
 from inspiremusic.cli.inspiremusic import InspireMusic
 from inspiremusic.utils.file_utils import logging
 import torch
 from inspiremusic.utils.audio_utils import trim_audio, fade_out
-from transformers import AutoModel
 
 def set_env_variables():
     os.environ['PYTHONIOENCODING'] = 'UTF-8'
@@ -50,13 +48,27 @@ class InspireMusicUnified:
                  fast: bool = False,
                  fp16: bool = True,
                  gpu: int = 0,
-                 result_dir: str = None):
+                 result_dir: str = None,
+                 hub: str = "modelscope"):
         os.environ['CUDA_VISIBLE_DEVICES'] = str(gpu)
 
         # Set model_dir or default to downloading if it doesn't exist
-        self.model_dir = model_dir or f"iic/{model_name}"
-        if not os.path.exists(self.model_dir):
-            self.model_dir = snapshot_download(f"iic/{model_name}", cache_dir=self.model_dir)
+        if model_dir is None:
+             model_dir = f"../../pretrained_models/{model_name}"
+
+        if not os.path.isfile(f"{model_dir}/llm.pt"):
+            if hub == "modelscope":
+                from modelscope import snapshot_download
+                if model_name == "InspireMusic-Base":
+                    model_dir_tmp = snapshot_download(f"iic/InspireMusic", cache_dir=model_dir)
+                else:
+                    model_dir_tmp = snapshot_download(f"iic/{model_name}", cache_dir=model_dir)
+            elif hub == "huggingface":
+                from huggingface_hub import snapshot_download
+                model_dir_tmp = snapshot_download(repo_id=f"FunAudioLLM/{model_name}", cache_dir=model_dir)
+            shutil.move(model_dir_tmp, model_dir)
+            print(model_dir_tmp, model_dir)
+        self.model_dir = model_dir
 
         self.sample_rate = sample_rate
         self.output_sample_rate = 24000 if fast else output_sample_rate

inspiremusic/cli/inspiremusic.py

@@ -15,18 +15,37 @@ import os
 import time
 from tqdm import tqdm
 from hyperpyyaml import load_hyperpyyaml
-from modelscope import snapshot_download
 from inspiremusic.cli.frontend import InspireMusicFrontEnd
 from inspiremusic.cli.model import InspireMusicModel
 from inspiremusic.utils.file_utils import logging
 import torch
+import shutil
 
 class InspireMusic:
-    def __init__(self, model_dir, load_jit=True, load_onnx=False, fast = False, fp16=True):
+    def __init__(self, model_dir, load_jit=True, load_onnx=False, fast = False, fp16=True, hub="modelscope"):
         instruct = True if '-Instruct' in model_dir else False
+
+        if model_dir is None:
+             model_dir = f"../../pretrained_models/InspireMusic-1.5B-Long"
+
+        if not os.path.isfile(f"{model_dir}/llm.pt"):
+            model_name = model_dir.split("/")[-1]
+            if hub == "modelscope":
+                from modelscope import snapshot_download
+                if model_name == "InspireMusic-Base":
+                    model_dir_tmp = snapshot_download(f"iic/InspireMusic", cache_dir=model_dir)
+                else:
+                    model_dir_tmp = snapshot_download(f"iic/{model_name}", cache_dir=model_dir)
+            elif hub == "huggingface":
+                from huggingface_hub import snapshot_download
+                model_dir_tmp = snapshot_download(repo_id=f"FunAudioLLM/{model_name}", cache_dir=model_dir)
+            shutil.move(model_dir_tmp, model_dir)
+            print(model_dir_tmp, model_dir)
+
         self.model_dir = model_dir
-        if not os.path.exists(model_dir):
-            model_dir = snapshot_download(model_dir)
+
+        assert os.path.exists(f'{model_dir}/inspiremusic.yaml')
+
         with open('{}/inspiremusic.yaml'.format(model_dir), 'r') as f:
             configs = load_hyperpyyaml(f)