address comments

Author: phi-dbq

python/sparkdl/transformers/tf_tensor.py

@@ -29,11 +29,11 @@
     keyword_only, HasInputMapping, HasOutputMapping, SparkDLTypeConverters,
     HasTFGraph, HasTFHParams)
 
-__all__ = ['TFTensorTransformer']
+__all__ = ['TFModelTransformer']
 
 logger = logging.getLogger('sparkdl')
 
-class TFTensorTransformer(Transformer, HasTFGraph, HasTFHParams, HasInputMapping, HasOutputMapping):
+class TFModelTransformer(Transformer, HasTFGraph, HasTFHParams, HasInputMapping, HasOutputMapping):
     """
     Applies the TensorFlow graph to the array column in DataFrame.
 
@@ -50,7 +50,7 @@ def __init__(self, inputMapping=None, outputMapping=None, tfGraph=None, hparams=
         """
         __init__(self, inputMapping=None, outputMapping=None, tfGraph=None, hparams=None)
         """
-        super(TFTensorTransformer, self).__init__()
+        super(TFModelTransformer, self).__init__()
         kwargs = self._input_kwargs
         self.setParams(**kwargs)
 
@@ -59,7 +59,7 @@ def setParams(self, inputMapping=None, outputMapping=None, tfGraph=None, hparams
         """
         setParams(self, inputMapping=None, outputMapping=None, tfGraph=None, hparams=None)
         """
-        super(TFTensorTransformer, self).__init__()
+        super(TFModelTransformer, self).__init__()
         kwargs = self._input_kwargs
         return self._set(**kwargs)
 

python/tests/transformers/tf_tensor_test.py

@@ -22,7 +22,7 @@
 
 from sparkdl.graph.builder import IsolatedSession
 import sparkdl.graph.utils as tfx
-from sparkdl.transformers.tf_tensor import TFTensorTransformer
+from sparkdl.transformers.tf_tensor import TFModelTransformer
 
 from ..tests import SparkDLTestCase
 
@@ -31,7 +31,7 @@ def grab_df_arr(df, output_col):
     return np.array([row.asDict()[output_col]
                      for row in df.select(output_col).toLocalIterator()])
 
-class TFOneDimTransformerTest(SparkDLTestCase):
+class TFModelTransformerTest(SparkDLTestCase):
 
     def _get_rand_vec_df(self, num_rows, vec_size):
         return self.session.createDataFrame(
@@ -60,13 +60,13 @@ def test_simple(self):
             out_ref = np.hstack(_results)
 
         # Apply the transform
-        transfomer = TFTensorTransformer(tfGraph=graph,
-                                         inputMapping={
-                                             'vec': x
-                                         },
-                                         outputMapping={
-                                             z: 'outCol'
-                                         })
+        transfomer = TFModelTransformer(tfGraph=graph,
+                                        inputMapping={
+                                            'vec': x
+                                        },
+                                        outputMapping={
+                                            z: 'outCol'
+                                        })
         final_df = transfomer.transform(analyzed_df)
         out_tgt = grab_df_arr(final_df, 'outCol')
 
@@ -105,15 +105,15 @@ def test_multi_io(self):
             q_out_ref = np.hstack(q_out_ref)
 
         # Apply the transform
-        transfomer = TFTensorTransformer(tfGraph=graph,
-                                         inputMapping={
-                                             'vec_x': x,
-                                             'vec_y': y
-                                         },
-                                         outputMapping={
-                                             p: 'out_p',
-                                             q: 'out_q'
-                                         })
+        transfomer = TFModelTransformer(tfGraph=graph,
+                                        inputMapping={
+                                            'vec_x': x,
+                                            'vec_y': y
+                                        },
+                                        outputMapping={
+                                            p: 'out_p',
+                                            q: 'out_q'
+                                        })
         final_df = transfomer.transform(analyzed_df)
         p_out_tgt = grab_df_arr(final_df, 'out_p')
         q_out_tgt = grab_df_arr(final_df, 'out_q')
@@ -169,13 +169,13 @@ def test_map_blocks_graph(self):
         arr_ref = grab_df_arr(final_df, output_col)
 
         # Using the Transformer
-        transformer = TFTensorTransformer(tfGraph=gfn,
-                                          inputMapping={
-                                              input_col: feeds[0]
-                                          },
-                                          outputMapping={
-                                              fetches[0]: output_col
-                                          })
+        transformer = TFModelTransformer(tfGraph=gfn,
+                                         inputMapping={
+                                             input_col: feeds[0]
+                                         },
+                                         outputMapping={
+                                             fetches[0]: output_col
+                                         })
         transformed_df = transformer.transform(analyzed_df)
 
         arr_tgt = grab_df_arr(transformed_df, output_col)