PaddlePaddle · Jackwaterveg · Jun 15, 2022 · Jun 2, 2022 · Jun 14, 2022 · Jun 15, 2022
diff --git a/.mergify.yml b/.mergify.yml
@@ -52,7 +52,7 @@ pull_request_rules:
         add: ["T2S"]
   - name: "auto add label=Audio"
     conditions:
-      - files~=^paddleaudio/
+      - files~=^paddlespeech/audio/
     actions:
       label:
         add: ["Audio"]
@@ -100,7 +100,7 @@ pull_request_rules:
         add: ["README"]
   - name: "auto add label=Documentation"
     conditions:
-      - files~=^(docs/|CHANGELOG.md|paddleaudio/CHANGELOG.md)
+      - files~=^(docs/|CHANGELOG.md)
     actions:
       label:
         add: ["Documentation"]

diff --git a/audio/.gitignore b/audio/.gitignore
diff --git a/audio/CHANGELOG.md b/audio/CHANGELOG.md
diff --git a/audio/README.md b/audio/README.md
diff --git a/audio/docs/Makefile b/audio/docs/Makefile
diff --git a/audio/docs/README.md b/audio/docs/README.md
diff --git a/audio/docs/images/paddle.png b/audio/docs/images/paddle.png
diff --git a/audio/docs/make.bat b/audio/docs/make.bat
diff --git a/audio/paddleaudio/utils/env.py b/audio/paddleaudio/utils/env.py
diff --git a/audio/setup.py b/audio/setup.py
diff --git a/audio/tests/.gitkeep b/audio/tests/.gitkeep
diff --git a/demos/audio_searching/README.md b/demos/audio_searching/README.md
@@ -89,7 +89,7 @@ Then to start the system server, and it provides HTTP backend services.
   Then start the server with Fastapi.
 
   ```bash
-  export PYTHONPATH=$PYTHONPATH:./src:../../paddleaudio
+  export PYTHONPATH=$PYTHONPATH:./src
   python src/audio_search.py
   ```
 

diff --git a/demos/audio_searching/README_cn.md b/demos/audio_searching/README_cn.md
@@ -91,7 +91,7 @@ ffce340b3790  minio/minio:RELEASE.2020-12-03T00-03-10Z  "/usr/bin/docker-ent…"
   启动用 Fastapi 构建的服务
 
   ```bash
-  export PYTHONPATH=$PYTHONPATH:./src:../../paddleaudio
+  export PYTHONPATH=$PYTHONPATH:./src
   python src/audio_search.py
   ```
 

diff --git a/audio/docs/source/_static/custom.css → docs/source/audio/_static/custom.css b/audio/docs/source/_static/custom.css → docs/source/audio/_static/custom.css
diff --git a/audio/docs/source/_templates/module.rst_t → docs/source/audio/_templates/module.rst_t b/audio/docs/source/_templates/module.rst_t → docs/source/audio/_templates/module.rst_t
diff --git a/audio/docs/source/_templates/package.rst_t → docs/source/audio/_templates/package.rst_t b/audio/docs/source/_templates/package.rst_t → docs/source/audio/_templates/package.rst_t
diff --git a/audio/docs/source/_templates/toc.rst_t → docs/source/audio/_templates/toc.rst_t b/audio/docs/source/_templates/toc.rst_t → docs/source/audio/_templates/toc.rst_t
diff --git a/audio/docs/source/conf.py → docs/source/audio/conf.py b/audio/docs/source/conf.py → docs/source/audio/conf.py
diff --git a/audio/docs/source/index.rst → docs/source/audio/index.rst b/audio/docs/source/index.rst → docs/source/audio/index.rst
diff --git a/docs/source/cls/custom_dataset.md b/docs/source/cls/custom_dataset.md
@@ -1,8 +1,8 @@
 # Customize Dataset for Audio Classification
 
-Following this tutorial you can customize your dataset for audio classification task by using `paddlespeech` and `paddleaudio`.
+Following this tutorial you can customize your dataset for audio classification task by using `paddlespeech`.
 
-A base class of classification dataset is `paddleaudio.dataset.AudioClassificationDataset`. To customize your dataset you should write a dataset class derived from `AudioClassificationDataset`. 
+A base class of classification dataset is `paddlespeech.audio.dataset.AudioClassificationDataset`. To customize your dataset you should write a dataset class derived from `AudioClassificationDataset`. 
 
 Assuming you have some wave files that stored in your own directory. You should prepare a meta file with the information of filepaths and labels. For example the absolute path of it is `/PATH/TO/META_FILE.txt`:
 ```
@@ -14,7 +14,7 @@ Assuming you have some wave files that stored in your own directory. You should
 Here is an example to build your custom dataset in `custom_dataset.py`:
 
 ```python
-from paddleaudio.datasets.dataset import AudioClassificationDataset
+from paddlespeech.audio.datasets.dataset import AudioClassificationDataset
 
 class CustomDataset(AudioClassificationDataset):
     meta_file = '/PATH/TO/META_FILE.txt'
@@ -48,7 +48,7 @@ class CustomDataset(AudioClassificationDataset):
 Then you can build dataset and data loader from `CustomDataset`:
 ```python
 import paddle
-from paddleaudio.features import LogMelSpectrogram
+from paddlespeech.audio.features import LogMelSpectrogram
 
 from custom_dataset import CustomDataset
 

diff --git a/examples/esc50/cls0/conf/panns.yaml b/examples/esc50/cls0/conf/panns.yaml
@@ -1,5 +1,5 @@
 data:
-  dataset: 'paddleaudio.datasets:ESC50'
+  dataset: 'paddlespeech.audio.datasets:ESC50'
   num_classes: 50
   train:
     mode: 'train'

diff --git a/examples/hey_snips/kws0/conf/mdtc.yaml b/examples/hey_snips/kws0/conf/mdtc.yaml
@@ -2,7 +2,7 @@
 ###########################################
 #                   Data                  #
 ###########################################
-dataset: 'paddleaudio.datasets:HeySnips'
+dataset: 'paddlespeech.audio.datasets:HeySnips'
 data_dir: '/PATH/TO/DATA/hey_snips_research_6k_en_train_eval_clean_ter'
 
 ############################################

diff --git a/examples/voxceleb/sv0/local/data_prepare.py b/examples/voxceleb/sv0/local/data_prepare.py
@@ -14,9 +14,9 @@
 import argparse
 
 import paddle
-from paddleaudio.datasets.voxceleb import VoxCeleb
 from yacs.config import CfgNode
 
+from paddlespeech.audio.datasets.voxceleb import VoxCeleb
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.io.augment import build_augment_pipeline
 from paddlespeech.vector.training.seeding import seed_everything

diff --git a/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py b/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py
@@ -21,9 +21,9 @@
 from typing import List
 
 import tqdm
-from paddleaudio import load as load_audio
 from yacs.config import CfgNode
 
+from paddlespeech.audio import load as load_audio
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.utils.vector_utils import get_chunks
 

diff --git a/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py b/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py
@@ -22,9 +22,9 @@
 import random
 
 import tqdm
-from paddleaudio import load as load_audio
 from yacs.config import CfgNode
 
+from paddlespeech.audio import load as load_audio
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.utils.vector_utils import get_chunks
 

diff --git a/audio/paddleaudio/__init__.py → paddlespeech/audio/__init__.py b/audio/paddleaudio/__init__.py → paddlespeech/audio/__init__.py
diff --git a/audio/paddleaudio/backends/__init__.py → paddlespeech/audio/backends/__init__.py b/audio/paddleaudio/backends/__init__.py → paddlespeech/audio/backends/__init__.py
diff --git a/...paddleaudio/backends/soundfile_backend.py → ...peech/audio/backends/soundfile_backend.py b/...paddleaudio/backends/soundfile_backend.py → ...peech/audio/backends/soundfile_backend.py
diff --git a/audio/paddleaudio/backends/sox_backend.py → paddlespeech/audio/backends/sox_backend.py b/audio/paddleaudio/backends/sox_backend.py → paddlespeech/audio/backends/sox_backend.py
diff --git a/audio/paddleaudio/compliance/__init__.py → paddlespeech/audio/compliance/__init__.py b/audio/paddleaudio/compliance/__init__.py → paddlespeech/audio/compliance/__init__.py
diff --git a/audio/paddleaudio/compliance/kaldi.py → paddlespeech/audio/compliance/kaldi.py b/audio/paddleaudio/compliance/kaldi.py → paddlespeech/audio/compliance/kaldi.py
diff --git a/audio/paddleaudio/compliance/librosa.py → paddlespeech/audio/compliance/librosa.py b/audio/paddleaudio/compliance/librosa.py → paddlespeech/audio/compliance/librosa.py
diff --git a/audio/paddleaudio/datasets/__init__.py → paddlespeech/audio/datasets/__init__.py b/audio/paddleaudio/datasets/__init__.py → paddlespeech/audio/datasets/__init__.py
diff --git a/audio/paddleaudio/datasets/dataset.py → paddlespeech/audio/datasets/dataset.py b/audio/paddleaudio/datasets/dataset.py → paddlespeech/audio/datasets/dataset.py
diff --git a/audio/paddleaudio/datasets/esc50.py → paddlespeech/audio/datasets/esc50.py b/audio/paddleaudio/datasets/esc50.py → paddlespeech/audio/datasets/esc50.py
@@ -16,8 +16,8 @@
 from typing import List
 from typing import Tuple
 
+from ..utils import DATA_HOME
 from ..utils.download import download_and_decompress
-from ..utils.env import DATA_HOME
 from .dataset import AudioClassificationDataset
 
 __all__ = ['ESC50']

diff --git a/audio/paddleaudio/datasets/gtzan.py → paddlespeech/audio/datasets/gtzan.py b/audio/paddleaudio/datasets/gtzan.py → paddlespeech/audio/datasets/gtzan.py
@@ -17,8 +17,8 @@
 from typing import List
 from typing import Tuple
 
+from ..utils import DATA_HOME
 from ..utils.download import download_and_decompress
-from ..utils.env import DATA_HOME
 from .dataset import AudioClassificationDataset
 
 __all__ = ['GTZAN']

diff --git a/audio/paddleaudio/datasets/hey_snips.py → paddlespeech/audio/datasets/hey_snips.py b/audio/paddleaudio/datasets/hey_snips.py → paddlespeech/audio/datasets/hey_snips.py
diff --git a/audio/paddleaudio/datasets/rirs_noises.py → paddlespeech/audio/datasets/rirs_noises.py b/audio/paddleaudio/datasets/rirs_noises.py → paddlespeech/audio/datasets/rirs_noises.py