Replaced copy-pasted image schema and all references with the original (#119)

We do not support Spark<2.3 anymore so there is no need for the copy-pasted ImageSchema file.

Author: tomasatdatabricks

README.md

@@ -112,7 +112,7 @@ The first step to applying deep learning on images is the ability to load the im
 Using Spark's ImageSchema
 
 ```python
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 image_df = ImageSchema.readImages("/data/myimages")
 ```
 

python/sparkdl/__init__.py

@@ -22,7 +22,6 @@
 from .estimators.keras_image_file_estimator import KerasImageFileEstimator
 
 __all__ = [
-    'imageSchema', 'imageType', 'readImages',
-    'TFImageTransformer', 'TFInputGraph', 'TFTransformer',
+    'imageType', 'TFImageTransformer', 'TFInputGraph', 'TFTransformer',
     'DeepImagePredictor', 'DeepImageFeaturizer', 'KerasImageFileTransformer', 'KerasTransformer',
     'imageInputPlaceholder', 'KerasImageFileEstimator']

python/sparkdl/image/image.py

@@ -23,7 +23,7 @@
 # pyspark
 from pyspark import Row
 from pyspark import SparkContext
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 from pyspark.sql.functions import udf
 from pyspark.sql.types import (
     BinaryType, IntegerType, StringType, StructField, StructType)

python/sparkdl/image/imageIO.py

@@ -19,7 +19,7 @@
 private APIs.
 """
 
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 from pyspark.ml.param import Param, Params, TypeConverters
 from pyspark.sql.functions import udf
 from sparkdl.image.imageIO import imageArrayToStruct

python/sparkdl/param/image_params.py

@@ -29,7 +29,7 @@
 import sparkdl.transformers.utils as utils
 import sparkdl.utils.jvmapi as JVMAPI
 
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 
 
 __all__ = ['TFImageTransformer']

python/sparkdl/transformers/tf_image.py

@@ -23,7 +23,7 @@
 
 import sparkdl.image.imageIO as imageIO
 
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 
 logger = logging.getLogger('sparkdl')
 

python/sparkdl/udf/keras_image_model.py

@@ -24,7 +24,7 @@
 from pyspark.sql.types import BinaryType, StringType, StructField, StructType
 
 from sparkdl.image import imageIO
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 from ..tests import SparkDLTestCase
 
 # Create some fake image data to work with

python/tests/image/test_imageIO.py

@@ -30,7 +30,7 @@
 from sparkdl.transformers.named_image import (DeepImagePredictor, DeepImageFeaturizer,
                                               _buildTFGraphForName)
 
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 
 from ..tests import SparkDLTestCase, SparkDLTempDirTestCase
 from .image_utils import getSampleImageDF

python/tests/transformers/named_image_test.py

@@ -27,7 +27,7 @@
 from pyspark import SparkContext
 from pyspark.sql import DataFrame, Row
 from pyspark.sql.functions import udf
-from sparkdl.image.image import ImageSchema
+from pyspark.ml.image import ImageSchema
 
 from sparkdl.graph.builder import IsolatedSession
 from sparkdl.graph.tensorframes_udf import makeGraphUDF