Fix circular import error in paddlespeech.cli.utils and paddlespeech.audio

paddlespeech/cli/asr/infer.py

@@ -26,11 +26,11 @@ import paddle
 import soundfile
 from yacs.config import CfgNode
 
+from ...utils.env import MODEL_HOME
 from ..download import get_path_from_url
 from ..executor import BaseExecutor
 from ..log import logger
 from ..utils import CLI_TIMER
-from ..utils import MODEL_HOME
 from ..utils import stats_wrapper
 from ..utils import timer_register
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer

paddlespeech/cli/st/infer.py

@@ -26,10 +26,10 @@ import soundfile
 from kaldiio import WriteHelper
 from yacs.config import CfgNode
 
+from ...utils.env import MODEL_HOME
 from ..executor import BaseExecutor
 from ..log import logger
 from ..utils import download_and_decompress
-from ..utils import MODEL_HOME
 from ..utils import stats_wrapper
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.utils.utility import UpdateConfig

paddlespeech/cls/models/panns/panns.py

@@ -16,8 +16,8 @@ import os
 import paddle.nn as nn
 import paddle.nn.functional as F
 
-from paddlespeech.audio.utils import MODEL_HOME
 from paddlespeech.audio.utils.download import load_state_dict_from_url
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['CNN14', 'CNN10', 'CNN6', 'cnn14', 'cnn10', 'cnn6']