Updated keras import statement

keras_segmentation/models/_pspnet_2.py

@@ -3,12 +3,12 @@
 from math import ceil
 from sys import exit
 from keras import layers
-from keras.layers import Conv2D, MaxPooling2D, AveragePooling2D
-from keras.layers import BatchNormalization, Activation, Input, Dropout, \
+from tensorflow.keras.layers import Conv2D, MaxPooling2D, AveragePooling2D
+from tensorflow.keras.layers import BatchNormalization, Activation, Input, Dropout, \
     ZeroPadding2D, Lambda
-from keras.layers.merge import Concatenate, Add
-from keras.models import Model
-from keras.optimizers import SGD
+from tensorflow.keras.layers.merge import Concatenate, Add
+from tensorflow.keras.models import Model
+from tensorflow.keras.optimizers import SGD
 import tensorflow as tf
 
 from .config import IMAGE_ORDERING

keras_segmentation/models/basic_models.py

@@ -1,5 +1,5 @@
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 import keras.backend as K
 
 from .config import IMAGE_ORDERING

keras_segmentation/models/fcn.py

@@ -1,5 +1,5 @@
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 
 from .config import IMAGE_ORDERING
 from .model_utils import get_segmentation_model

keras_segmentation/models/mobilenet.py

@@ -1,5 +1,5 @@
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 import keras.backend as K
 import keras
 

keras_segmentation/models/model_utils.py

@@ -1,7 +1,7 @@
 from types import MethodType
 
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 import keras.backend as K
 from tqdm import tqdm
 

keras_segmentation/models/pspnet.py

@@ -1,7 +1,7 @@
 import numpy as np
 import keras
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 import keras.backend as K
 
 from .config import IMAGE_ORDERING

keras_segmentation/models/resnet50.py

@@ -1,6 +1,6 @@
 import keras
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 from keras import layers
 import keras.backend as K
 

keras_segmentation/models/segnet.py

@@ -1,7 +1,7 @@
 import os
 
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 
 from .config import IMAGE_ORDERING
 from .model_utils import get_segmentation_model
@@ -95,5 +95,5 @@ def mobilenet_segnet(n_classes, input_height=224, input_width=224,
     m = vgg_segnet(101)
     m = segnet(101)
     # m = mobilenet_segnet( 101 )
-    # from keras.utils import plot_model
+    # from tensorflow.keras.utils import plot_model
     # plot_model( m , show_shapes=True , to_file='model.png')

keras_segmentation/models/unet.py

@@ -1,5 +1,5 @@
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 
 from .config import IMAGE_ORDERING
 from .model_utils import get_segmentation_model

keras_segmentation/models/vgg16.py

@@ -1,6 +1,6 @@
 import keras
-from keras.models import *
-from keras.layers import *
+from tensorflow.keras.models import *
+from tensorflow.keras.layers import *
 
 from .config import IMAGE_ORDERING
 

keras_segmentation/predict.py

@@ -6,7 +6,7 @@
 import cv2
 import numpy as np
 from tqdm import tqdm
-from keras.models import load_model
+from tensorflow.keras.models import load_model
 
 from .train import find_latest_checkpoint
 from .data_utils.data_loader import get_image_array, get_segmentation_array, DATA_LOADER_SEED, class_colors , get_pairs_from_paths

keras_segmentation/pretrained.py

@@ -1,4 +1,4 @@
-from keras.models import load_model
+from tensorflow.keras.models import load_model
 import keras
 
 from .models.all_models import model_from_name