diff --git a/deepspeech/exps/deepspeech2/bin/export.py b/deepspeech/exps/deepspeech2/bin/export.py index ab5251d55e69311703454d835d1c53c3570093c7..5f89e9042a7cd26aac32871159f25753e4f5248d 100644 --- a/deepspeech/exps/deepspeech2/bin/export.py +++ b/deepspeech/exps/deepspeech2/bin/export.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_export() + with exp.eval(): + exp.setup() + exp.run_export() def main(config, args): diff --git a/deepspeech/exps/deepspeech2/bin/test.py b/deepspeech/exps/deepspeech2/bin/test.py index 7fbdab4514a9072ef5cda1dd7da3d5b930ffe1ce..6181ff902943c8d10378aac12082a48e8f9f61f1 100644 --- a/deepspeech/exps/deepspeech2/bin/test.py +++ b/deepspeech/exps/deepspeech2/bin/test.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_test() + with exp.eval(): + exp.setup() + exp.run_test() def main(config, args): diff --git a/deepspeech/exps/deepspeech2/bin/test_export.py b/deepspeech/exps/deepspeech2/bin/test_export.py index be1a8479aa717405dbf8859a23067fe18098f9d4..77bb0025afd12e287a6f5f63d22d0a7a4c5f08dd 100644 --- a/deepspeech/exps/deepspeech2/bin/test_export.py +++ b/deepspeech/exps/deepspeech2/bin/test_export.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = ExportTester(config, args) - exp.setup() - exp.run_test() + with exp.eval(): + exp.setup() + exp.run_test() def main(config, args): diff --git a/deepspeech/exps/deepspeech2/bin/test_hub.py b/deepspeech/exps/deepspeech2/bin/test_hub.py index 1cf24bb0301ee4ed53a9f222f72de39133095275..7d98e0b15b96fd368fe7a50a8e66b791ddb21156 100644 --- a/deepspeech/exps/deepspeech2/bin/test_hub.py +++ b/deepspeech/exps/deepspeech2/bin/test_hub.py @@ -167,8 +167,9 @@ def check(audio_file): def main_sp(config, args): exp = DeepSpeech2Tester_hub(config, args) - exp.setup() - exp.run_test() + with exp.eval(): + exp.setup() + exp.run_test() def main(config, args): diff --git a/deepspeech/exps/u2/bin/alignment.py b/deepspeech/exps/u2/bin/alignment.py index cef9d1ab9067900086c0b2811d99450128350c9b..91aac1a8c57bfca2d3d9d4d8066c7e4574f3b4d9 100644 --- a/deepspeech/exps/u2/bin/alignment.py +++ b/deepspeech/exps/u2/bin/alignment.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_align() + with exp.eval(): + exp.setup() + exp.run_align() def main(config, args): diff --git a/deepspeech/exps/u2/bin/export.py b/deepspeech/exps/u2/bin/export.py index 3dc41b706cf9f684c978488cfe76b48b2adc5510..89acbf70d84afa69f0c9d9961f9c352c2ce38ebf 100644 --- a/deepspeech/exps/u2/bin/export.py +++ b/deepspeech/exps/u2/bin/export.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_export() + with exp.eval(): + exp.setup() + exp.run_export() def main(config, args): diff --git a/deepspeech/exps/u2/bin/test.py b/deepspeech/exps/u2/bin/test.py index f6127675e32d26bd4c9716a97606aaae1120beee..3068f1c7aed9c107fe1c3b0800ddacf95a0064a6 100644 --- a/deepspeech/exps/u2/bin/test.py +++ b/deepspeech/exps/u2/bin/test.py @@ -24,8 +24,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_test() + with exp.eval(): + exp.setup() + exp.run_test() def main(config, args): diff --git a/deepspeech/exps/u2_kaldi/bin/test.py b/deepspeech/exps/u2_kaldi/bin/test.py index 93a29ab15f06d2d8ae18d03abbd42fb6b3322945..eb7b0280ba7090e61831f4dce739cf94febd1b2b 100644 --- a/deepspeech/exps/u2_kaldi/bin/test.py +++ b/deepspeech/exps/u2_kaldi/bin/test.py @@ -29,14 +29,14 @@ model_test_alias = { def main_sp(config, args): class_obj = dynamic_import(args.model_name, model_test_alias) exp = class_obj(config, args) - exp.setup() - - if args.run_mode == 'test': - exp.run_test() - elif args.run_mode == 'export': - exp.run_export() - elif args.run_mode == 'align': - exp.run_align() + with exp.eval(): + exp.setup() + if args.run_mode == 'test': + exp.run_test() + elif args.run_mode == 'export': + exp.run_export() + elif args.run_mode == 'align': + exp.run_align() def main(config, args): diff --git a/deepspeech/exps/u2_st/bin/export.py b/deepspeech/exps/u2_st/bin/export.py index c7eb5d03b1b36e4de4c865dd7e662d9ae0d54c83..2486f4c22aba29dac09156b28a537ca50db1baeb 100644 --- a/deepspeech/exps/u2_st/bin/export.py +++ b/deepspeech/exps/u2_st/bin/export.py @@ -20,8 +20,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_export() + with exp.eval(): + exp.setup() + exp.run_export() def main(config, args): diff --git a/deepspeech/exps/u2_st/bin/test.py b/deepspeech/exps/u2_st/bin/test.py index 81197decfa413db828dc4df1c851cdf5a0be9acf..3d51b60e0d31646804e614c18d930a91d823edbc 100644 --- a/deepspeech/exps/u2_st/bin/test.py +++ b/deepspeech/exps/u2_st/bin/test.py @@ -24,8 +24,9 @@ from deepspeech.utils.utility import print_arguments def main_sp(config, args): exp = Tester(config, args) - exp.setup() - exp.run_test() + with exp.eval(): + exp.setup() + exp.run_test() def main(config, args):