From cb4d702be9b884fb1753bc559abb24205a496c2c Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 15 Feb 2021 10:43:33 -0300 Subject: [PATCH 1/5] update to tf 2.4 by default --- R/install.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/install.R b/R/install.R index 50a2ff57..0dbad5e1 100644 --- a/R/install.R +++ b/R/install.R @@ -44,7 +44,7 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"), envname = NULL, extra_packages = NULL, restart_session = TRUE, - conda_python_version = "3.6", + conda_python_version = "3.8", ...) { # verify 64-bit @@ -84,7 +84,7 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"), parse_tensorflow_version <- function(version) { - default_version <- "2.2.0" + default_version <- "2.4" ver <- list( version = default_version, From 293cf7148912500600d2957814fd16ec78faa766 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 15 Feb 2021 15:23:04 -0300 Subject: [PATCH 2/5] re-document --- DESCRIPTION | 2 +- man/install_tensorflow.Rd | 6 +++--- man/reexports.Rd | 4 ++-- man/tf.Rd | 4 +++- man/tf_extract_opts.Rd | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index fbbc137a..ad437f0c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,7 +51,7 @@ Suggests: keras, tfestimators, callr -RoxygenNote: 7.0.2 +RoxygenNote: 7.1.1 Config/reticulate: list( packages = list( diff --git a/man/install_tensorflow.Rd b/man/install_tensorflow.Rd index 832fe2d8..a024142a 100644 --- a/man/install_tensorflow.Rd +++ b/man/install_tensorflow.Rd @@ -11,7 +11,7 @@ install_tensorflow( envname = NULL, extra_packages = NULL, restart_session = TRUE, - conda_python_version = "3.6", + conda_python_version = "3.8", ... ) } @@ -49,8 +49,8 @@ only occur within RStudio).} \item{conda_python_version}{the python version installed in the created conda environment. Python 3.6 is installed by default.} -\item{...}{other arguments passed to \code{\link[reticulate:conda_install]{reticulate::conda_install()}} or -\code{\link[reticulate:virtualenv_install]{reticulate::virtualenv_install()}}.} +\item{...}{other arguments passed to \code{\link[reticulate:conda-tools]{reticulate::conda_install()}} or +\code{\link[reticulate:virtualenv-tools]{reticulate::virtualenv_install()}}.} } \description{ Install TensorFlow and its dependencies diff --git a/man/reexports.Rd b/man/reexports.Rd index ef58fc30..83fc2ec3 100644 --- a/man/reexports.Rd +++ b/man/reexports.Rd @@ -26,8 +26,8 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{reticulate}{\code{\link[reticulate]{\%as\%}}, \code{\link[reticulate]{array_reshape}}, \code{\link[reticulate]{dict}}, \code{\link[reticulate]{import}}, \code{\link[reticulate]{iterate}}, \code{\link[reticulate]{np_array}}, \code{\link[reticulate]{tuple}}, \code{\link[reticulate]{use_condaenv}}, \code{\link[reticulate]{use_python}}, \code{\link[reticulate]{use_virtualenv}}} + \item{reticulate}{\code{\link[reticulate:with-as-operator]{\%as\%}}, \code{\link[reticulate]{array_reshape}}, \code{\link[reticulate]{dict}}, \code{\link[reticulate]{import}}, \code{\link[reticulate]{iterate}}, \code{\link[reticulate]{np_array}}, \code{\link[reticulate]{tuple}}, \code{\link[reticulate:use_python]{use_condaenv}}, \code{\link[reticulate]{use_python}}, \code{\link[reticulate:use_python]{use_virtualenv}}} - \item{tfruns}{\code{\link[tfruns]{flag_boolean}}, \code{\link[tfruns]{flag_integer}}, \code{\link[tfruns]{flag_numeric}}, \code{\link[tfruns]{flag_string}}, \code{\link[tfruns]{flags}}, \code{\link[tfruns]{run_dir}}} + \item{tfruns}{\code{\link[tfruns:flags]{flag_boolean}}, \code{\link[tfruns:flags]{flag_integer}}, \code{\link[tfruns:flags]{flag_numeric}}, \code{\link[tfruns:flags]{flag_string}}, \code{\link[tfruns]{flags}}, \code{\link[tfruns]{run_dir}}} }} diff --git a/man/tf.Rd b/man/tf.Rd index f11eadef..9427e7de 100644 --- a/man/tf.Rd +++ b/man/tf.Rd @@ -4,7 +4,9 @@ \name{tf} \alias{tf} \title{Main TensorFlow module} -\format{TensorFlow module} +\format{ +TensorFlow module +} \usage{ tf } diff --git a/man/tf_extract_opts.Rd b/man/tf_extract_opts.Rd index 35ef365e..2da5b7d7 100644 --- a/man/tf_extract_opts.Rd +++ b/man/tf_extract_opts.Rd @@ -9,7 +9,8 @@ tf_extract_opts( ..., one_based = getOption("tensorflow.extract.one_based", TRUE), inclusive_stop = getOption("tensorflow.extract.inclusive_stop", TRUE), - disallow_out_of_bounds = getOption("tensorflow.extract.dissallow_out_of_bounds", TRUE), + disallow_out_of_bounds = getOption("tensorflow.extract.dissallow_out_of_bounds", + TRUE), warn_tensors_passed_asis = getOption("tensorflow.extract.warn_tensors_passed_asis", TRUE), warn_negatives_pythonic = getOption("tensorflow.extract.warn_negatives_pythonic", From 79ebac7db9299412c14339e993303d2e625982b3 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 15 Feb 2021 20:19:51 -0300 Subject: [PATCH 3/5] use 3.7 to support other versions --- R/install.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/install.R b/R/install.R index 0dbad5e1..366f811c 100644 --- a/R/install.R +++ b/R/install.R @@ -44,7 +44,7 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"), envname = NULL, extra_packages = NULL, restart_session = TRUE, - conda_python_version = "3.8", + conda_python_version = "3.7", ...) { # verify 64-bit From 4f2b53624cd1a2f321c7127cdeea5fdf2c42707c Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 15 Feb 2021 20:20:55 -0300 Subject: [PATCH 4/5] add daily run + dont run ci on push to non master branch --- .github/workflows/main.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e7e3bc86..3aa08d35 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,4 +1,10 @@ -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + schedule: + - cron: '0 1 * * *' name: R-CMD-check From f86e32caad6a89241f4561de43d531f1aa3ef763 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Wed, 17 Feb 2021 09:16:25 -0300 Subject: [PATCH 5/5] redocument --- man/install_tensorflow.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/install_tensorflow.Rd b/man/install_tensorflow.Rd index a024142a..a8606c55 100644 --- a/man/install_tensorflow.Rd +++ b/man/install_tensorflow.Rd @@ -11,7 +11,7 @@ install_tensorflow( envname = NULL, extra_packages = NULL, restart_session = TRUE, - conda_python_version = "3.8", + conda_python_version = "3.7", ... ) }