deepdoctection 0.30__py3-none-any.whl → 0.32__py3-none-any.whl

deepdoctection/extern/tp/tpfrcnn/modeling/model_fpn.py

@@ -12,23 +12,28 @@ This file is modified from
 import itertools
 
 import numpy as np
-
-# pylint: disable=import-error
-import tensorflow as tf
-from tensorpack import tfv1
-from tensorpack.models import Conv2D, FixedUnPooling, MaxPooling, layer_register
-from tensorpack.tfutils.argscope import argscope
-from tensorpack.tfutils.scope_utils import under_name_scope
-from tensorpack.tfutils.summary import add_moving_summary
-from tensorpack.tfutils.tower import get_current_tower_context
-from tensorpack.utils.argtools import memoized
+from lazy_imports import try_import
 
 from ..utils.box_ops import area as tf_area
 from .backbone import GroupNorm
 from .model_box import roi_align
 from .model_rpn import generate_rpn_proposals, get_all_anchors, rpn_losses
 
-# pylint: enable=import-error
+with try_import() as import_guard:
+    # pylint: disable=import-error
+    import tensorflow as tf
+    from tensorpack import tfv1
+    from tensorpack.models import Conv2D, FixedUnPooling, MaxPooling, layer_register
+    from tensorpack.tfutils.argscope import argscope
+    from tensorpack.tfutils.scope_utils import under_name_scope
+    from tensorpack.tfutils.summary import add_moving_summary
+    from tensorpack.tfutils.tower import get_current_tower_context
+    from tensorpack.utils.argtools import memoized
+
+    # pylint: enable=import-error
+
+if not import_guard.is_successful():
+    from .....utils.mocks import layer_register, memoized, under_name_scope
 
 
 @layer_register(log_shape=True)

deepdoctection/extern/tp/tpfrcnn/modeling/model_frcnn.py

@@ -8,21 +8,28 @@
 This file is modified from
 <https://github.com/tensorpack/tensorpack/blob/master/examples/FasterRCNN/modeling/model_frcnn.py>
 """
-# pylint: disable=import-error
-import tensorflow as tf
-from tensorpack import tfv1
-from tensorpack.models import Conv2D, FullyConnected, layer_register
-from tensorpack.tfutils.argscope import argscope
-from tensorpack.tfutils.common import get_tf_version_tuple
-from tensorpack.tfutils.scope_utils import under_name_scope
-from tensorpack.tfutils.summary import add_moving_summary
-from tensorpack.utils.argtools import memoized_method
+
+from lazy_imports import try_import
 
 from ..utils.box_ops import pairwise_iou
 from .backbone import GroupNorm
 from .model_box import decode_bbox_target, encode_bbox_target
 
-# pylint: enable=import-error
+with try_import() as import_guard:
+    # pylint: disable=import-error
+    import tensorflow as tf
+    from tensorpack import tfv1
+    from tensorpack.models import Conv2D, FullyConnected, layer_register
+    from tensorpack.tfutils.argscope import argscope
+    from tensorpack.tfutils.common import get_tf_version_tuple
+    from tensorpack.tfutils.scope_utils import under_name_scope
+    from tensorpack.tfutils.summary import add_moving_summary
+    from tensorpack.utils.argtools import memoized_method
+
+    # pylint: enable=import-error
+
+if not import_guard.is_successful():
+    from .....utils.mocks import layer_register, memoized_method, under_name_scope
 
 
 @under_name_scope()

deepdoctection/extern/tp/tpfrcnn/modeling/model_mrcnn.py

@@ -9,17 +9,23 @@ This file is modified from
 <https://github.com/tensorpack/tensorpack/blob/master/examples/FasterRCNN/modeling/model_mrcnn.py>
 """
 
-# pylint: disable=import-error
-import tensorflow as tf
-from tensorpack.models import Conv2D, Conv2DTranspose, layer_register
-from tensorpack.tfutils.argscope import argscope
-from tensorpack.tfutils.common import get_tf_version_tuple
-from tensorpack.tfutils.scope_utils import under_name_scope
-from tensorpack.tfutils.summary import add_moving_summary
+from lazy_imports import try_import
 
 from .backbone import GroupNorm
 
-# pylint: enable=import-error
+with try_import() as import_guard:
+    # pylint: disable=import-error
+    import tensorflow as tf
+    from tensorpack.models import Conv2D, Conv2DTranspose, layer_register
+    from tensorpack.tfutils.argscope import argscope
+    from tensorpack.tfutils.common import get_tf_version_tuple
+    from tensorpack.tfutils.scope_utils import under_name_scope
+    from tensorpack.tfutils.summary import add_moving_summary
+
+    # pylint: enable=import-error
+
+if not import_guard.is_successful():
+    from .....utils.mocks import layer_register, under_name_scope
 
 
 @under_name_scope()

deepdoctection/extern/tp/tpfrcnn/modeling/model_rpn.py

@@ -10,19 +10,24 @@ This file is modified from
 """
 
 import numpy as np
-
-# pylint: disable=import-error
-import tensorflow as tf
-from tensorpack import tfv1
-from tensorpack.models import Conv2D, layer_register
-from tensorpack.tfutils.argscope import argscope
-from tensorpack.tfutils.scope_utils import auto_reuse_variable_scope, under_name_scope
-from tensorpack.tfutils.summary import add_moving_summary
-from tensorpack.utils.argtools import memoized
+from lazy_imports import try_import
 
 from .model_box import clip_boxes
 
-# pylint: enable=import-error
+with try_import() as import_guard:
+    # pylint: disable=import-error
+    import tensorflow as tf
+    from tensorpack import tfv1
+    from tensorpack.models import Conv2D, layer_register
+    from tensorpack.tfutils.argscope import argscope
+    from tensorpack.tfutils.scope_utils import auto_reuse_variable_scope, under_name_scope
+    from tensorpack.tfutils.summary import add_moving_summary
+    from tensorpack.utils.argtools import memoized
+
+    # pylint: enable=import-error
+
+if not import_guard.is_successful():
+    from .....utils.mocks import auto_reuse_variable_scope, layer_register, memoized, under_name_scope
 
 
 @layer_register(log_shape=True)

deepdoctection/extern/tp/tpfrcnn/predict.py

@@ -8,21 +8,26 @@
 This file is modified from
 <https://github.com/tensorpack/tensorpack/blob/master/examples/FasterRCNN/predict.py>
 """
+from __future__ import annotations
 
 from typing import List
 
-import cv2
 import numpy as np
-from tensorpack.predict.base import OfflinePredictor  # pylint: disable=E0401
+from lazy_imports import try_import
 
-from ....utils.file_utils import scipy_available
 from ....utils.transform import InferenceResize
 from ...base import DetectionResult
 from .common import clip_boxes
 
-if scipy_available():
+with try_import() as import_guard:
+    from tensorpack.predict.base import OfflinePredictor  # pylint: disable=E0401
+
+with try_import() as sp_import_guard:
     from scipy import interpolate
 
+with try_import() as cv2_import_guard:
+    import cv2
+
 
 def _scale_box(box, scale):
     w_half = (box[2] - box[0]) * 0.5

deepdoctection/extern/tp/tpfrcnn/preproc.py

@@ -8,29 +8,28 @@
 This file is modified from
 <https://github.com/tensorpack/tensorpack/blob/1a79d595f7eda9dc9dc8428f4461680ed2222ab6/examples/FasterRCNN/data.py>
 """
+from __future__ import annotations
 
 from typing import Any, List, Optional, Tuple
 
 import numpy as np
-
-# pylint: disable=import-error
-from tensorpack.dataflow.imgaug import AugmentorList, ImageAugmentor
+from lazy_imports import try_import
 
 from ....datapoint.convert import box_to_point4, point4_to_box
 from ....utils.detection_types import ImageType, JsonDict
+from ....utils.error import MalformedData
 from ....utils.logger import log_once
 from .common import filter_boxes_inside_shape, np_iou
 from .modeling.model_fpn import get_all_anchors_fpn
 from .utils.np_box_ops import area as np_area
 from .utils.np_box_ops import ioa as np_ioa
 
-# pylint: enable=import-error
+# pylint: disable=import-error
 
 
-class MalformedData(BaseException):
-    """
-    Exception class for malformed data
-    """
+with try_import() as import_guard:
+    from tensorpack.dataflow.imgaug import AugmentorList, ImageAugmentor
+# pylint: enable=import-error
 
 
 def augment(dp: JsonDict, imgaug_list: List[ImageAugmentor], add_mask: bool) -> JsonDict:
@@ -62,7 +61,7 @@ def augment(dp: JsonDict, imgaug_list: List[ImageAugmentor], add_mask: bool) ->
         assert np.min(np_area(gt_boxes)) > 0, "some boxes have zero area"
 
     if add_mask:
-        raise NotImplementedError
+        raise NotImplementedError()
 
     return dp
 

deepdoctection/extern/tp/tpfrcnn/utils/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# File: __init__.py
+
+# Copyright 2021 Dr. Janis Meyer. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Init file for code for Tensorpack utils
+"""

deepdoctection/extern/tp/tpfrcnn/utils/box_ops.py

@@ -15,8 +15,16 @@ and
 """
 
 # pylint: disable=import-error
-import tensorflow as tf
-from tensorpack.tfutils.scope_utils import under_name_scope
+
+from lazy_imports import try_import
+
+with try_import() as tf_import_guard:
+    import tensorflow as tf
+    from tensorpack.tfutils.scope_utils import under_name_scope
+
+if not tf_import_guard.is_successful():
+    from .....utils.mocks import under_name_scope
+
 
 # pylint: enable=import-error
 

deepdoctection/extern/tpdetect.py

@@ -19,24 +19,62 @@
 TP Faster RCNN model as predictor for deepdoctection pipeline
 """
 
+from abc import ABC
 from copy import copy
 from pathlib import Path
-from typing import List, Mapping, Optional, Sequence, Union
+from typing import Dict, List, Mapping, Optional, Sequence, Union
 
 from ..utils.detection_types import ImageType, Requirement
-from ..utils.file_utils import get_tensorflow_requirement, get_tensorpack_requirement, tensorpack_available
+from ..utils.file_utils import get_tensorflow_requirement, get_tensorpack_requirement
 from ..utils.metacfg import set_config_by_yaml
 from ..utils.settings import ObjectTypes, TypeOrStr, get_type
 from .base import DetectionResult, ObjectDetector, PredictorBase
+from .tp.tpcompat import TensorpackPredictor
+from .tp.tpfrcnn.config.config import model_frcnn_config
+from .tp.tpfrcnn.modeling.generalized_rcnn import ResNetFPNModel
+from .tp.tpfrcnn.predict import tp_predict_image
 
-if tensorpack_available():
-    from .tp.tpcompat import TensorpackPredictor
-    from .tp.tpfrcnn.config.config import model_frcnn_config
-    from .tp.tpfrcnn.modeling.generalized_rcnn import ResNetFPNModel
-    from .tp.tpfrcnn.predict import tp_predict_image
 
+class TPFrcnnDetectorMixin(ObjectDetector, ABC):
+    """Base class for TP FRCNN detector. This class only implements the basic wrapper functions"""
 
-class TPFrcnnDetector(TensorpackPredictor, ObjectDetector):
+    def __init__(self, categories: Mapping[str, TypeOrStr], filter_categories: Optional[Sequence[TypeOrStr]] = None):
+        self.categories = copy(categories)  # type: ignore
+        if filter_categories:
+            filter_categories = [get_type(cat) for cat in filter_categories]
+        self.filter_categories = filter_categories
+        self._tp_categories = self._map_to_tp_categories(categories)
+
+    def _map_category_names(self, detection_results: List[DetectionResult]) -> List[DetectionResult]:
+        """
+        Populating category names to detection results
+
+        :param detection_results: list of detection results
+        :return: List of detection results with attribute class_name populated
+        """
+        filtered_detection_result: List[DetectionResult] = []
+        for result in detection_results:
+            result.class_name = self._tp_categories[str(result.class_id)]
+            if self.filter_categories:
+                if result.class_name not in self.filter_categories:
+                    filtered_detection_result.append(result)
+            else:
+                filtered_detection_result.append(result)
+        return filtered_detection_result
+
+    @staticmethod
+    def _map_to_tp_categories(categories: Mapping[str, TypeOrStr]) -> Dict[str, ObjectTypes]:
+        categories = {str(key): get_type(categories[val]) for key, val in enumerate(categories, 1)}
+        categories["0"] = get_type("background")
+        return categories  # type: ignore
+
+    @staticmethod
+    def get_name(path_weights: str, architecture: str) -> str:
+        """Returns the name of the model"""
+        return f"Tensorpack_{architecture}" + "_".join(Path(path_weights).parts[-2:])
+
+
+class TPFrcnnDetector(TensorpackPredictor, TPFrcnnDetectorMixin):
     """
     Tensorpack Faster-RCNN implementation with FPN and optional Cascade-RCNN. The backbones Resnet-50, Resnet-101 and
     their Resnext counterparts are also available. Normalization options (group normalization, synchronized batch
@@ -87,19 +125,22 @@ class TPFrcnnDetector(TensorpackPredictor, ObjectDetector):
         :param filter_categories: The model might return objects that are not supposed to be predicted and that should
                                   be filtered. Pass a list of category names that must not be returned
         """
-        self.name = "_".join(Path(path_weights).parts[-3:])
         self.path_yaml = path_yaml
+
         self.categories = copy(categories)  # type: ignore
         self.config_overwrite = config_overwrite
         if filter_categories:
             filter_categories = [get_type(cat) for cat in filter_categories]
         self.filter_categories = filter_categories
-        model = TPFrcnnDetector.set_model(path_yaml, self.categories, config_overwrite)
-        super().__init__(model, path_weights, ignore_mismatch)
-        assert self._number_gpus > 0, "Model only support inference with GPU"
+        model = TPFrcnnDetector.get_wrapped_model(path_yaml, self.categories, config_overwrite)
+        TensorpackPredictor.__init__(self, model, path_weights, ignore_mismatch)
+        TPFrcnnDetectorMixin.__init__(self, categories, filter_categories)
+
+        self.name = self.get_name(path_weights, self._model.cfg.TAG)
+        self.model_id = self.get_model_id()
 
     @staticmethod
-    def set_model(
+    def get_wrapped_model(
         path_yaml: str, categories: Mapping[str, ObjectTypes], config_overwrite: Union[List[str], None]
     ) -> ResNetFPNModel:
         """
@@ -138,23 +179,6 @@ class TPFrcnnDetector(TensorpackPredictor, ObjectDetector):
         )
         return self._map_category_names(detection_results)
 
-    def _map_category_names(self, detection_results: List[DetectionResult]) -> List[DetectionResult]:
-        """
-        Populating category names to detection results
-
-        :param detection_results: list of detection results
-        :return: List of detection results with attribute class_name populated
-        """
-        filtered_detection_result: List[DetectionResult] = []
-        for result in detection_results:
-            result.class_name = self._model.cfg.DATA.CLASS_DICT[str(result.class_id)]
-            if self.filter_categories:
-                if result.class_name not in self.filter_categories:
-                    filtered_detection_result.append(result)
-            else:
-                filtered_detection_result.append(result)
-        return filtered_detection_result
-
     @classmethod
     def get_requirements(cls) -> List[Requirement]:
         return [get_tensorflow_requirement(), get_tensorpack_requirement()]

deepdoctection/mapper/__init__.py

@@ -20,9 +20,11 @@ Contains everything that is related to transformation between datapoints
 """
 from typing import Callable
 
-from ..utils.file_utils import pytorch_available, transformers_available
 from .cats import *
 from .cocostruct import *
+from .d2struct import *
+from .hfstruct import *
+from .laylmstruct import *
 from .maputils import *
 from .match import *
 from .misc import *
@@ -32,12 +34,5 @@ from .pubstruct import *
 from .tpstruct import *
 from .xfundstruct import *
 
-if pytorch_available() and transformers_available():
-    from .hfstruct import *
-    from .laylmstruct import *
-
-if pytorch_available():
-    from .d2struct import *
-
 # Mapper
 Mapper = Callable[[Image], Optional[Image]]

deepdoctection/mapper/d2struct.py

@@ -19,26 +19,28 @@
 Module for mapping annotations into standard Detectron2 dataset dict. Also providing some tools for W&B mapping and
 visualising
 """
-
+from __future__ import annotations
 
 import os.path
 from typing import Dict, List, Mapping, Optional, Sequence, Tuple, Union
 
 import numpy as np
-import torch
+from lazy_imports import try_import
 
 from ..datapoint.annotation import ImageAnnotation
 from ..datapoint.image import Image
 from ..extern.pt.nms import batched_nms
 from ..mapper.maputils import curry
 from ..utils.detection_types import JsonDict
-from ..utils.file_utils import detectron2_available, wandb_available
 from ..utils.settings import ObjectTypes, TypeOrStr, get_type
 
-if detectron2_available():
+with try_import() as pt_import_guard:
+    import torch
+
+with try_import() as d2_import_guard:
     from detectron2.structures import BoxMode
 
-if wandb_available():
+with try_import() as wb_import_guard:
     from wandb import Classes
     from wandb import Image as Wbimage
 
@@ -93,7 +95,7 @@ def image_to_d2_frcnn_training(
         annotations.append(mapped_ann)
 
         if add_mask:
-            raise NotImplementedError
+            raise NotImplementedError("Segmentation in deepdoctection is not supported")
 
     output["annotations"] = annotations
 
@@ -163,7 +165,7 @@ def to_wandb_image(
     categories: Mapping[str, TypeOrStr],
     sub_categories: Optional[Mapping[str, TypeOrStr]] = None,
     cat_to_sub_cat: Optional[Mapping[ObjectTypes, ObjectTypes]] = None,
-) -> Tuple[str, "Wbimage"]:
+) -> Tuple[str, Wbimage]:
     """
     Converting a deepdoctection image into a wandb image
 

deepdoctection/mapper/hfstruct.py

@@ -19,12 +19,14 @@
 Module for mapping annotations into standard Huggingface Detr input structure for training
 """
 
+from __future__ import annotations
+
 import os
 from dataclasses import dataclass, field
 from typing import Dict, List, Literal, Optional, Sequence, Union
 
 import numpy as np
-from transformers import BatchFeature, DetrFeatureExtractor
+from lazy_imports import try_import
 
 from ..datapoint.image import Image
 from ..mapper.maputils import curry
@@ -33,6 +35,9 @@ from ..utils.detection_types import JsonDict
 from ..utils.settings import ObjectTypes
 from ..utils.transform import PadTransform
 
+with try_import() as tr_import_guard:
+    from transformers import BatchFeature, DetrFeatureExtractor
+
 
 @curry
 def image_to_hf_detr_training(
@@ -81,7 +86,7 @@ def image_to_hf_detr_training(
         annotations.append(mapped_ann)
 
     if add_mask:
-        raise NotImplementedError
+        raise NotImplementedError("Segmentation in deepdoctection is not supported")
 
     output["annotations"] = annotations