Merge pull request #683 from rstudio/bugfix/tf-1.13-changes

javierluraschi · web-flow · commit 8521c2495c39 · 2019-02-28T10:10:43.000-08:00
fix fit_generator for tfdatasets
diff --git a/R/model.R b/R/model.R
@@ -925,11 +925,14 @@ as_generator.default <- function(x) {
 }
 
 as_generator.tensorflow.python.data.ops.dataset_ops.Dataset <- function(x) {
-  python_path <- system.file("python", package = "tfdatasets")
+  python_path <- system.file("python", package = "keras")
   tools <- reticulate::import_from_path("kerastools", path = python_path)
   tools$generator$dataset_generator(x , k_get_session())
 }
 
+as_generator.tensorflow.python.data.ops.dataset_ops.DatasetV2 <-
+  as_generator.tensorflow.python.data.ops.dataset_ops.Dataset
+
 as_generator.function <- function(x) {
   reticulate::py_iterator(function() keras_array(x()))
 }

Original file line number	Diff line number	Diff line change
`@@ -925,11 +925,14 @@ as_generator.default <- function(x) {`
`925`	`925`	`}`
`926`	`926`
`927`	`927`	`as_generator.tensorflow.python.data.ops.dataset_ops.Dataset <- function(x) {`
`928`		`- python_path <- system.file("python", package = "tfdatasets")`
	`928`	`+ python_path <- system.file("python", package = "keras")`
`929`	`929`	`tools <- reticulate::import_from_path("kerastools", path = python_path)`
`930`	`930`	`tools$generator$dataset_generator(x , k_get_session())`
`931`	`931`	`}`
`932`	`932`
	`933`	`+as_generator.tensorflow.python.data.ops.dataset_ops.DatasetV2 <-`
	`934`	`+ as_generator.tensorflow.python.data.ops.dataset_ops.Dataset`
	`935`	`+`
`933`	`936`	`as_generator.function <- function(x) {`
`934`	`937`	`reticulate::py_iterator(function() keras_array(x()))`
`935`	`938`	`}`