From 525fa3ea89d678e5c6e7c6d42616304454ca35ef Mon Sep 17 00:00:00 2001 From: "bin.xue" Date: Tue, 25 Oct 2022 12:10:07 +0800 Subject: [PATCH] [to #42322933]test: use 'master' branch in training test Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10509580 --- .../pipelines/test_key_word_spotting_farfield.py | 5 ++--- tests/pipelines/test_speech_signal_process.py | 15 ++++++--------- tests/trainers/audio/test_ans_trainer.py | 4 +--- tests/trainers/audio/test_kws_farfield_trainer.py | 2 -- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/tests/pipelines/test_key_word_spotting_farfield.py b/tests/pipelines/test_key_word_spotting_farfield.py index bf61c9e7..69d6a953 100644 --- a/tests/pipelines/test_key_word_spotting_farfield.py +++ b/tests/pipelines/test_key_word_spotting_farfield.py @@ -9,9 +9,8 @@ from modelscope.utils.test_utils import test_level TEST_SPEECH_FILE = 'data/test/audios/3ch_nihaomiya.wav' TEST_SPEECH_FILE_MONO = 'data/test/audios/1ch_nihaomiya.wav' -TEST_SPEECH_URL = 'https://modelscope.cn/api/v1/models/damo/' \ - 'speech_dfsmn_kws_char_farfield_16k_nihaomiya/repo' \ - '?Revision=master&FilePath=examples/3ch_nihaomiya.wav' +TEST_SPEECH_URL = 'https://modelscope.oss-cn-beijing.aliyuncs.com/' \ + 'test/audios/3ch_nihaomiya.wav' class KWSFarfieldTest(unittest.TestCase): diff --git a/tests/pipelines/test_speech_signal_process.py b/tests/pipelines/test_speech_signal_process.py index e5f97c02..2916d31a 100644 --- a/tests/pipelines/test_speech_signal_process.py +++ b/tests/pipelines/test_speech_signal_process.py @@ -11,17 +11,14 @@ from modelscope.utils.test_utils import test_level NEAREND_MIC_FILE = 'data/test/audios/nearend_mic.wav' FAREND_SPEECH_FILE = 'data/test/audios/farend_speech.wav' -NEAREND_MIC_URL = 'https://modelscope.cn/api/v1/models/damo/' \ - 'speech_dfsmn_aec_psm_16k/repo?Revision=master' \ - '&FilePath=examples/nearend_mic.wav' -FAREND_SPEECH_URL = 'https://modelscope.cn/api/v1/models/damo/' \ - 'speech_dfsmn_aec_psm_16k/repo?Revision=master' \ - '&FilePath=examples/farend_speech.wav' +NEAREND_MIC_URL = 'https://modelscope.oss-cn-beijing.aliyuncs.com/' \ + 'test/audios/nearend_mic.wav' +FAREND_SPEECH_URL = 'https://modelscope.oss-cn-beijing.aliyuncs.com/' \ + 'test/audios/farend_speech.wav' NOISE_SPEECH_FILE = 'data/test/audios/speech_with_noise.wav' -NOISE_SPEECH_URL = 'https://modelscope.cn/api/v1/models/damo/' \ - 'speech_frcrn_ans_cirm_16k/repo?Revision=master' \ - '&FilePath=examples/speech_with_noise.wav' +NOISE_SPEECH_URL = 'https://modelscope.oss-cn-beijing.aliyuncs.com/' \ + 'test/audios/speech_with_noise.wav' class SpeechSignalProcessTest(unittest.TestCase, DemoCompatibilityCheck): diff --git a/tests/trainers/audio/test_ans_trainer.py b/tests/trainers/audio/test_ans_trainer.py index c0860529..d897e6a9 100644 --- a/tests/trainers/audio/test_ans_trainer.py +++ b/tests/trainers/audio/test_ans_trainer.py @@ -17,7 +17,6 @@ SEGMENT_LENGTH_TEST = 640 class TestANSTrainer(unittest.TestCase): - REVISION = 'beta' def setUp(self): self.tmp_dir = tempfile.TemporaryDirectory().name @@ -25,7 +24,7 @@ class TestANSTrainer(unittest.TestCase): os.makedirs(self.tmp_dir) self.model_id = 'damo/speech_frcrn_ans_cirm_16k' - cfg = read_config(self.model_id, revision=self.REVISION) + cfg = read_config(self.model_id) cfg.train.max_epochs = 2 cfg.train.dataloader.batch_size_per_gpu = 1 self.cfg_file = os.path.join(self.tmp_dir, 'train_config.json') @@ -48,7 +47,6 @@ class TestANSTrainer(unittest.TestCase): def test_trainer(self): kwargs = dict( model=self.model_id, - model_revision=self.REVISION, train_dataset=self.dataset, eval_dataset=self.dataset, max_epochs=2, diff --git a/tests/trainers/audio/test_kws_farfield_trainer.py b/tests/trainers/audio/test_kws_farfield_trainer.py index 2631a542..70b68a11 100644 --- a/tests/trainers/audio/test_kws_farfield_trainer.py +++ b/tests/trainers/audio/test_kws_farfield_trainer.py @@ -16,7 +16,6 @@ NOISE_2CH_FILE = 'data/test/audios/noise_2ch.wav' class TestKwsFarfieldTrainer(unittest.TestCase): - REVISION = 'beta' def setUp(self): self.tmp_dir = tempfile.TemporaryDirectory().name @@ -70,7 +69,6 @@ class TestKwsFarfieldTrainer(unittest.TestCase): kwargs = dict( model=self.model_id, work_dir=self.tmp_dir, - model_revision=self.REVISION, workers=2, max_epochs=2, train_iters_per_epoch=2,