Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[audio] fix compliance test bug, and format #1597

Merged
merged 2 commits into from
Mar 24, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@ tools/activate_python.sh
tools/miniconda.sh
tools/CRF++-0.58/

speechx/fc_patch/
speechx/fc_patch/

third_party/ctc_decoders/paddlespeech_ctcdecoders.py
13 changes: 6 additions & 7 deletions demos/audio_searching/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
soundfile==0.10.3.post1
diskcache==5.2.1
fastapi
librosa==0.8.0
numpy
pydanticpymilvus==2.0.1
zh794390558 marked this conversation as resolved.
Show resolved Hide resolved
pymysql
fastapi
uvicorn
diskcache==5.2.1
pymilvus==2.0.1
python-multipart
typing
soundfile==0.10.3.post1
starlette
zh794390558 marked this conversation as resolved.
Show resolved Hide resolved
pydantic
typing
uvicorn
1 change: 0 additions & 1 deletion demos/audio_searching/src/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os

############### Milvus Configuration ###############
Expand Down
3 changes: 1 addition & 2 deletions demos/audio_searching/src/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import codecs
import datetime
import logging
import os
Expand Down Expand Up @@ -124,7 +123,7 @@ def emit(self, record):
logging.FileHandler.emit(self, record)
except (KeyboardInterrupt, SystemExit):
raise
except:
except Exception as e:
self.handleError(record)


Expand Down
5 changes: 2 additions & 3 deletions demos/audio_searching/src/operations/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ def get_audios(path):
"""
supported_formats = [".wav", ".mp3", ".ogg", ".flac", ".m4a"]
return [
item
for sublist in [[os.path.join(dir, file) for file in files]
for dir, _, files in list(os.walk(path))]
item for sublist in [[os.path.join(dir, file) for file in files]
for dir, _, files in list(os.walk(path))]
for item in sublist if os.path.splitext(item)[1] in supported_formats
]

Expand Down
1 change: 0 additions & 1 deletion examples/ami/sd0/local/ami_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

Prepares metadata files (JSON) from manual annotations "segments/" using RTTM format (Oracle VAD).
"""

import argparse
import glob
import json
Expand Down
2 changes: 2 additions & 0 deletions paddleaudio/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.eggs
*.wav
2 changes: 1 addition & 1 deletion paddleaudio/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Exclude `paddleaudio.utils`

## 3. Build

`sphinx-build source _html`
`sphinx-build source _html`
27 changes: 6 additions & 21 deletions paddleaudio/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@
# This file does only contain a selection of the most common options. For a
# full list see the documentation:
# http://www.sphinx-doc.org/en/master/config

# -- Path setup --------------------------------------------------------------

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.

import os
import sys
sys.path.insert(0, os.path.abspath('../..'))


# -- Project information -----------------------------------------------------

project = 'PaddleAudio'
Expand All @@ -28,7 +24,6 @@
# The full version, including alpha/beta/rc tags
release = '0.2.0'


# -- General configuration ---------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand Down Expand Up @@ -75,7 +70,6 @@
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = None


# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
Expand Down Expand Up @@ -112,13 +106,11 @@
#
# html_sidebars = {}


# -- Options for HTMLHelp output ---------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'PaddleAudiodoc'


# -- Options for LaTeX output ------------------------------------------------

latex_elements = {
Expand All @@ -143,33 +135,27 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'PaddleAudio.tex', 'PaddleAudio Documentation',
'PaddlePaddle', 'manual'),
(master_doc, 'PaddleAudio.tex', 'PaddleAudio Documentation', 'PaddlePaddle',
'manual'),
]


# -- Options for manual page output ------------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'paddleaudio', 'PaddleAudio Documentation',
[author], 1)
]

man_pages = [(master_doc, 'paddleaudio', 'PaddleAudio Documentation', [author],
1)]

# -- Options for Texinfo output ----------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'PaddleAudio', 'PaddleAudio Documentation',
author, 'PaddleAudio', 'One line description of project.',
'Miscellaneous'),
(master_doc, 'PaddleAudio', 'PaddleAudio Documentation', author,
'PaddleAudio', 'One line description of project.', 'Miscellaneous'),
]


# -- Options for Epub output -------------------------------------------------

# Bibliographic Dublin Core info.
Expand All @@ -187,7 +173,6 @@
# A list of files that should not be packed into the epub file.
epub_exclude_files = ['search.html']


# -- Extension configuration -------------------------------------------------

# -- Options for intersphinx extension ---------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions paddleaudio/paddleaudio/compliance/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from . import kaldi
from . import librosa
4 changes: 3 additions & 1 deletion paddleaudio/paddleaudio/metric/mcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
]


def mcd_distance(xs: np.ndarray, ys: np.ndarray, cost_fn: Callable=mt.logSpecDbDist) -> float:
def mcd_distance(xs: np.ndarray,
ys: np.ndarray,
cost_fn: Callable=mt.logSpecDbDist) -> float:
"""Mel cepstral distortion (MCD), dtw distance.

Dynamic Time Warping.
Expand Down
4 changes: 2 additions & 2 deletions paddlespeech/t2s/frontend/zh_normalization/chronology.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def replace_time(match) -> str:
result = f"{num2str(hour)}点"
if minute.lstrip('0'):
if int(minute) == 30:
result += f"半"
result += "半"
else:
result += f"{_time_num2str(minute)}分"
if second and second.lstrip('0'):
Expand All @@ -75,7 +75,7 @@ def replace_time(match) -> str:
result += f"{num2str(hour_2)}点"
if minute_2.lstrip('0'):
if int(minute) == 30:
result += f"半"
result += "半"
else:
result += f"{_time_num2str(minute_2)}分"
if second_2 and second_2.lstrip('0'):
Expand Down
12 changes: 5 additions & 7 deletions paddlespeech/vector/cluster/diarization.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,20 @@
This script has an optional dependency on open source sklearn library.
A few sklearn functions are modified in this script as per requirement.
"""

import argparse
import warnings
import scipy
import numpy as np
from distutils.util import strtobool

import numpy as np
import scipy
import sklearn
from scipy import sparse
from scipy.sparse.linalg import eigsh
from scipy.sparse.csgraph import connected_components
from scipy.sparse.csgraph import laplacian as csgraph_laplacian

import sklearn
from sklearn.neighbors import kneighbors_graph
from scipy.sparse.linalg import eigsh
from sklearn.cluster import SpectralClustering
from sklearn.cluster._kmeans import k_means
from sklearn.neighbors import kneighbors_graph


def _graph_connected_component(graph, node_id):
Expand Down