Simplified handling of 1-dimensional data #1

Added expansion of 1-dimensional Tensors into 2-dimensional Tensors.

levenberg_marquardt.py

@@ -20,6 +20,7 @@
 # ==============================================================================
 
 import tensorflow as tf
+from tensorflow.python.keras.engine import data_adapter
 
 # ==============================================================================
 
@@ -651,7 +652,11 @@ def fit(self, dataset, epochs=1, metrics=None):
 
                 pl.on_train_batch_begin(step)
 
-                inputs, targets = next(iterator)
+                data = next(iterator)
+
+                data = data_adapter.expand_1d(data)
+                inputs, targets, sample_weight = \
+                    data_adapter.unpack_x_y_sample_weight(data)
 
                 loss, outputs, attempts, stop_training = \
                     self.train_step(inputs, targets)
@@ -728,7 +733,9 @@ def _assign_stop_training(self, value):
         self.stop_training = value.numpy().item()
 
     def train_step(self, data):
-        inputs, targets = data
+        data = data_adapter.expand_1d(data)
+        inputs, targets, sample_weight = \
+            data_adapter.unpack_x_y_sample_weight(data)
 
         loss, outputs, attempts, stop_training = \
             self.trainer.train_step(inputs, targets)