update

app.py

@@ -2,7 +2,6 @@ import os
 import sys
 import gradio as gr
 from inspiremusic.cli.inference import InspireMusicUnified, set_env_variables
-from modelscope import snapshot_download
 import torchaudio
 import datetime
 import hashlib
@@ -17,15 +16,6 @@ def generate_filename():
 	hash_string = hash_object.hexdigest()
 	return hash_string
 
-def download_model(model_name="InspireMusic-Base"):
-	# model_dir = "pretrained_models"
-	model_dir = os.path.join(os.getcwd(), f"iic/{model_name}")
-	if not os.path.exists(model_dir):
-		model_dir = snapshot_download(f"iic/{model_name}")
-	print(model_dir)
-	return model_dir
-
-
 def get_args(
 		task, text="", audio=None, model_name="InspireMusic-Base",
 		chorus="intro", fast=False, fade_out=True,

inspiremusic/cli/inference.py

@@ -53,10 +53,11 @@ class InspireMusicUnified:
         os.environ['CUDA_VISIBLE_DEVICES'] = str(gpu)
 
         # Set model_dir or default to downloading if it doesn't exist
-        download_model_dir = "../../pretrained_models"
         if model_dir is None:
              model_dir = f"{download_model_dir}/{model_name}"
         print(model_dir)
+        download_model_dir = os.path.basedir(model_dir)
+        print(download_model_dir)
         if not os.path.isfile(f"{model_dir}/llm.pt"):
             if hub == "modelscope":
                 from modelscope import snapshot_download
@@ -67,7 +68,7 @@ class InspireMusicUnified:
             elif hub == "huggingface":
                 from huggingface_hub import snapshot_download
                 model_dir_tmp = snapshot_download(repo_id=f"FunAudioLLM/{model_name}", cache_dir=download_model_dir)
-            print(model_dir_tmp, model_dir)
+            print(download_model_dir, model_dir_tmp, model_dir)
             shutil.move(model_dir_tmp, model_dir)
             # shutil.rmtree(model_dir_tmp)
 

inspiremusic/cli/inspiremusic.py

@@ -27,18 +27,18 @@ class InspireMusic:
 
         if model_dir is None:
              model_dir = f"../../pretrained_models/InspireMusic-1.5B-Long"
-
+        download_model_dir = os.path.basedir(model_dir)
         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)
+                    model_dir_tmp = snapshot_download(f"iic/InspireMusic", cache_dir=download_model_dir)
                 else:
-                    model_dir_tmp = snapshot_download(f"iic/{model_name}", cache_dir=model_dir)
+                    model_dir_tmp = snapshot_download(f"iic/{model_name}", cache_dir=download_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)
+                model_dir_tmp = snapshot_download(repo_id=f"FunAudioLLM/{model_name}", cache_dir=download_model_dir)
             print(model_dir_tmp, model_dir)
             shutil.move(model_dir_tmp, model_dir)
             # shutil.rmtree(model_dir_tmp)