Backwards compatibility fixes for Keras <=2.15 (#2273)

* Add fixes for backwards compatibility for versions <2.15 * Bump version number for presets to version 2 * Port over RetinaNet custom metric fix * Bump DeepLabV3Plus preset version after re-upload
keras-team · Jan 4, 2024 · 15a787e · 15a787e
1 parent 540472d
commit 15a787e
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 84 deletions.
diff --git a/keras_cv/models/backbones/backbone.py b/keras_cv/models/backbones/backbone.py
@@ -32,6 +32,20 @@ class Backbone(keras.Model):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._pyramid_level_inputs = {}
+        self._functional_layer_ids = set(
+            id(layer) for layer in self._flatten_layers()
+        )
+
+    def __dir__(self):
+        # Temporary fixes for weight saving. This mimics the following PR for
+        # older version of Keras: https://github.com/keras-team/keras/pull/18982
+        def filter_fn(attr):
+            try:
+                return id(getattr(self, attr)) not in self._functional_layer_ids
+            except:
+                return True
+
+        return filter(filter_fn, super().__dir__())
 
     def get_config(self):
         # Don't chain to super here. The default `get_config()` for functional

diff --git a/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py b/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py
@@ -26,7 +26,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny/2",
     },
     "csp_darknet_s": {
         "metadata": {
@@ -39,7 +39,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_s/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_s/2",
     },
     "csp_darknet_m": {
         "metadata": {
@@ -52,7 +52,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_m/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_m/2",
     },
     "csp_darknet_l": {
         "metadata": {
@@ -65,7 +65,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l/2",
     },
     "csp_darknet_xl": {
         "metadata": {
@@ -78,7 +78,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_xl/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_xl/2",
     },
 }
 
@@ -95,7 +95,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny_imagenet/2",  # noqa: E501
     },
     "csp_darknet_l_imagenet": {
         "metadata": {
@@ -109,7 +109,7 @@
             "official_name": "CSPDarkNet",
             "path": "csp_darknet",
         },
-        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l_imagenet/1",
+        "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l_imagenet/2",
     },
 }
 

diff --git a/keras_cv/models/backbones/densenet/densenet_backbone_presets.py b/keras_cv/models/backbones/densenet/densenet_backbone_presets.py
@@ -18,19 +18,19 @@
         "metadata": {
             "description": "DenseNet model with 121 layers.",
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet121/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet121/2",
     },
     "densenet169": {
         "metadata": {
             "description": "DenseNet model with 169 layers.",
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet169/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet169/2",
     },
     "densenet201": {
         "metadata": {
             "description": "DenseNet model with 201 layers.",
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet201/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet201/2",
     },
 }
 
@@ -42,7 +42,7 @@
                 "classification task."
             ),
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet121_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet121_imagenet/2",
     },
     "densenet169_imagenet": {
         "metadata": {
@@ -51,7 +51,7 @@
                 "classification task."
             ),
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet169_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet169_imagenet/2",
     },
     "densenet201_imagenet": {
         "metadata": {
@@ -60,7 +60,7 @@
                 "classification task."
             ),
         },
-        "kaggle_handle": "kaggle://keras/densenet/densenet201_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/densenet201_imagenet/2",
     },
 }
 

diff --git a/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py b/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py
@@ -24,7 +24,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s/2",
     },
     "efficientnetv2_m": {
         "metadata": {
@@ -35,7 +35,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_m/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_m/2",
     },
     "efficientnetv2_l": {
         "metadata": {
@@ -47,7 +47,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_l/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_l/2",
     },
     "efficientnetv2_b0": {
         "metadata": {
@@ -60,7 +60,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0/2",
     },
     "efficientnetv2_b1": {
         "metadata": {
@@ -73,7 +73,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1/2",
     },
     "efficientnetv2_b2": {
         "metadata": {
@@ -86,7 +86,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2/2",
     },
     "efficientnetv2_b3": {
         "metadata": {
@@ -99,7 +99,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b3/1",
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b3/2",
     },
 }
 
@@ -117,7 +117,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s_imagenet/2",  # noqa: E501
     },
     "efficientnetv2_b0_imagenet": {
         "metadata": {
@@ -134,7 +134,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0_imagenet/2",  # noqa: E501
     },
     "efficientnetv2_b1_imagenet": {
         "metadata": {
@@ -151,7 +151,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1_imagenet/2",  # noqa: E501
     },
     "efficientnetv2_b2_imagenet": {
         "metadata": {
@@ -168,7 +168,7 @@
             "official_name": "EfficientNetV2",
             "path": "efficientnetv2",
         },
-        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2_imagenet/2",  # noqa: E501
     },
 }
 

diff --git a/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py b/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py
@@ -23,7 +23,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b0/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b0/2",
     },
     "mit_b1": {
         "metadata": {
@@ -34,7 +34,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b1/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b1/2",
     },
     "mit_b2": {
         "metadata": {
@@ -45,7 +45,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b2/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b2/2",
     },
     "mit_b3": {
         "metadata": {
@@ -56,7 +56,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b3/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b3/2",
     },
     "mit_b4": {
         "metadata": {
@@ -67,7 +67,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b4/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b4/2",
     },
     "mit_b5": {
         "metadata": {
@@ -78,7 +78,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b5/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b5/2",
     },
 }
 
@@ -92,7 +92,7 @@
             "official_name": "MiT",
             "path": "mit",
         },
-        "kaggle_handle": "kaggle://keras/mit/mit_b0_imagenet/1",
+        "kaggle_handle": "kaggle://keras/mit/mit_b0_imagenet/2",
     },
 }
 

diff --git a/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py b/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py
@@ -25,7 +25,7 @@
             "official_name": "MobileNetV3",
             "path": "mobilenetv3",
         },
-        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small/1",
+        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small/2",
     },
     "mobilenet_v3_large": {
         "metadata": {
@@ -38,7 +38,7 @@
             "official_name": "MobileNetV3",
             "path": "mobilenetv3",
         },
-        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large/1",
+        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large/2",
     },
 }
 
@@ -55,7 +55,7 @@
             "official_name": "MobileNetV3",
             "path": "mobilenetv3",
         },
-        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large_imagenet/2",  # noqa: E501
     },
     "mobilenet_v3_small_imagenet": {
         "metadata": {
@@ -69,7 +69,7 @@
             "official_name": "MobileNetV3",
             "path": "mobilenetv3",
         },
-        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small_imagenet/1",  # noqa: E501
+        "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small_imagenet/2",  # noqa: E501
     },
 }
 

diff --git a/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py b/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py
@@ -25,7 +25,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet18/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet18/2",
     },
     "resnet34": {
         "metadata": {
@@ -38,7 +38,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet34/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet34/2",
     },
     "resnet50": {
         "metadata": {
@@ -51,7 +51,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet50/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet50/2",
     },
     "resnet101": {
         "metadata": {
@@ -64,7 +64,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet101/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet101/2",
     },
     "resnet152": {
         "metadata": {
@@ -77,7 +77,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet152/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet152/2",
     },
 }
 
@@ -94,7 +94,7 @@
             "official_name": "ResNetV1",
             "path": "resnet_v1",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/resnet50_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/resnet50_imagenet/2",
     },
 }