Merge pull request #1492 from rstudio/reexport-dotty

Update backend defaults

Author: t-kalinowski

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

@@ -75,7 +75,12 @@ jobs:
           upgrade: 'TRUE'
 
       - name: Install Keras
-        run: keras3::install_keras(python_version = '${{ matrix.python }}')
+        run: |
+          options(echo = TRUE)
+          print(sessionInfo())
+          # print(Sys.info())
+          print(keras3::op_convert_to_tensor("Hello World!"))
+          print(reticulate::py_config())
 
       - uses: r-lib/actions/check-r-package@v2
         with:

DESCRIPTION

@@ -29,7 +29,7 @@ Depends:
     R (>= 4.0)
 Imports:
     generics (>= 0.0.1),
-    reticulate (>= 1.40.0.9000),
+    reticulate (>= 1.41.0),
     tensorflow (>= 2.16.0),
     tfruns (>= 1.5.2),
     magrittr,
@@ -55,5 +55,3 @@ Suggests:
     jpeg
 RoxygenNote: 7.3.2
 VignetteBuilder: knitr
-Remotes:
-    rstudio/reticulate

NEWS.md

@@ -11,6 +11,9 @@
 
 - `dotty::.` is now reexported.
 
+- `%*%` now dispatches to `op_matmul()` for tensorflow tensors, which
+  has relaxed shape constraints compared to `tf$matmul()`.
+
 ## Added compatibility with Keras v3.8.0. User-facing changes:
 
 - New symbols:

R/install.R

@@ -37,7 +37,7 @@ install_keras <- function(
 
       # lspci doens't list GPUs on WSL Linux, but nvidia-smi does.
       nvidia_smi_listed <- tryCatch(
-        system("nvidia-smi -L", intern = TRUE),
+        system("nvidia-smi -L", intern = TRUE, ignore.stderr = TRUE),
         warning = function(w) character(),
         error = function(e) character()
       )
@@ -164,11 +164,11 @@ use_backend <- function(backend, gpu = NA) {
     macOS_tensorflow = {
 
       if (is.na(gpu))
-        gpu <- TRUE
+        gpu <- FALSE
 
       if (gpu) {
-        py_require("tensorflow", action = "remove")
-        py_require(c("tensorflow-macos", "tensorflow-metal"), python_version = "<3.12")
+        # py_require("tensorflow", action = "remove")
+        py_require(c("tensorflow", "tensorflow-metal"))
       } else {
         py_require(action = "remove", c("tensorflow-macos", "tensorflow-metal"))
         py_require("tensorflow")
@@ -256,7 +256,7 @@ use_backend <- function(backend, gpu = NA) {
 
     Windows_tensorflow = {
       if(isTRUE(gpu)) warning("GPU usage not supported on Windows. Please use WSL.")
-      py_require("tensorflow")
+      py_require(c("tensorflow", "numpy<2"))
     },
 
     Windows_jax = {
@@ -322,7 +322,7 @@ has_gpu <- function() {
 
     # lspci doens't list GPUs on WSL Linux, but nvidia-smi does.
     nvidia_smi_listed <- tryCatch(
-      system("nvidia-smi -L", intern = TRUE),
+      system("nvidia-smi -L", intern = TRUE, ignore.stderr = TRUE),
       warning = function(w) character(),
       error = function(e) character()
     )

R/package.R

@@ -52,22 +52,39 @@ keras <- NULL
 .onLoad <- function(libname, pkgname) {
 
   # tensorflow:::.onLoad() registers some reticulate class filter hooks
-  # we need to identify tensors reliably.
+  # we need to identify tensorflow tensors reliably.
   requireNamespace("tensorflow", quietly = TRUE)
   maybe_register_S3_methods()
 
+  registerS3method("%*%", "tensorflow.tensor", op_matmul, baseenv())
+
   # if KERAS_PYTHON is defined then forward it to RETICULATE_PYTHON
   keras_python <- get_keras_python()
   if (!is.null(keras_python))
     Sys.setenv(RETICULATE_PYTHON = keras_python)
 
-  # default backend is tensorflow for now
-  # the tensorflow R package calls `py_require()` to ensure GPU is usable on Linux
   py_require(c(
     "keras", "pydot", "scipy", "pandas", "Pillow",
-    "ipython", "tensorflow_datasets"
+    "ipython" #, "tensorflow_datasets"
   ))
 
+  # default backend is tensorflow for now
+  # the tensorflow R package calls `py_require()` to ensure GPU is usable on Linux
+  # use_backend() includes py_require(action = "remove") calls to undo
+  # what tensorflow:::.onLoad() did. Keep them in sync!
+  backend <- Sys.getenv("KERAS_BACKEND", "tensorflow")
+  gpu <- NA
+  if (endsWith(backend, "-cpu")) {
+    gpu <- FALSE
+    backend <- sub("-cpu$", "", backend)
+    Sys.setenv("KERAS_BACKEND" = backend)
+  } else if (endsWith(backend, "-gpu")) {
+    gpu <- TRUE
+    backend <- sub("-gpu$", "", backend)
+    Sys.setenv("KERAS_BACKEND" = backend)
+  }
+  use_backend(backend, gpu)
+
   # delay load keras
   try(keras <<- import("keras", delay_load = list(