Skip to content

use py_install directly #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2019
Merged

use py_install directly #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 10 additions & 97 deletions R/install.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
install_tensorflow <- function(method = c("auto", "virtualenv", "conda"),
conda = "auto",
version = "default",
envname = "r-tensorflow",
envname = NULL,
extra_packages = NULL,
restart_session = TRUE,
conda_python_version = "3.6",
Expand All @@ -61,7 +61,6 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"),
package <- ver$package

# Packages in this list should always be installed.

default_packages <- c("tensorflow-hub")

# Resolve TF probability version.
Expand All @@ -74,49 +73,15 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"),

extra_packages <- unique(c(default_packages, extra_packages))

# Main OS verification.
if (is_osx() || is_linux()) {

if (method == "conda") {
install_conda(
package = package,
extra_packages = extra_packages,
envname = envname,
conda = conda,
conda_python_version = conda_python_version,
...
)
} else if (method == "virtualenv" || method == "auto") {
install_virtualenv(
package = package,
extra_packages = extra_packages,
envname = envname,
...
)
}

} else if (is_windows()) {

if (method == "virtualenv") {
stop("Installing TensorFlow into a virtualenv is not supported on Windows",
call. = FALSE)
} else if (method == "conda" || method == "auto") {

install_conda(
package = package,
extra_packages = extra_packages,
envname = envname,
conda = conda,
conda_python_version = conda_python_version,
...
)

}

} else {
stop("Unable to install TensorFlow on this platform. ",
"Binary installation is available for Windows, OS X, and Linux")
}
reticulate::py_install(
packages = c(package, extra_packages),
envname = envname,
method = method,
conda = conda,
python_version = conda_python_version,
pip = TRUE,
...
)

cat("\nInstallation complete.\n\n")

Expand All @@ -126,58 +91,6 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"),
invisible(NULL)
}

install_conda <- function(package, extra_packages, envname, conda, conda_python_version, ...) {

# find if environment exists
envname_exists <- envname %in% reticulate::conda_list(conda = conda)$name

# remove environment
if (envname_exists) {
cat("Removing ", envname, " conda environment... \n")
reticulate::conda_remove(envname = envname, conda = conda)
}


cat("Creating ", envname, " conda environment... \n")
reticulate::conda_create(
envname = envname, conda = conda,
packages = paste0("python=", conda_python_version)
)

cat("Installing python modules...\n")
reticulate::conda_install(
envname = envname,
packages = c(package, extra_packages),
conda = conda,
pip = TRUE, # always use pip since it's the recommend way.
...
)

}

install_virtualenv <- function(package, extra_packages, envname, ...) {

# find if environment exists
envname_exists <- envname %in% reticulate::virtualenv_list()

# remove environment
if (envname_exists) {
cat("Removing ", envname, " virtualenv environment... \n")
reticulate::virtualenv_remove(envname = envname, confirm = FALSE)
}

cat("Creating ", envname, " virtualenv environment... \n")
reticulate::virtualenv_create(envname = envname)

cat("Installing python modules...\n")
reticulate::virtualenv_install(
envname = envname,
packages = c(package, extra_packages),
...
)

}

parse_tensorflow_version <- function(version) {

default_version <- "1.14.0"
Expand Down