simplify install_keras(), fix arm mac install

rstudio · Aug 11, 2023 · fb938d8 · fb938d8
1 parent 5b3fb54
commit fb938d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/R/install.R b/R/install.R
@@ -24,22 +24,12 @@ install_keras <- function(method = c("auto", "virtualenv", "conda"),
                           version = "default",
                           tensorflow = version,
                           extra_packages = NULL,
-                          ...,
-                          # envname = "r-keras",
-                          # new_env = identical(envname, "r-keras"),
-                          pip_ignore_installed = TRUE) {
+                          ...
+                          # # envname = "r-keras",
+                          # # new_env = identical(envname, "r-keras")
+                          ) {
   method <- match.arg(method)
 
-  if(is_mac_arm64()) {
-    return(tensorflow::install_tensorflow(
-      method = method,
-      conda = conda,
-      version = version,
-      extra_packages = c(default_extra_packages(),
-                         extra_packages),
-      ...))
-  }
-
   pkgs <- default_extra_packages(tensorflow)
   if(!is.null(extra_packages)) # user supplied package version constraints take precedence
     pkgs[gsub("[=<>~]{1,2}[0-9.]+$", "", extra_packages)] <- extra_packages
@@ -57,7 +47,6 @@ install_keras <- function(method = c("auto", "virtualenv", "conda"),
     extra_packages = pkgs,
     # envname = envname,
     # new_env = new_env,
-    pip_ignore_installed = pip_ignore_installed,
     ...
   )
 }

diff --git a/man/install_keras.Rd b/man/install_keras.Rd