Skip to content

Commit

Permalink
Merge pull request #345 from dfalbel/release/1.14.0
Browse files Browse the repository at this point in the history
last changes before release
  • Loading branch information
dfalbel committed Aug 1, 2019
2 parents b41c636 + 664f37c commit 4f7ffb6
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Expand Up @@ -15,3 +15,4 @@ run_tests.sh
testenv
MNIST-data
^appveyor\.yml$
^CRAN-RELEASE$
4 changes: 1 addition & 3 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: tensorflow
Type: Package
Title: R Interface to 'TensorFlow'
Version: 1.13.1.9000
Version: 1.14.0
Authors@R: c(
person("Daniel", "Falbel", role = c("ctb", "cph", "cre"), email = "daniel@rstudio.com"),
person("JJ", "Allaire", role = c("aut", "cph")),
Expand Down Expand Up @@ -48,5 +48,3 @@ Imports:
Roxygen: list(markdown = TRUE)
Suggests: testthat, keras, tfestimators
RoxygenNote: 6.1.1
Remotes:
rstudio/reticulate
2 changes: 1 addition & 1 deletion NEWS.md
Expand Up @@ -2,7 +2,7 @@

- Upgraded default installed version to 1.14.0

- Refactored the `install_tensorflow` code delegating to `reticulate` (#333)
- Refactored the `install_tensorflow` code delegating to `reticulate` (#333, #341): We completely delegate to installation to `reticulate::py_install`, the main difference is that now the default environment name to install is `r-reticulate` and not `r-tensorflow`.


## TensorFlow 1.13.1 (CRAN)
Expand Down
2 changes: 1 addition & 1 deletion R/install.R
Expand Up @@ -6,7 +6,7 @@
#' method that will work in the local environment. Change the default to force
#' a specific installation method. Note that the "virtualenv" method is not
#' available on Windows (as this isn't supported by TensorFlow). Note also
#' that since this command runs without privillege the "system" method is
#' that since this command runs without privilege the "system" method is
#' available only on Windows.
#'
#' @param version TensorFlow version to install. Specify "default" to install
Expand Down
2 changes: 1 addition & 1 deletion R/package.R
Expand Up @@ -48,7 +48,7 @@ tf_v2 <- function() {

priority = 5,

environment = "r-tensorflow",
environment = "r-reticulate",

on_load = function() {

Expand Down
2 changes: 1 addition & 1 deletion R/seed.R
Expand Up @@ -26,7 +26,7 @@
#'
#' @section Parallelism: By default the `use_session_with_seed()` function
#' disables GPU and CPU parallelism, since both can result in
#' non-determinisitc execution patterns (see
#' non-deterministic execution patterns (see
#' <https://stackoverflow.com/questions/42022950/>). You can optionally enable
#' GPU or CPU parallelism by setting the `disable_gpu` and/or
#' `disable_parallel_cpu` parameters to `FALSE`.
Expand Down
4 changes: 2 additions & 2 deletions man/install_tensorflow.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/use_session_with_seed.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4f7ffb6

Please sign in to comment.