From b452be3d8deeb1cdf4ce0378e6f28a4276d8ef0c Mon Sep 17 00:00:00 2001
From: KP <109694228@qq.com>
Date: Fri, 17 Jun 2022 15:31:54 +0800
Subject: [PATCH] Fix circular import error in paddlespeech.cli.utils and
 paddlespeech.audio

---
 paddlespeech/cli/asr/infer.py          | 2 +-
 paddlespeech/cli/st/infer.py           | 2 +-
 paddlespeech/cls/models/panns/panns.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paddlespeech/cli/asr/infer.py b/paddlespeech/cli/asr/infer.py
index a943ccfa..24839a89 100644
--- a/paddlespeech/cli/asr/infer.py
+++ b/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
diff --git a/paddlespeech/cli/st/infer.py b/paddlespeech/cli/st/infer.py
index e1ce181a..4e099c40 100644
--- a/paddlespeech/cli/st/infer.py
+++ b/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
diff --git a/paddlespeech/cls/models/panns/panns.py b/paddlespeech/cls/models/panns/panns.py
index 4befe7aa..37deae80 100644
--- a/paddlespeech/cls/models/panns/panns.py
+++ b/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']
 
-- 
GitLab