From ccdfd5b342696744a5b74c0c69a3a2ab257757a7 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Wed, 4 Aug 2021 06:58:28 +0000 Subject: [PATCH] format --- deepspeech/decoders/swig/setup.py | 5 ++--- deepspeech/models/ds2/__init__.py | 18 ++++++++++++++---- deepspeech/models/ds2/deepspeech2.py | 10 +++++----- examples/callcenter/s1/README.md | 2 +- examples/librispeech/s1/README.md | 6 +++--- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/deepspeech/decoders/swig/setup.py b/deepspeech/decoders/swig/setup.py index 3da5ce8b..86af475a 100644 --- a/deepspeech/decoders/swig/setup.py +++ b/deepspeech/decoders/swig/setup.py @@ -84,9 +84,8 @@ FILES = glob.glob('kenlm/util/*.cc') \ FILES += glob.glob('openfst-1.6.3/src/lib/*.cc') FILES = [ - fn for fn in FILES - if not (fn.endswith('main.cc') or fn.endswith('test.cc') or fn.endswith( - 'unittest.cc')) + fn for fn in FILES if not (fn.endswith('main.cc') or fn.endswith('test.cc') + or fn.endswith('unittest.cc')) ] LIBS = ['stdc++'] diff --git a/deepspeech/models/ds2/__init__.py b/deepspeech/models/ds2/__init__.py index 299f901c..39bea5bf 100644 --- a/deepspeech/models/ds2/__init__.py +++ b/deepspeech/models/ds2/__init__.py @@ -1,7 +1,17 @@ -from .deepspeech2 import DeepSpeech2Model +# Copyright (c) 2021 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. from .deepspeech2 import DeepSpeech2InferModel +from .deepspeech2 import DeepSpeech2Model __all__ = ['DeepSpeech2Model', 'DeepSpeech2InferModel'] - - - diff --git a/deepspeech/models/ds2/deepspeech2.py b/deepspeech/models/ds2/deepspeech2.py index 0bd5fb95..8d737e80 100644 --- a/deepspeech/models/ds2/deepspeech2.py +++ b/deepspeech/models/ds2/deepspeech2.py @@ -19,15 +19,15 @@ from paddle import nn from yacs.config import CfgNode from deepspeech.models.ds2.conv import ConvStack -from deepspeech.modules.ctc import CTCDecoder from deepspeech.models.ds2.rnn import RNNStack +from deepspeech.modules.ctc import CTCDecoder from deepspeech.utils import layer_tools from deepspeech.utils.checkpoint import Checkpoint from deepspeech.utils.log import Log logger = Log(__name__).getlog() -__all__ = ['DeepSpeech2Model', 'DeepSpeech2InferMode'] +__all__ = ['DeepSpeech2Model', 'DeepSpeech2InferModel'] class CRNNEncoder(nn.Layer): @@ -117,7 +117,7 @@ class DeepSpeech2Model(nn.Layer): :type share_weights: bool :return: A tuple of an output unnormalized log probability layer ( before softmax) and a ctc cost layer. - :rtype: tuple of LayerOutput + :rtype: tuple of LayerOutput """ @classmethod @@ -206,10 +206,10 @@ class DeepSpeech2Model(nn.Layer): config: yacs.config.CfgNode model configs - + checkpoint_path: Path or str the path of pretrained model checkpoint, without extension name - + Returns ------- DeepSpeech2Model diff --git a/examples/callcenter/s1/README.md b/examples/callcenter/s1/README.md index a83a516b..b9fa1472 100644 --- a/examples/callcenter/s1/README.md +++ b/examples/callcenter/s1/README.md @@ -17,4 +17,4 @@ | conformer | 45.73 M | conf/chunk_conformer.yaml | spec_aug + shift | test | attention | 16, -1 | 2.23287845 | 0.087982 | | conformer | 45.73 M | conf/chunk_conformer.yaml | spec_aug + shift | test | ctc_greedy_search | 16, -1 | 2.23287845 | 0.086962 | | conformer | 45.73 M | conf/chunk_conformer.yaml | spec_aug + shift | test | ctc_prefix_beam_search | 16, -1 | 2.23287845 | 0.086741 | -| conformer | 45.73 M | conf/chunk_conformer.yaml | spec_aug + shift | test | attention_rescoring | 16, -1 | 2.23287845 | 0.083495 | +| conformer | 45.73 M | conf/chunk_conformer.yaml | spec_aug + shift | test | attention_rescoring | 16, -1 | 2.23287845 | 0.083495 | diff --git a/examples/librispeech/s1/README.md b/examples/librispeech/s1/README.md index 7f89b808..79b5b80e 100644 --- a/examples/librispeech/s1/README.md +++ b/examples/librispeech/s1/README.md @@ -2,10 +2,10 @@ ## Data -| Data Subset | Duration in Seconds | -| data/manifest.train | 0.83s ~ 29.735s | +| Data Subset | Duration in Seconds | +| data/manifest.train | 0.83s ~ 29.735s | | data/manifest.dev | 1.065 ~ 35.155s | -| data/manifest.test-clean | 1.285s ~ 34.955s | +| data/manifest.test-clean | 1.285s ~ 34.955s | ## Conformer