Merge pull request #656 from rstudio/is_tensorflow_dataset_fix

jjallaire · web-flow · commit 3316c86bff06 · 2019-02-02T16:27:13.000-05:00
generalize to accommodate other underlying python classes
diff --git a/R/model.R b/R/model.R
@@ -973,7 +973,8 @@ is_main_thread_generator.keras_preprocessing.image.Iterator <- function(x) {
 }
 
 is_tensorflow_dataset <- function(x) {
-  inherits(x, "tensorflow.python.data.ops.dataset_ops.Dataset")
+  inherits(x, "tensorflow.python.data.ops.dataset_ops.DatasetV2") ||
+    inherits(x, "tensorflow.python.data.ops.dataset_ops.Dataset")
 }
 
 resolve_tensorflow_dataset <- function(x) {

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,8 @@ is_main_thread_generator.keras_preprocessing.image.Iterator <- function(x) {`
`973`	`973`	`}`
`974`	`974`
`975`	`975`	`is_tensorflow_dataset <- function(x) {`
`976`		`- inherits(x, "tensorflow.python.data.ops.dataset_ops.Dataset")`
	`976`	`+ inherits(x, "tensorflow.python.data.ops.dataset_ops.DatasetV2") \|\|`
	`977`	`+ inherits(x, "tensorflow.python.data.ops.dataset_ops.Dataset")`
`977`	`978`	`}`
`978`	`979`
`979`	`980`	`resolve_tensorflow_dataset <- function(x) {`