Merge pull request #1434 from rstudio/default-tf-v2.15

Updates for TF v2.15

Author: t-kalinowski

.github/workflows/R-CMD-check.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - r2
   pull_request:
   schedule:
     - cron: '51 3 * * Fri'
@@ -31,6 +32,7 @@ jobs:
           - {os: 'windows-latest', tf: 'default', r: 'oldrel'}
           - {os: 'macOS-latest'  , tf: 'default', r: 'oldrel'}
           - {os: 'ubuntu-latest' , tf: 'default', r: 'oldrel'}
+
           - {os: 'ubuntu-latest' , tf: 'default', r: 'oldrel-1'}
           - {os: 'ubuntu-latest' , tf: 'default', r: 'oldrel-2'}
           - {os: 'ubuntu-20.04'  , tf: 'default', r: '3.6'} # default R in ubuntu-20.04

DESCRIPTION

@@ -49,7 +49,5 @@ Suggests:
     png,
     jpeg
 Roxygen: list(markdown = TRUE, r6 = FALSE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
-Remotes:  
-    rstudio/tensorflow

NAMESPACE

@@ -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)

NEWS.md

@@ -1,6 +1,11 @@
 # keras (development version)
 
-- Updates to allow both R packages {keras} and {keras3} to be loaded. 
+- Default TensorFlow/Keras version installed by `install_keras()` is now 2.15. 
+  This is the last Tensorflow version where where Keras 2 is the default. 
+  To use Keras with Tensorflow v2.16 and up, use the new {keras3} R package.
+
+- Updates to allow both R packages {keras} and {keras3} to be loaded.
+
 
 # keras 2.13.0
 

R/install.R

@@ -51,7 +51,7 @@ install_keras <- function(method = c("auto", "virtualenv", "conda"),
   )
 }
 
-default_version <- numeric_version("2.13")
+default_version <- numeric_version("2.15")
 
 default_extra_packages <- function(tensorflow_version = "default") {
   pkgs <- c(

R/layers-core.R

@@ -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")
 

R/model.R

@@ -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)

R/utils.R

@@ -684,17 +684,17 @@ as_r_value <- function (x) {
 
 # internal `[` method that ensures functions in this namespace use one-based
 # indexing in case user has a global option set for zero-based indexing.
-`[.tensorflow.tensor` <-
-  getS3method("[", "tensorflow.tensor", envir = asNamespace("tensorflow"))
-formals(`[.tensorflow.tensor`)$style <- "R"
-formals(`[.tensorflow.tensor`)$options <-
-  tensorflow::tf_extract_opts(
-    one_based = TRUE,
-    inclusive_stop = TRUE,
-    disallow_out_of_bounds = TRUE,
-    warn_tensors_passed_asis = FALSE,
-    warn_negatives_pythonic = FALSE
-  )
+# `[.tensorflow.tensor` <-
+#   getS3method("[", "tensorflow.tensor", envir = asNamespace("tensorflow"))
+# formals(`[.tensorflow.tensor`)$style <- "R"
+# formals(`[.tensorflow.tensor`)$options <-
+#   tensorflow::tf_extract_opts(
+#     one_based = TRUE,
+#     inclusive_stop = TRUE,
+#     disallow_out_of_bounds = TRUE,
+#     warn_tensors_passed_asis = FALSE,
+#     warn_negatives_pythonic = FALSE
+#   )