Skip to content

Commit

Permalink
Merge pull request #419 from dfalbel/v2.2.0-rc0
Browse files Browse the repository at this point in the history
V2.2.0 rc0
  • Loading branch information
dfalbel authored May 18, 2020
2 parents 919ba1e + d9d5bd4 commit 5a2c865
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]"),
person("JJ", "Allaire", role = c("aut", "cph")),
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion tests/testthat/test-generic-methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -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(
`==`,
Expand Down

0 comments on commit 5a2c865

Please sign in to comment.