From 129b23e78f8838d1d2e77550a8ddeecfe8e51222 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 11 May 2020 11:16:24 -0300 Subject: [PATCH 1/4] update version number --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 38aea9c6..d7fda9f1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tensorflow Type: Package Title: R Interface to 'TensorFlow' -Version: 2.0.0 +Version: 2.2.0 Authors@R: c( person("Daniel", "Falbel", role = c("ctb", "cph", "cre"), email = "daniel@rstudio.com"), person("JJ", "Allaire", role = c("aut", "cph")), From afd245de1883c412fc6260c35cd81e5047f3a22f Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 11 May 2020 11:17:27 -0300 Subject: [PATCH 2/4] install 2.2 by default --- R/install.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/install.R b/R/install.R index 5d666d75..50a2ff57 100644 --- a/R/install.R +++ b/R/install.R @@ -84,7 +84,7 @@ install_tensorflow <- function(method = c("auto", "virtualenv", "conda"), parse_tensorflow_version <- function(version) { - default_version <- "2.1.0" + default_version <- "2.2.0" ver <- list( version = default_version, From 9b9e47a7e117540fe01fb97516dc3910f6e89b63 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 11 May 2020 11:21:54 -0300 Subject: [PATCH 3/4] update NEWS --- NEWS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.md b/NEWS.md index a0641206..a8923b5e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +## TensorFlow 2.2.0 (CRAN) + +- Bugfix with `all_dims` (#398) + +- Indexing for TensorShape & `py_to_r` conversion (#379, #388) + ## TensorFlow 2.0.0 (CRAN) - Upgraded default installed version to 2.0.0. From d9d5bd48cbc7a87666c7301686eae38a02fc7173 Mon Sep 17 00:00:00 2001 From: Daniel Falbel Date: Mon, 11 May 2020 12:39:46 -0300 Subject: [PATCH 4/4] skip test if tensorflow is not installed --- tests/testthat/test-generic-methods.R | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/testthat/test-generic-methods.R b/tests/testthat/test-generic-methods.R index cb0fe4a2..180bb522 100644 --- a/tests/testthat/test-generic-methods.R +++ b/tests/testthat/test-generic-methods.R @@ -84,7 +84,12 @@ for (fun in tensor_generics) { test_generic(deparse(fun), fun, matrix(1:100)) } -expect_identical(length(1L), length(tf$constant(1L))) + +test_that("lenght works", { + skip_if_no_tensorflow() + expect_identical(length(1L), length(tf$constant(1L))) +}) + logical_generics <- list( `==`,