Merge pull request #1032 from dfalbel/bugfix/fit_with_validation_data

Bugfix/fit with validation data

Author: dfalbel

R/model.R

@@ -439,8 +439,14 @@ fit.keras.engine.training.Model <-
     dataset <- resolve_tensorflow_dataset(validation_data)
     if (!is.null(dataset))
       args$validation_data <- dataset
-    else
+    else {
       args$validation_data <- keras_array(validation_data)  
+      
+      if (tensorflow::tf_version() >="2.2")
+        args$validation_data <- do.call(reticulate::tuple, args$validation_data)
+      
+    }
+      
   }
 
   # resolve x and y (check for TF dataset)

inst/python/kerastools/progbar.py

@@ -16,7 +16,7 @@ def apply_patch():
   # save existing version of update for delegation
   update = Progbar.update
 
-  def update_with_patch(self, current, values=None, force=False):
+  def update_with_patch(self, current, values=None, force=False, finalize=None):
     # force dynamic display
     self._dynamic_display = True
     # delegate 

tests/testthat/test-model.R

@@ -116,6 +116,22 @@ test_succeeds("can call a model with additional arguments", {
 
 })
 
+test_succeeds("pass validation_data to model fit", {
+  
+  model <- keras_model_sequential() %>% 
+    layer_dense(units =1, input_shape = 2)
+  
+  model %>% compile(loss = "mse", optimizer = "sgd")
+  
+  model %>% 
+    fit(
+      matrix(runif(100), ncol = 2), y = runif(50),
+      batch_size = 10,
+      validation_data = list(matrix(runif(100), ncol = 2), runif(50))
+    )
+  
+})
+