Browse Source

[to #42322933] Fix remove useless Tasks.key_word_spotting

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9303027
master
shichen.fsc yingda.chen 3 years ago
parent
commit
39e8e97033
4 changed files with 9 additions and 12 deletions
  1. +2
    -1
      modelscope/models/audio/kws/generic_key_word_spotting.py
  2. +1
    -1
      modelscope/pipelines/audio/kws_kwsbp_pipeline.py
  3. +0
    -1
      modelscope/utils/constant.py
  4. +6
    -9
      tests/pipelines/test_key_word_spotting.py

+ 2
- 1
modelscope/models/audio/kws/generic_key_word_spotting.py View File

@@ -9,7 +9,8 @@ from modelscope.utils.constant import Tasks
__all__ = ['GenericKeyWordSpotting']


@MODELS.register_module(Tasks.key_word_spotting, module_name=Models.kws_kwsbp)
@MODELS.register_module(
Tasks.auto_speech_recognition, module_name=Models.kws_kwsbp)
class GenericKeyWordSpotting(Model):

def __init__(self, model_dir: str, *args, **kwargs):


+ 1
- 1
modelscope/pipelines/audio/kws_kwsbp_pipeline.py View File

@@ -18,7 +18,7 @@ __all__ = ['KeyWordSpottingKwsbpPipeline']


@PIPELINES.register_module(
Tasks.key_word_spotting, module_name=Pipelines.kws_kwsbp)
Tasks.auto_speech_recognition, module_name=Pipelines.kws_kwsbp)
class KeyWordSpottingKwsbpPipeline(Pipeline):
"""KWS Pipeline - key word spotting decoding
"""


+ 0
- 1
modelscope/utils/constant.py View File

@@ -60,7 +60,6 @@ class Tasks(object):
auto_speech_recognition = 'auto-speech-recognition'
text_to_speech = 'text-to-speech'
speech_signal_process = 'speech-signal-process'
key_word_spotting = 'key-word-spotting'

# multi-modal tasks
image_captioning = 'image-captioning'


+ 6
- 9
tests/pipelines/test_key_word_spotting.py View File

@@ -6,11 +6,8 @@ import unittest

import requests

from modelscope.metainfo import Pipelines, Preprocessors
from modelscope.models import Model
from modelscope.pipelines import pipeline
from modelscope.preprocessors import build_preprocessor
from modelscope.utils.constant import Fields, InputFields, Tasks
from modelscope.utils.constant import Tasks
from modelscope.utils.test_utils import test_level

KWSBP_URL = 'https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/KWS/tools/kwsbp'
@@ -58,7 +55,7 @@ class KeyWordSpottingTest(unittest.TestCase):
f.write(r.content)

kwsbp_16k_pipline = pipeline(
task=Tasks.key_word_spotting, model=self.model_id)
task=Tasks.auto_speech_recognition, model=self.model_id)
self.assertTrue(kwsbp_16k_pipline is not None)

kws_result = kwsbp_16k_pipline(
@@ -107,7 +104,7 @@ class KeyWordSpottingTest(unittest.TestCase):
keywords = [{'keyword': '播放音乐'}]

kwsbp_16k_pipline = pipeline(
task=Tasks.key_word_spotting,
task=Tasks.auto_speech_recognition,
model=self.model_id,
keywords=keywords)
self.assertTrue(kwsbp_16k_pipline is not None)
@@ -169,7 +166,7 @@ class KeyWordSpottingTest(unittest.TestCase):
f.write(r.content)

kwsbp_16k_pipline = pipeline(
task=Tasks.key_word_spotting, model=self.model_id)
task=Tasks.auto_speech_recognition, model=self.model_id)
self.assertTrue(kwsbp_16k_pipline is not None)

kws_result = kwsbp_16k_pipline(
@@ -232,7 +229,7 @@ class KeyWordSpottingTest(unittest.TestCase):
f.write(r.content)

kwsbp_16k_pipline = pipeline(
task=Tasks.key_word_spotting, model=self.model_id)
task=Tasks.auto_speech_recognition, model=self.model_id)
self.assertTrue(kwsbp_16k_pipline is not None)

kws_result = kwsbp_16k_pipline(
@@ -318,7 +315,7 @@ class KeyWordSpottingTest(unittest.TestCase):
f.write(r.content)

kwsbp_16k_pipline = pipeline(
task=Tasks.key_word_spotting, model=self.model_id)
task=Tasks.auto_speech_recognition, model=self.model_id)
self.assertTrue(kwsbp_16k_pipline is not None)

kws_result = kwsbp_16k_pipline(


Loading…
Cancel
Save