Skip to content

Commit

Permalink
add @export tags for internal S3 methods
Browse files Browse the repository at this point in the history
t-kalinowski committed Apr 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent bc9d583 commit 6ff4100
Showing 4 changed files with 31 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ Suggests:
png,
jpeg
Roxygen: list(markdown = TRUE, r6 = FALSE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
VignetteBuilder: knitr
Remotes:
Remotes:
rstudio/tensorflow
15 changes: 15 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -2,11 +2,25 @@

S3method("$",py_R6ClassGenerator)
S3method(as.data.frame,keras_training_history)
S3method(as_generator,"function")
S3method(as_generator,default)
S3method(as_generator,keras_preprocessing.sequence.TimeseriesGenerator)
S3method(as_generator,tensorflow.python.data.ops.dataset_ops.Dataset)
S3method(as_generator,tensorflow.python.data.ops.dataset_ops.DatasetV2)
S3method(compile,keras.engine.training.Model)
S3method(compose_layer,default)
S3method(compose_layer,keras.models.Sequential)
S3method(evaluate,keras.engine.training.Model)
S3method(export_savedmodel,keras.engine.training.Model)
S3method(fit,keras.engine.training.Model)
S3method(format,keras.engine.training.Model)
S3method(is_main_thread_generator,"function")
S3method(is_main_thread_generator,default)
S3method(is_main_thread_generator,keras.preprocessing.image.Iterator)
S3method(is_main_thread_generator,keras_preprocessing.image.Iterator)
S3method(is_main_thread_generator,keras_preprocessing.image.iterator.Iterator)
S3method(is_main_thread_generator,keras_preprocessing.sequence.TimeseriesGenerator)
S3method(is_main_thread_generator,tensorflow.python.data.ops.dataset_ops.Dataset)
S3method(pillar::type_sum,py_R6ClassGenerator)
S3method(plot,keras.engine.training.Model)
S3method(plot,keras_training_history)
@@ -593,6 +607,7 @@ importFrom(generics,fit)
importFrom(graphics,par)
importFrom(graphics,plot)
importFrom(graphics,points)
importFrom(magrittr,"%<>%")
importFrom(reticulate,array_reshape)
importFrom(reticulate,dict)
importFrom(reticulate,import)
2 changes: 2 additions & 0 deletions R/layers-core.R
Original file line number Diff line number Diff line change
@@ -550,10 +550,12 @@ compose_layer <- function(object, layer, ...) {
UseMethod("compose_layer")
}

#' @export
compose_layer.default <- function(object, layer, ...) {
layer(object, ...)
}

#' @export
compose_layer.keras.models.Sequential <- function(object, layer, ...) {
if(length(list(...)) > 0) warning("arguments passed via ellipsis will be ignored")

12 changes: 12 additions & 0 deletions R/model.R
Original file line number Diff line number Diff line change
@@ -1252,16 +1252,19 @@ as_generator <- function(x) {
UseMethod("as_generator")
}

#' @export
as_generator.default <- function(x) {
x
}

#' @export
as_generator.tensorflow.python.data.ops.dataset_ops.Dataset <- function(x) {
python_path <- system.file("python", package = "keras")
tools <- reticulate::import_from_path("kerastools", path = python_path)
tools$generator$dataset_generator(x , k_get_session())
}

#' @export
as_generator.tensorflow.python.data.ops.dataset_ops.DatasetV2 <- function(x) {

if (tensorflow::tf_version() >= "2.0")
@@ -1271,6 +1274,7 @@ as_generator.tensorflow.python.data.ops.dataset_ops.DatasetV2 <- function(x) {

}

#' @export
as_generator.function <- function(x) {
python_path <- system.file("python", package = "keras")
tools <- reticulate::import_from_path("kerastools", path = python_path)
@@ -1287,6 +1291,7 @@ as_generator.function <- function(x) {

}

#' @export
as_generator.keras_preprocessing.sequence.TimeseriesGenerator <- function(x) {
reticulate::as_iterator(x)
}
@@ -1295,18 +1300,22 @@ is_main_thread_generator <- function(x) {
UseMethod("is_main_thread_generator")
}

#' @export
is_main_thread_generator.default <- function(x) {
FALSE
}

#' @export
is_main_thread_generator.tensorflow.python.data.ops.dataset_ops.Dataset <- function(x) {
TRUE
}

#' @export
is_main_thread_generator.function <- function(x) {
TRUE
}

#' @export
is_main_thread_generator.keras.preprocessing.image.Iterator <- function(x) {
if (py_has_attr(x, "image_data_generator")) {
generator <- x$image_data_generator
@@ -1316,6 +1325,7 @@ is_main_thread_generator.keras.preprocessing.image.Iterator <- function(x) {
}
}

#' @export
is_main_thread_generator.keras_preprocessing.image.Iterator <- function(x) {

if (tensorflow::tf_version() <= "2.0.1")
@@ -1329,9 +1339,11 @@ is_main_thread_generator.keras_preprocessing.image.Iterator <- function(x) {
}
}

#' @export
is_main_thread_generator.keras_preprocessing.image.iterator.Iterator <-
is_main_thread_generator.keras_preprocessing.image.Iterator

#' @export
is_main_thread_generator.keras_preprocessing.sequence.TimeseriesGenerator <- function(x) {
if (tensorflow::tf_version() <= "2.0.1")
return(TRUE)

0 comments on commit 6ff4100

Please sign in to comment.