Merge pull request #1353 from terrytangyuan/subset-both

Support subset=both in image_dataset_from_directory()

Author: t-kalinowski

R/preprocessing.R

@@ -1030,8 +1030,9 @@ flow_images_from_dataframe <- function(
 #' @param seed Optional random seed for shuffling and transformations.
 #' @param validation_split Optional float between 0 and 1, fraction of data to
 #'   reserve for validation.
-#' @param subset One of "training" or "validation". Only used if
-#'   validation_split is set.
+#' @param subset One of "training", "validation", or "both" (available for TF>=2.10).
+#'   Only used if validation_split is set. When `subset="both"`, the utility returns
+#'   a tuple of two datasets (the training and validation datasets respectively). 
 #' @param interpolation String, the interpolation method used when resizing
 #'   images. Defaults to bilinear. Supports bilinear, nearest, bicubic, area,
 #'   lanczos3, lanczos5, gaussian, mitchellcubic.
@@ -1101,6 +1102,10 @@ image_dataset_from_directory <- function(
     seed = as_nullable_integer,
     labels = function(l) if(is.character(l)) l else as.integer(l)
   ))
+  
+  if (tensorflow::tf_version() < "2.10" && subset == "both") {
+    stop('subset="both" is only available for TF>=2.10')
+  }
 
   out <- do.call(keras$preprocessing$image_dataset_from_directory, args)
   class(out) <- unique(c("tf_dataset", class(out)))