remove necessary dependency of transformer (#857)

* remove necessary dependency of transformer * fix import error * fix typo
modelscope · May 15, 2024 · 88c60f1 · 88c60f1
1 parent 2f353bd
commit 88c60f1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/modelscope/__init__.py b/modelscope/__init__.py
@@ -1,7 +1,8 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 from typing import TYPE_CHECKING
 
-from modelscope.utils.import_utils import LazyImportModule
+from modelscope.utils.import_utils import (LazyImportModule,
+                                           is_transformers_available)
 from .utils.automodel_utils import fix_transformers_upgrade
 
 if TYPE_CHECKING:
@@ -29,13 +30,18 @@
     from .trainers import (EpochBasedTrainer, Hook, Priority, TrainingArgs,
                            build_dataset_from_file)
     from .utils.constant import Tasks
-    from .utils.hf_util import AutoConfig, GPTQConfig, AwqConfig, BitsAndBytesConfig
-    from .utils.hf_util import (AutoModel, AutoModelForCausalLM,
-                                AutoModelForSeq2SeqLM,
-                                AutoModelForSequenceClassification,
-                                AutoModelForTokenClassification, AutoTokenizer,
-                                GenerationConfig, AutoImageProcessor,
-                                BatchFeature)
+    if is_transformers_available():
+        from .utils.hf_util import AutoConfig, GPTQConfig, AwqConfig, BitsAndBytesConfig
+        from .utils.hf_util import (AutoModel, AutoModelForCausalLM,
+                                    AutoModelForSeq2SeqLM,
+                                    AutoModelForSequenceClassification,
+                                    AutoModelForTokenClassification,
+                                    AutoTokenizer, GenerationConfig,
+                                    AutoImageProcessor, BatchFeature)
+    else:
+        print(
+            'transformer is not installed, please install it if you want to use related modules'
+        )
     from .utils.hub import create_model_if_not_exist, read_config
     from .utils.logger import get_logger
     from .version import __release_datetime__, __version__
@@ -78,16 +84,22 @@
         'utils.hub': ['read_config', 'create_model_if_not_exist'],
         'utils.logger': ['get_logger'],
         'utils.constant': ['Tasks'],
-        'utils.hf_util': [
+        'msdatasets': ['MsDataset']
+    }
+
+    if is_transformers_available():
+        _import_structure['utils.hf_util'] = [
             'AutoConfig', 'GenerationConfig', 'AutoModel', 'GPTQConfig',
             'AwqConfig', 'BitsAndBytesConfig', 'AutoModelForCausalLM',
             'AutoModelForSeq2SeqLM', 'AutoTokenizer',
             'AutoModelForSequenceClassification',
             'AutoModelForTokenClassification', 'AutoImageProcessor',
             'BatchFeature'
-        ],
-        'msdatasets': ['MsDataset']
-    }
+        ]
+    else:
+        print(
+            'transformer is not installed, please install it if you want to use related modules'
+        )
 
     import sys
 
@@ -99,4 +111,5 @@
         extra_objects={},
     )
 
-fix_transformers_upgrade()
+if is_transformers_available():
+    fix_transformers_upgrade()
diff --git a/modelscope/metrics/__init__.py b/modelscope/metrics/__init__.py
@@ -69,7 +69,9 @@
         'loss_metric': ['LossMetric'],
         'image_colorization_metric': ['ImageColorizationMetric'],
         'ocr_recognition_metric': ['OCRRecognitionMetric'],
-        'translation_evaluation_metric': ['TranslationEvaluationMetric']
+        'translation_evaluation_metric': ['TranslationEvaluationMetric'],
+        'video_super_resolution_metric.video_super_resolution_metric':
+        ['VideoSuperResolutionMetric'],
     }
 
     import sys

diff --git a/modelscope/trainers/__init__.py b/modelscope/trainers/__init__.py
@@ -36,7 +36,7 @@
         'nlp_trainer': ['NlpEpochBasedTrainer', 'VecoTrainer'],
         'trainer': ['EpochBasedTrainer'],
         'training_args': ['TrainingArgs', 'build_dataset_from_file'],
-        'hooks': ['Hook']
+        'hooks': ['Hook', 'Priority']
     }
 
     import sys