More import issues and fixes
Browse files
scoutbot/__init__.py
CHANGED
|
@@ -46,7 +46,7 @@ how the entire pipeline can be run on tiles or images, respectively.
|
|
| 46 |
'''
|
| 47 |
from scoutbot import agg, loc, tile, wic
|
| 48 |
|
| 49 |
-
VERSION = '0.1.
|
| 50 |
version = VERSION
|
| 51 |
__version__ = VERSION
|
| 52 |
|
|
|
|
| 46 |
'''
|
| 47 |
from scoutbot import agg, loc, tile, wic
|
| 48 |
|
| 49 |
+
VERSION = '0.1.6'
|
| 50 |
version = VERSION
|
| 51 |
__version__ = VERSION
|
| 52 |
|
scoutbot/loc/transforms/__init__.py
CHANGED
|
@@ -5,7 +5,9 @@
|
|
| 5 |
#
|
| 6 |
|
| 7 |
from scoutbot.loc.transforms import annotations # NOQA
|
|
|
|
| 8 |
from scoutbot.loc.transforms import detections # NOQA
|
|
|
|
| 9 |
from scoutbot.loc.transforms._postprocess import ( # NOQA
|
| 10 |
GetBoundingBoxes,
|
| 11 |
NonMaxSupression,
|
|
@@ -13,4 +15,3 @@ from scoutbot.loc.transforms._postprocess import ( # NOQA
|
|
| 13 |
TensorToBrambox,
|
| 14 |
)
|
| 15 |
from scoutbot.loc.transforms._preprocess import Letterbox # NOQA
|
| 16 |
-
from scoutbot.loc.transforms.util import Compose # NOQA
|
|
|
|
| 5 |
#
|
| 6 |
|
| 7 |
from scoutbot.loc.transforms import annotations # NOQA
|
| 8 |
+
from scoutbot.loc.transforms import box # NOQA
|
| 9 |
from scoutbot.loc.transforms import detections # NOQA
|
| 10 |
+
from scoutbot.loc.transforms import util # NOQA
|
| 11 |
from scoutbot.loc.transforms._postprocess import ( # NOQA
|
| 12 |
GetBoundingBoxes,
|
| 13 |
NonMaxSupression,
|
|
|
|
| 15 |
TensorToBrambox,
|
| 16 |
)
|
| 17 |
from scoutbot.loc.transforms._preprocess import Letterbox # NOQA
|
|
|
scoutbot/loc/transforms/annotations/annotation.py
CHANGED
|
@@ -6,7 +6,6 @@
|
|
| 6 |
# from enum import Enum
|
| 7 |
|
| 8 |
from scoutbot.loc.transforms import box as b
|
| 9 |
-
from scoutbot.loc.transforms.detections import detection as det
|
| 10 |
|
| 11 |
__all__ = ['Annotation', 'ParserType', 'Parser']
|
| 12 |
|
|
@@ -84,6 +83,8 @@ class Annotation(b.Box):
|
|
| 84 |
The obj can be both an :class:`~brambox.boxes.annotations.Annotation` or a :class:`~brambox.boxes.detections.Detection`.
|
| 85 |
For Annotations every attribute is copied over, for Detections the flags are all set to **False**.
|
| 86 |
"""
|
|
|
|
|
|
|
| 87 |
instance = super(Annotation, cls).create(obj)
|
| 88 |
|
| 89 |
if obj is None:
|
|
|
|
| 6 |
# from enum import Enum
|
| 7 |
|
| 8 |
from scoutbot.loc.transforms import box as b
|
|
|
|
| 9 |
|
| 10 |
__all__ = ['Annotation', 'ParserType', 'Parser']
|
| 11 |
|
|
|
|
| 83 |
The obj can be both an :class:`~brambox.boxes.annotations.Annotation` or a :class:`~brambox.boxes.detections.Detection`.
|
| 84 |
For Annotations every attribute is copied over, for Detections the flags are all set to **False**.
|
| 85 |
"""
|
| 86 |
+
from scoutbot.loc.transforms.detections import detection as det
|
| 87 |
+
|
| 88 |
instance = super(Annotation, cls).create(obj)
|
| 89 |
|
| 90 |
if obj is None:
|
scoutbot/loc/transforms/detections/detection.py
CHANGED
|
@@ -6,7 +6,6 @@
|
|
| 6 |
# from enum import Enum
|
| 7 |
|
| 8 |
from scoutbot.loc.transforms import box as b
|
| 9 |
-
from scoutbot.loc.transforms.annotations import annotation as anno
|
| 10 |
|
| 11 |
__all__ = ['Detection', 'ParserType', 'Parser']
|
| 12 |
|
|
@@ -35,6 +34,8 @@ class Detection(b.Box):
|
|
| 35 |
The obj can be both an :class:`~brambox.boxes.annotations.Annotation` or a :class:`~brambox.boxes.detections.Detection`.
|
| 36 |
For Detections the confidence score is copied over, for Annotations it is set to 1.
|
| 37 |
"""
|
|
|
|
|
|
|
| 38 |
instance = super(Detection, cls).create(obj)
|
| 39 |
|
| 40 |
if obj is None:
|
|
|
|
| 6 |
# from enum import Enum
|
| 7 |
|
| 8 |
from scoutbot.loc.transforms import box as b
|
|
|
|
| 9 |
|
| 10 |
__all__ = ['Detection', 'ParserType', 'Parser']
|
| 11 |
|
|
|
|
| 34 |
The obj can be both an :class:`~brambox.boxes.annotations.Annotation` or a :class:`~brambox.boxes.detections.Detection`.
|
| 35 |
For Detections the confidence score is copied over, for Annotations it is set to 1.
|
| 36 |
"""
|
| 37 |
+
from scoutbot.loc.transforms.annotations import annotation as anno
|
| 38 |
+
|
| 39 |
instance = super(Detection, cls).create(obj)
|
| 40 |
|
| 41 |
if obj is None:
|