segmodels-keras 0.1.0.dev7__tar.gz → 0.1.0.dev9__tar.gz

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: segmodels_keras
-Version: 0.1.0.dev7
+Version: 0.1.0.dev9
 Summary: Image segmentation models with pre-trained backbones with Keras.
 Home-page: https://github.com/orthoseg/segmodels_keras
 Author: Pieter Roggemans

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/README.rst

@@ -24,7 +24,9 @@ improvements and support for some extra backbone models.
 It is not meant as a full replacement of the original library, but rather as a
 solution for a library I developed and depended on segmentation_models:
 `orthoseg <https://github.com/orthoseg/orthoseg>`__ . Hence, full backwards
-compatibility,... or support for all features is not guaranteed.
+compatibility or support for all features is not an explicit goal. For example,
+the resnet backbones got small changes compared to the original library, so existing
+weights you saved for them won't be compatible.
 
 
 **The main features** of this library are:

segmodels_keras-0.1.0.dev9/segmodels_keras/_compat.py

@@ -0,0 +1,123 @@
+from collections import defaultdict
+from pathlib import Path
+
+import keras
+from packaging.version import parse as parse_version
+
+KERAS_GTE_3 = parse_version(keras.__version__) >= parse_version("3.0.0")
+
+
+def _is_keras_v3_weights_hdf5(filepath):
+    try:
+        import h5py  # noqa: PLC0415
+    except ImportError:
+        return False
+
+    try:
+        with h5py.File(filepath, "r") as handle:
+            return "layers" in handle and "vars" in handle
+    except OSError:
+        return False
+
+
+def _get_sorted_hdf5_var_keys(vars_group):
+    return sorted(vars_group.keys(), key=int)
+
+
+def _get_keras_v3_weighted_layers(handle):
+    import h5py  # noqa: PLC0415
+
+    weighted_layers = []
+    for layer_name in handle["layers"].keys():
+        layer_group = handle["layers"][layer_name]
+        vars_group = layer_group.get("vars")
+        if vars_group is None or not vars_group.keys():
+            continue
+
+        signature = tuple(
+            tuple(vars_group[key].shape)
+            for key in _get_sorted_hdf5_var_keys(vars_group)
+        )
+        weighted_layers.append(
+            {
+                "name": layer_name,
+                "addr": h5py.h5o.get_info(layer_group.id).addr,
+                "signature": signature,
+                "vars_group": vars_group,
+            }
+        )
+
+    weighted_layers.sort(key=lambda layer: layer["addr"])
+    return weighted_layers
+
+
+def _load_keras_v3_weights_hdf5(model, filepath):
+    import h5py  # noqa: PLC0415
+
+    with h5py.File(filepath, "r") as handle:
+        saved_layers = _get_keras_v3_weighted_layers(handle)
+        saved_layers_by_signature = defaultdict(list)
+        for saved_layer in saved_layers:
+            saved_layers_by_signature[saved_layer["signature"]].append(saved_layer)
+
+        loaded_layers = 0
+
+        for layer in model.layers:
+            if not layer.weights:
+                continue
+
+            signature = tuple(tuple(variable.shape) for variable in layer.weights)
+            if not saved_layers_by_signature[signature]:
+                raise ValueError(
+                    "Unable to locate matching Keras v3 HDF5 weights for layer "
+                    f"'{layer.name}' with shapes {list(signature)}."
+                )
+
+            vars_group = saved_layers_by_signature[signature].pop(0)["vars_group"]
+            weight_values = [
+                vars_group[key][()] for key in _get_sorted_hdf5_var_keys(vars_group)
+            ]
+            layer.set_weights(weight_values)
+            loaded_layers += 1
+
+    if loaded_layers == 0:
+        raise ValueError(
+            "No matching weighted layers found in Keras v3 HDF5 weights file: "
+            f"{filepath}"
+        )
+
+
+def load_weights(model, filepath):
+    """Load weights from an HDF5 file into a Keras model.
+
+    TensorFlow/Keras 2.10 and 2.11 can only read the legacy HDF5 format
+    (``layer_names`` attribute at the root).  Keras 3 switched to a newer
+    layout where weights are stored under ``layers/<name>/vars/<index>``.
+    When a file saved with Keras 3 is opened by the TF 2.10/2.11 loader the
+    error "found 0 saved layers" is raised because the legacy reader finds no
+    ``layer_names`` attribute.
+
+    This wrapper calls ``model.load_weights`` first.  If that raises the
+    "found 0 saved layers" ValueError *and* the file is detected as a Keras 3
+    weights HDF5 file, it falls back to a manual reader that matches each
+    model layer to its saved counterpart by weight-shape signature and file
+    creation order.
+
+    Args:
+        model: Keras model whose weights should be restored.
+        filepath (str | Path): Path to a ``.h5`` or ``.hdf5`` weights file.
+    """
+    try:
+        model.load_weights(filepath)
+    except ValueError as ex:
+        filepath = str(filepath)
+        message = str(ex)
+        is_hdf5 = Path(filepath).suffix in {".h5", ".hdf5"}
+        if (
+            not is_hdf5
+            or "found 0 saved layers" not in message
+            or not _is_keras_v3_weights_hdf5(filepath)
+        ):
+            raise
+
+        _load_keras_v3_weights_hdf5(model, filepath)

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/segmodels_keras/_version.py

@@ -1,2 +1,2 @@
-__versioninfo__ = (0, 1, 0, "dev7")
+__versioninfo__ = (0, 1, 0, "dev9")
 __version__ = ".".join(map(str, __versioninfo__))

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/segmodels_keras/backbones/_weights.py

@@ -3,6 +3,7 @@
 Source: https://github.com/qubvel/classification_models
 """
 
+from segmodels_keras._compat import load_weights
 from keras.utils import get_file
 
 __all__ = ["load_model_weights"]
@@ -35,7 +36,7 @@ def load_model_weights(model, model_name, dataset, classes, include_top):
             md5_hash=weights["md5"],
         )
 
-        model.load_weights(weights_path)
+        load_weights(model, weights_path)
 
     else:
         raise ValueError(

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/segmodels_keras/backbones/backbones_factory.py

@@ -2,7 +2,7 @@ import keras.applications as ka
 
 from . import inception_resnet_v2 as irv2
 from . import inception_v3 as iv3
-from . import resnet
+from . import resnet_18_34
 
 
 class BackbonesFactory:
@@ -17,17 +17,22 @@ class BackbonesFactory:
     """
 
     _models = {  # noqa: RUF012
-        # ResNets < 50 layers are NOT available via keras.applications, so use
-        # implementation from classification_models.
+        # ResNets < 50 layers are NOT available via keras.applications, so use a
+        # torchvision-compatible post-activation BasicBlock implementation.
+        # Layer names follow the keras.applications ResNet50+ naming convention.
         "resnet18": (
-            resnet.ResNet18,
-            resnet.preprocess_input,
-            ("stage4_unit1_relu1", "stage3_unit1_relu1", "stage2_unit1_relu1", "relu0"),
+            resnet_18_34.ResNet18,
+            resnet_18_34.preprocess_input,
+            # resnet18: layer1=2, layer2=2, layer3=2, layer4=2 blocks
+            # backbone output = conv5_block2_out (512ch); skips are the 4 stages before it
+            ("conv4_block2_out", "conv3_block2_out", "conv2_block2_out", "conv1_relu"),
         ),
         "resnet34": (
-            resnet.ResNet34,
-            resnet.preprocess_input,
-            ("stage4_unit1_relu1", "stage3_unit1_relu1", "stage2_unit1_relu1", "relu0"),
+            resnet_18_34.ResNet34,
+            resnet_18_34.preprocess_input,
+            # resnet34: layer1=3, layer2=4, layer3=6, layer4=3 blocks
+            # backbone output = conv5_block3_out (512ch); skips are the 4 stages before it
+            ("conv4_block6_out", "conv3_block4_out", "conv2_block3_out", "conv1_relu"),
         ),
         # ResNets > 50 layers are available via keras.applications, so use those.
         # Skip layers (inverted) from https://github.com/yingkaisha/keras-unet-collection

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/segmodels_keras/backbones/inception_resnet_v2.py

@@ -32,13 +32,16 @@ are the following:
   keras, and here we need to use the public API of keras.
 """
 
-import warnings
 from pathlib import Path
 
 from keras import backend, layers, models
 from keras.applications import imagenet_utils
 from keras.utils import get_file, get_source_inputs
 
+from segmodels_keras._compat import load_weights
+
+from .resnet_common import _obtain_input_shape
+
 BASE_WEIGHT_URL = (
     "https://storage.googleapis.com/tensorflow/keras-applications/inception_resnet_v2/"
 )
@@ -260,9 +263,9 @@ def InceptionResNetV2(
                 cache_subdir="models",
                 file_hash="d19885ff4a710c122648d3b5c3b684e4",
             )
-        model.load_weights(weights_path)
+        load_weights(model, weights_path)
     elif weights is not None:
-        model.load_weights(weights)
+        load_weights(model, weights)
 
     return model
 
@@ -442,119 +445,3 @@ def decode_predictions(preds, top=5):
 
 def get_custom_objects():
     return {"CustomScaleLayer": CustomScaleLayer}
-
-
-def _obtain_input_shape(
-    input_shape,
-    default_size,
-    min_size,
-    data_format,
-    require_flatten,
-    weights=None,
-):
-    """Internal utility to compute/validate a model's input shape.
-
-    Args:
-      input_shape: Either None (will return the default network input shape),
-        or a user-provided shape to be validated.
-      default_size: Default input width/height for the model.
-      min_size: Minimum input width/height accepted by the model.
-      data_format: Image data format to use.
-      require_flatten: Whether the model is expected to
-        be linked to a classifier via a Flatten layer.
-      weights: One of `None` (random initialization)
-        or 'imagenet' (pre-training on ImageNet).
-        If weights='imagenet' input channels must be equal to 3.
-
-    Returns:
-      An integer shape tuple (may include None entries).
-
-    Raises:
-      ValueError: In case of invalid argument values.
-    """
-    if weights != "imagenet" and input_shape and len(input_shape) == 3:
-        if data_format == "channels_first":
-            correct_channel_axis = 1 if len(input_shape) == 4 else 0
-            if input_shape[correct_channel_axis] not in {1, 3}:
-                warnings.warn(
-                    "This model usually expects 1 or 3 input channels. "
-                    "However, it was passed an input_shape "
-                    f"with {input_shape[0]} input channels.",
-                    stacklevel=2,
-                )
-            default_shape = (input_shape[0], default_size, default_size)
-        else:
-            if input_shape[-1] not in {1, 3}:
-                warnings.warn(
-                    "This model usually expects 1 or 3 input channels. "
-                    "However, it was passed an input_shape "
-                    f"with {input_shape[-1]} input channels.",
-                    stacklevel=2,
-                )
-            default_shape = (default_size, default_size, input_shape[-1])
-    else:
-        if data_format == "channels_first":
-            default_shape = (3, default_size, default_size)
-        else:
-            default_shape = (default_size, default_size, 3)
-    if weights == "imagenet" and require_flatten:
-        if input_shape is not None:
-            if input_shape != default_shape:
-                raise ValueError(
-                    "When setting `include_top=True` "
-                    "and loading `imagenet` weights, "
-                    f"`input_shape` should be {default_shape}.  "
-                    f"Received: input_shape={input_shape}"
-                )
-        return default_shape
-    if input_shape:
-        if data_format == "channels_first":
-            if input_shape is not None:
-                if len(input_shape) != 3:
-                    raise ValueError("`input_shape` must be a tuple of three integers.")
-                if input_shape[0] != 3 and weights == "imagenet":
-                    raise ValueError(
-                        "The input must have 3 channels; Received "
-                        f"`input_shape={input_shape}`"
-                    )
-                if (input_shape[1] is not None and input_shape[1] < min_size) or (
-                    input_shape[2] is not None and input_shape[2] < min_size
-                ):
-                    raise ValueError(
-                        f"Input size must be at least {min_size}"
-                        f"x{min_size}; Received: "
-                        f"input_shape={input_shape}"
-                    )
-        else:
-            if input_shape is not None:
-                if len(input_shape) != 3:
-                    raise ValueError("`input_shape` must be a tuple of three integers.")
-                if input_shape[-1] != 3 and weights == "imagenet":
-                    raise ValueError(
-                        "The input must have 3 channels; Received "
-                        f"`input_shape={input_shape}`"
-                    )
-                if (input_shape[0] is not None and input_shape[0] < min_size) or (
-                    input_shape[1] is not None and input_shape[1] < min_size
-                ):
-                    raise ValueError(
-                        "Input size must be at least "
-                        f"{min_size}x{min_size}; Received: "
-                        f"input_shape={input_shape}"
-                    )
-    else:
-        if require_flatten:
-            input_shape = default_shape
-        else:
-            if data_format == "channels_first":
-                input_shape = (3, None, None)
-            else:
-                input_shape = (None, None, 3)
-    if require_flatten:
-        if None in input_shape:
-            raise ValueError(
-                "If `include_top` is True, "
-                "you should specify a static `input_shape`. "
-                f"Received: input_shape={input_shape}"
-            )
-    return input_shape

{segmodels_keras-0.1.0.dev7 → segmodels_keras-0.1.0.dev9}/segmodels_keras/backbones/inception_v3.py

@@ -14,6 +14,8 @@ from keras import backend, layers, models
 from keras import utils as keras_utils
 from keras.applications import imagenet_utils
 
+from segmodels_keras._compat import load_weights
+
 WEIGHTS_PATH = (
     "https://github.com/fchollet/deep-learning-models/"
     "releases/download/v0.5/"
@@ -361,9 +363,9 @@ def InceptionV3(
                 cache_subdir="models",
                 file_hash="bcbd6486424b2319ff4ef7d526e38f63",
             )
-        model.load_weights(weights_path)
+        load_weights(model, weights_path)
     elif weights is not None:
-        model.load_weights(weights)
+        load_weights(model, weights)
 
     return model