Merge pull request #19 from metal3d/v1.0.13

V1.0.13

Author: metal3d

README.md

@@ -61,6 +61,9 @@ Each of these generators accepts parameters:
 
 # Changelog
 
+## v1.0.13
+- try to fix SageMaker problem by avoiding usage of internal keras from tensorflow
+
 ## v1.0.12
 - fix transformation error with SlidingFrameGenerator
 

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='keras-video-generators',
-    version='1.0.12',
+    version='1.0.13',
     description='Keras sequence generators for video data',
     long_description=long_description,
     long_description_content_type="text/markdown",

src/keras_video/__init__.py

@@ -28,7 +28,7 @@
 
 """
 
-__version__ = "1.0.12"
+__version__ = "1.0.13"
 
 from . import flow
 from . import generator

src/keras_video/flow.py

@@ -19,11 +19,7 @@
 import numpy as np
 import cv2 as cv
 from .generator import VideoFrameGenerator
-
-try:
-    import tensorflow.keras.preprocessing.image as kimage
-except ModuleNotFoundError:
-    import keras.preprocessing.image as kimage
+import keras.preprocessing.image as kimage
 
 METHOD_OPTICAL_FLOW = 1
 METHOD_FLOW_MASK = 2

src/keras_video/generator.py

@@ -15,15 +15,9 @@
 import re
 log = logging.getLogger()
 
-# Try to import keras resources from tensorflow
-try:
-    from tensorflow.keras.utils import Sequence
-    from tensorflow.keras.preprocessing.image import \
-        ImageDataGenerator, img_to_array
-except ModuleNotFoundError:
-    from keras.utils import Sequence
-    from keras.preprocessing.image import \
-        ImageDataGenerator, img_to_array
+from keras.utils import Sequence
+from keras.preprocessing.image import \
+    ImageDataGenerator, img_to_array
 
 
 class VideoFrameGenerator(Sequence):