Merge pull request #247 from bioimage-io/adapt-new-version

Adapt to changes in the version object

Author: constantinpape

bioimageio/core/prediction_pipeline/_model_adapters/_keras_model_adapter.py

@@ -1,5 +1,6 @@
 import warnings
 from typing import List, Optional, Sequence
+from marshmallow import missing
 
 # by default, we use the keras integrated with tensorflow
 try:
@@ -18,10 +19,11 @@
 
 class KerasModelAdapter(ModelAdapter):
     def _load(self, *, devices: Optional[Sequence[str]] = None) -> None:
-        try:
-            model_tf_version = self.bioimageio_model.weights[self.weight_format].tensorflow_version.version
-        except AttributeError:
+        model_tf_version = self.bioimageio_model.weights["keras_hdf5"].tensorflow_version
+        if model_tf_version is missing:
             model_tf_version = None
+        else:
+            model_tf_version = (int(model_tf_version.major), int(model_tf_version.minor))
 
         if TF_VERSION is None or model_tf_version is None:
             warnings.warn("Could not check tensorflow versions. The prediction results may be wrong.")

bioimageio/core/prediction_pipeline/_model_adapters/_tensorflow_model_adapter.py

@@ -5,8 +5,8 @@
 import numpy as np
 import tensorflow as tf
 import xarray as xr
+from marshmallow import missing
 
-from bioimageio.core.resource_io import nodes
 from ._model_adapter import ModelAdapter
 
 try:
@@ -35,10 +35,11 @@ def _load_model(self, weight_file):
             return str(weight_file)
 
     def _load(self, *, devices: Optional[List[str]] = None):
-        try:
-            model_tf_version = self.bioimageio_model.weights[self.weight_format].tensorflow_version.version
-        except AttributeError:
+        model_tf_version = self.bioimageio_model.weights[self.weight_format].tensorflow_version
+        if model_tf_version is missing:
             model_tf_version = None
+        else:
+            model_tf_version = (int(model_tf_version.major), int(model_tf_version.minor))
 
         tf_version = tf.__version__
         tf_major_and_minor = tuple(map(int, tf_version.split(".")))[:2]

bioimageio/core/weight_converter/keras/tensorflow.py

@@ -93,7 +93,7 @@ def convert_weights_to_tensorflow_saved_model_bundle(
     weight_path = str(weight_spec.source)
 
     if weight_spec.tensorflow_version:
-        model_tf_major_ver = weight_spec.tensorflow_version.version[0]
+        model_tf_major_ver = int(weight_spec.tensorflow_version.major)
         if model_tf_major_ver != tf_major_ver:
             raise RuntimeError(f"Tensorflow major versions of model {model_tf_major_ver} is not {tf_major_ver}")