Skip to content

Commit fb938d8

Browse files
committed
simplify install_keras(), fix arm mac install
1 parent 5b3fb54 commit fb938d8

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

R/install.R

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,12 @@ install_keras <- function(method = c("auto", "virtualenv", "conda"),
2424
version = "default",
2525
tensorflow = version,
2626
extra_packages = NULL,
27-
...,
28-
# envname = "r-keras",
29-
# new_env = identical(envname, "r-keras"),
30-
pip_ignore_installed = TRUE) {
27+
...
28+
# # envname = "r-keras",
29+
# # new_env = identical(envname, "r-keras")
30+
) {
3131
method <- match.arg(method)
3232

33-
if(is_mac_arm64()) {
34-
return(tensorflow::install_tensorflow(
35-
method = method,
36-
conda = conda,
37-
version = version,
38-
extra_packages = c(default_extra_packages(),
39-
extra_packages),
40-
...))
41-
}
42-
4333
pkgs <- default_extra_packages(tensorflow)
4434
if(!is.null(extra_packages)) # user supplied package version constraints take precedence
4535
pkgs[gsub("[=<>~]{1,2}[0-9.]+$", "", extra_packages)] <- extra_packages
@@ -57,7 +47,6 @@ install_keras <- function(method = c("auto", "virtualenv", "conda"),
5747
extra_packages = pkgs,
5848
# envname = envname,
5949
# new_env = new_env,
60-
pip_ignore_installed = pip_ignore_installed,
6150
...
6251
)
6352
}

man/install_keras.Rd

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)