From 662eb3fbb83023d243e040e98093c7695253a47d Mon Sep 17 00:00:00 2001 From: KP <109694228@qq.com> Date: Fri, 27 May 2022 20:19:40 +0800 Subject: [PATCH 1/4] Update __init__.py --- audio/paddleaudio/metric/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/audio/paddleaudio/metric/__init__.py b/audio/paddleaudio/metric/__init__.py index d2b3a136..7ce6f5cf 100644 --- a/audio/paddleaudio/metric/__init__.py +++ b/audio/paddleaudio/metric/__init__.py @@ -11,6 +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 .dtw import dtw_distance from .eer import compute_eer from .eer import compute_minDCF From 9f52fc8d83d65bdff9ef562275193759469dbb3c Mon Sep 17 00:00:00 2001 From: KP <109694228@qq.com> Date: Fri, 27 May 2022 20:20:01 +0800 Subject: [PATCH 2/4] Delete dtw.py --- audio/paddleaudio/metric/dtw.py | 44 --------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 audio/paddleaudio/metric/dtw.py diff --git a/audio/paddleaudio/metric/dtw.py b/audio/paddleaudio/metric/dtw.py deleted file mode 100644 index 662e4506..00000000 --- a/audio/paddleaudio/metric/dtw.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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 numpy as np -from dtaidistance import dtw_ndim - -__all__ = [ - 'dtw_distance', -] - - -def dtw_distance(xs: np.ndarray, ys: np.ndarray) -> float: - """Dynamic Time Warping. - This function keeps a compact matrix, not the full warping paths matrix. - Uses dynamic programming to compute: - - Examples: - .. code-block:: python - - wps[i, j] = (s1[i]-s2[j])**2 + min( - wps[i-1, j ] + penalty, // vertical / insertion / expansion - wps[i , j-1] + penalty, // horizontal / deletion / compression - wps[i-1, j-1]) // diagonal / match - - dtw = sqrt(wps[-1, -1]) - - Args: - xs (np.ndarray): ref sequence, [T,D] - ys (np.ndarray): hyp sequence, [T,D] - - Returns: - float: dtw distance - """ - return dtw_ndim.distance(xs, ys) From d50aca081cf0bf29f88a86ba3fd3475160e480a7 Mon Sep 17 00:00:00 2001 From: KP <109694228@qq.com> Date: Fri, 27 May 2022 20:21:33 +0800 Subject: [PATCH 3/4] fix setup.py --- audio/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/setup.py b/audio/setup.py index b459be83..980854f1 100644 --- a/audio/setup.py +++ b/audio/setup.py @@ -83,7 +83,7 @@ setuptools.setup( python_requires='>=3.6', install_requires=[ 'numpy >= 1.15.0', 'scipy >= 1.0.0', 'resampy >= 0.2.2', - 'soundfile >= 0.9.0', 'colorlog', 'dtaidistance == 2.3.1', 'pathos' + 'soundfile >= 0.9.0', 'colorlog', 'pathos == 0.2.8' ], extras_require={ 'test': [ From 1449f1b48df8908d994e7113eac756439a4a3852 Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Fri, 27 May 2022 13:17:36 +0000 Subject: [PATCH 4/4] update version --- audio/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/setup.py b/audio/setup.py index 980854f1..f6f07323 100644 --- a/audio/setup.py +++ b/audio/setup.py @@ -19,7 +19,7 @@ from setuptools.command.install import install from setuptools.command.test import test # set the version here -VERSION = '1.0.0' +VERSION = '1.0.1' # Inspired by the example at https://pytest.org/latest/goodpractises.html