From c25e60c67dc7891a21065e912b30e276c77ccf7e Mon Sep 17 00:00:00 2001 From: ly261666 Date: Mon, 5 Sep 2022 13:52:54 +0800 Subject: [PATCH] [to #42322933]add lazy load Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10011795 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [to #42322933] 新增FER人脸属性识别 --- .../facial_expression_recognition/__init__.py | 20 +++++++++++++++++++ .../fer/__init__.py | 2 ++ modelscope/pipelines/cv/__init__.py | 4 ++++ .../facial_expression_recognition_pipeline.py | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modelscope/models/cv/facial_expression_recognition/__init__.py b/modelscope/models/cv/facial_expression_recognition/__init__.py index e69de29b..35a15d18 100644 --- a/modelscope/models/cv/facial_expression_recognition/__init__.py +++ b/modelscope/models/cv/facial_expression_recognition/__init__.py @@ -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={}, + ) diff --git a/modelscope/models/cv/facial_expression_recognition/fer/__init__.py b/modelscope/models/cv/facial_expression_recognition/fer/__init__.py index e69de29b..2546035b 100644 --- a/modelscope/models/cv/facial_expression_recognition/fer/__init__.py +++ b/modelscope/models/cv/facial_expression_recognition/fer/__init__.py @@ -0,0 +1,2 @@ +# Copyright (c) Alibaba, Inc. and its affiliates. +from .facial_expression_recognition import FacialExpressionRecognition diff --git a/modelscope/pipelines/cv/__init__.py b/modelscope/pipelines/cv/__init__.py index d3dba978..ac1ed82c 100644 --- a/modelscope/pipelines/cv/__init__.py +++ b/modelscope/pipelines/cv/__init__.py @@ -47,6 +47,8 @@ if TYPE_CHECKING: from .easycv_pipelines import EasyCVDetectionPipeline, EasyCVSegmentationPipeline, Face2DKeypointsPipeline from .text_driven_segmentation_pipleline import TextDrivenSegmentationPipleline from .movie_scene_segmentation_pipeline import MovieSceneSegmentationPipeline + from .facial_expression_recognition_pipeline import FacialExpressionRecognitionPipeline + else: _import_structure = { 'action_recognition_pipeline': ['ActionRecognitionPipeline'], @@ -105,6 +107,8 @@ else: ['TextDrivenSegmentationPipeline'], 'movie_scene_segmentation_pipeline': ['MovieSceneSegmentationPipeline'], + 'facial_expression_recognition_pipelin': + ['FacialExpressionRecognitionPipeline'] } import sys diff --git a/modelscope/pipelines/cv/facial_expression_recognition_pipeline.py b/modelscope/pipelines/cv/facial_expression_recognition_pipeline.py index 4a80878c..c5577dcf 100644 --- a/modelscope/pipelines/cv/facial_expression_recognition_pipeline.py +++ b/modelscope/pipelines/cv/facial_expression_recognition_pipeline.py @@ -8,7 +8,7 @@ import torch from modelscope.metainfo import Pipelines 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 from modelscope.outputs import OutputKeys from modelscope.pipelines import pipeline