Skip to content

Commit abf7432

Browse files
sineelimattdangerw
andauthored
Remove bounding box utils and refactor retinanet (#2039)
* remove bounding box utils and refactor retinanet * Remove bbox utils from KerasHub, adding proper docstrings * nit * Import obj_det when satisfies keras version and nit * Correct api names and use assert for boudning box support * fix resize error and skip tests version < 3.8.0 * fix tuple error for skip test cases * skip retinanet test cases for keras < 3.8.0 * correct re string value * mark all tests at once, remove hardcoding and try with re for version parse * remove extra resizing layer * add previous alias for backward compatibility * api changes * Simpler bounding box preprocessing * Fix bounding box check for old keras --------- Co-authored-by: Matt Watson <mattdangerw@gmail.com>
1 parent 3e985d5 commit abf7432

35 files changed

+320
-2451
lines changed

keras_hub/api/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
since your modifications would be overwritten.
55
"""
66

7-
from keras_hub.api import bounding_box
87
from keras_hub.api import layers
98
from keras_hub.api import metrics
109
from keras_hub.api import models

keras_hub/api/bounding_box/__init__.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

keras_hub/api/layers/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
"""
66

77
from keras_hub.src.layers.modeling.alibi_bias import AlibiBias
8+
from keras_hub.src.layers.modeling.anchor_generator import AnchorGenerator
9+
from keras_hub.src.layers.modeling.box_matcher import BoxMatcher
810
from keras_hub.src.layers.modeling.cached_multi_head_attention import (
911
CachedMultiHeadAttention,
1012
)
1113
from keras_hub.src.layers.modeling.f_net_encoder import FNetEncoder
1214
from keras_hub.src.layers.modeling.masked_lm_head import MaskedLMHead
15+
from keras_hub.src.layers.modeling.non_max_supression import NonMaxSuppression
1316
from keras_hub.src.layers.modeling.position_embedding import PositionEmbedding
1417
from keras_hub.src.layers.modeling.reversible_embedding import (
1518
ReversibleEmbedding,
@@ -55,7 +58,6 @@
5558
from keras_hub.src.models.resnet.resnet_image_converter import (
5659
ResNetImageConverter,
5760
)
58-
from keras_hub.src.models.retinanet.anchor_generator import AnchorGenerator
5961
from keras_hub.src.models.retinanet.retinanet_image_converter import (
6062
RetinaNetImageConverter,
6163
)

keras_hub/api/models/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@
193193
from keras_hub.src.models.image_classifier_preprocessor import (
194194
ImageClassifierPreprocessor,
195195
)
196-
from keras_hub.src.models.image_object_detector import ImageObjectDetector
197-
from keras_hub.src.models.image_object_detector_preprocessor import (
198-
ImageObjectDetectorPreprocessor,
199-
)
200196
from keras_hub.src.models.image_segmenter import ImageSegmenter
201197
from keras_hub.src.models.image_segmenter_preprocessor import (
202198
ImageSegmenterPreprocessor,
@@ -232,6 +228,16 @@
232228
from keras_hub.src.models.mobilenet.mobilenet_image_classifier import (
233229
MobileNetImageClassifier,
234230
)
231+
from keras_hub.src.models.object_detector import ObjectDetector
232+
from keras_hub.src.models.object_detector import (
233+
ObjectDetector as ImageObjectDetector,
234+
)
235+
from keras_hub.src.models.object_detector_preprocessor import (
236+
ObjectDetectorPreprocessor,
237+
)
238+
from keras_hub.src.models.object_detector_preprocessor import (
239+
ObjectDetectorPreprocessor as ImageObjectDetectorPreprocessor,
240+
)
235241
from keras_hub.src.models.opt.opt_backbone import OPTBackbone
236242
from keras_hub.src.models.opt.opt_causal_lm import OPTCausalLM
237243
from keras_hub.src.models.opt.opt_causal_lm_preprocessor import (

keras_hub/src/bounding_box/__init__.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)