Browse Source

[to #42322933]add lazy load

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10011795

    * [to #42322933] 新增FER人脸属性识别
master
ly261666 yingda.chen 3 years ago
parent
commit
c25e60c67d
4 changed files with 27 additions and 1 deletions
  1. +20
    -0
      modelscope/models/cv/facial_expression_recognition/__init__.py
  2. +2
    -0
      modelscope/models/cv/facial_expression_recognition/fer/__init__.py
  3. +4
    -0
      modelscope/pipelines/cv/__init__.py
  4. +1
    -1
      modelscope/pipelines/cv/facial_expression_recognition_pipeline.py

+ 20
- 0
modelscope/models/cv/facial_expression_recognition/__init__.py View File

@@ -0,0 +1,20 @@
# Copyright (c) Alibaba, Inc. and its affiliates.
from typing import TYPE_CHECKING

from modelscope.utils.import_utils import LazyImportModule

if TYPE_CHECKING:
from .fer import FacialExpressionRecognition

else:
_import_structure = {'fer': ['FacialExpressionRecognition']}

import sys

sys.modules[__name__] = LazyImportModule(
__name__,
globals()['__file__'],
_import_structure,
module_spec=__spec__,
extra_objects={},
)

+ 2
- 0
modelscope/models/cv/facial_expression_recognition/fer/__init__.py View File

@@ -0,0 +1,2 @@
# Copyright (c) Alibaba, Inc. and its affiliates.
from .facial_expression_recognition import FacialExpressionRecognition

+ 4
- 0
modelscope/pipelines/cv/__init__.py View File

@@ -47,6 +47,8 @@ if TYPE_CHECKING:
from .easycv_pipelines import EasyCVDetectionPipeline, EasyCVSegmentationPipeline, Face2DKeypointsPipeline from .easycv_pipelines import EasyCVDetectionPipeline, EasyCVSegmentationPipeline, Face2DKeypointsPipeline
from .text_driven_segmentation_pipleline import TextDrivenSegmentationPipleline from .text_driven_segmentation_pipleline import TextDrivenSegmentationPipleline
from .movie_scene_segmentation_pipeline import MovieSceneSegmentationPipeline from .movie_scene_segmentation_pipeline import MovieSceneSegmentationPipeline
from .facial_expression_recognition_pipeline import FacialExpressionRecognitionPipeline

else: else:
_import_structure = { _import_structure = {
'action_recognition_pipeline': ['ActionRecognitionPipeline'], 'action_recognition_pipeline': ['ActionRecognitionPipeline'],
@@ -105,6 +107,8 @@ else:
['TextDrivenSegmentationPipeline'], ['TextDrivenSegmentationPipeline'],
'movie_scene_segmentation_pipeline': 'movie_scene_segmentation_pipeline':
['MovieSceneSegmentationPipeline'], ['MovieSceneSegmentationPipeline'],
'facial_expression_recognition_pipelin':
['FacialExpressionRecognitionPipeline']
} }


import sys import sys


+ 1
- 1
modelscope/pipelines/cv/facial_expression_recognition_pipeline.py View File

@@ -8,7 +8,7 @@ import torch


from modelscope.metainfo import Pipelines from modelscope.metainfo import Pipelines
from modelscope.models.cv.face_recognition.align_face import align_face from modelscope.models.cv.face_recognition.align_face import align_face
from modelscope.models.cv.facial_expression_recognition.fer.facial_expression_recognition import \
from modelscope.models.cv.facial_expression_recognition import \
FacialExpressionRecognition FacialExpressionRecognition
from modelscope.outputs import OutputKeys from modelscope.outputs import OutputKeys
from modelscope.pipelines import pipeline from modelscope.pipelines import pipeline


Loading…
Cancel
Save