diff --git a/deepspeech/exps/deepspeech2/bin/deploy/runtime.py b/deepspeech/exps/deepspeech2/bin/deploy/runtime.py index 26365820..dad8459e 100644 --- a/deepspeech/exps/deepspeech2/bin/deploy/runtime.py +++ b/deepspeech/exps/deepspeech2/bin/deploy/runtime.py @@ -18,8 +18,10 @@ import numpy as np import paddle from paddle.inference import Config from paddle.inference import create_predictor +from paddle.io import DataLoader from deepspeech.exps.deepspeech2.config import get_cfg_defaults +from deepspeech.io.collator import SpeechCollator from deepspeech.io.dataset import ManifestDataset from deepspeech.models.deepspeech2 import DeepSpeech2Model from deepspeech.training.cli import default_argument_parser @@ -29,9 +31,6 @@ from deepspeech.utils.socket_server import warm_up_test from deepspeech.utils.utility import add_arguments from deepspeech.utils.utility import print_arguments -from paddle.io import DataLoader -from deepspeech.io.collator import SpeechCollator - def init_predictor(args): if args.model_dir is not None: @@ -83,11 +82,11 @@ def start_server(config, args): config.defrost() config.data.manifest = config.data.test_manifest dataset = ManifestDataset.from_config(config) - + config.collator.augmentation_config = "" config.collator.keep_transcription_text = True - config.collator.batch_size=1 - config.collator.num_workers=0 + config.collator.batch_size = 1 + config.collator.num_workers = 0 collate_fn = SpeechCollator.from_config(config) test_loader = DataLoader(dataset, collate_fn=collate_fn, num_workers=0) diff --git a/deepspeech/exps/deepspeech2/bin/deploy/server.py b/deepspeech/exps/deepspeech2/bin/deploy/server.py index 73a3fc17..b473a8fd 100644 --- a/deepspeech/exps/deepspeech2/bin/deploy/server.py +++ b/deepspeech/exps/deepspeech2/bin/deploy/server.py @@ -16,8 +16,10 @@ import functools import numpy as np import paddle +from paddle.io import DataLoader from deepspeech.exps.deepspeech2.config import get_cfg_defaults +from deepspeech.io.collator import SpeechCollator from deepspeech.io.dataset import ManifestDataset from deepspeech.models.deepspeech2 import DeepSpeech2Model from deepspeech.training.cli import default_argument_parser @@ -28,9 +30,6 @@ from deepspeech.utils.utility import add_arguments from deepspeech.utils.utility import print_arguments -from paddle.io import DataLoader -from deepspeech.io.collator import SpeechCollator - def start_server(config, args): """Start the ASR server""" config.defrost() @@ -39,8 +38,8 @@ def start_server(config, args): config.collator.augmentation_config = "" config.collator.keep_transcription_text = True - config.collator.batch_size=1 - config.collator.num_workers=0 + config.collator.batch_size = 1 + config.collator.num_workers = 0 collate_fn = SpeechCollator.from_config(config) test_loader = DataLoader(dataset, collate_fn=collate_fn, num_workers=0) diff --git a/deepspeech/io/collator.py b/deepspeech/io/collator.py index 94264d6f..305ca940 100644 --- a/deepspeech/io/collator.py +++ b/deepspeech/io/collator.py @@ -242,7 +242,7 @@ class SpeechCollator(): # specgram augment specgram = self._augmentation_pipeline.transform_feature(specgram) - specgram=specgram.transpose([1,0]) + specgram = specgram.transpose([1, 0]) return specgram, transcript_part def __call__(self, batch): diff --git a/deepspeech/utils/socket_server.py b/deepspeech/utils/socket_server.py index 8fd7c2fa..45c659f6 100644 --- a/deepspeech/utils/socket_server.py +++ b/deepspeech/utils/socket_server.py @@ -48,7 +48,7 @@ def warm_up_test(audio_process_handler, rng = random.Random(random_seed) samples = rng.sample(manifest, num_test_cases) for idx, sample in enumerate(samples): - print("Warm-up Test Case %d: %s"%(idx, sample['feat'])) + print("Warm-up Test Case %d: %s" % (idx, sample['feat'])) start_time = time.time() transcript = audio_process_handler(sample['feat']) finish_time = time.time()