Skip to content

Commit d357c68

Browse files
authored
Merge pull request #889 from dfalbel/prepare-release
Prepare 2.2.5.0 release
2 parents b76a0e2 + 07a7406 commit d357c68

21 files changed

+93
-23
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@
3434
^logo.png$
3535

3636
^appveyor\.yml$
37+
^CRAN-RELEASE$

DESCRIPTION

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: keras
22
Type: Package
33
Title: R Interface to 'Keras'
4-
Version: 2.2.4.1.9001
4+
Version: 2.2.5.0
55
Authors@R: c(
66
person("Daniel", "Falbel", role = c("ctb", "cph", "cre"), email = "[email protected]"),
77
person("JJ", "Allaire", role = c("aut", "cph")),
@@ -28,7 +28,7 @@ Depends:
2828
Imports:
2929
generics (>= 0.0.1),
3030
reticulate (>= 1.10),
31-
tensorflow (>= 1.13.1),
31+
tensorflow (>= 2.0.0),
3232
tfruns (>= 1.0),
3333
magrittr,
3434
zeallot,
@@ -45,7 +45,4 @@ SystemRequirements: Keras >= 2.0 (https://keras.io)
4545
Roxygen: list(markdown = TRUE)
4646
RoxygenNote: 6.1.1
4747
VignetteBuilder: knitr
48-
Remotes:
49-
rstudio/reticulate,
50-
rstudio/tensorflow
5148

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ export(layer_zero_padding_1d)
362362
export(layer_zero_padding_2d)
363363
export(layer_zero_padding_3d)
364364
export(load_model_hdf5)
365+
export(load_model_tf)
365366
export(load_model_weights_hdf5)
366367
export(load_model_weights_tf)
367368
export(load_text_tokenizer)
@@ -431,6 +432,7 @@ export(regularizer_l2)
431432
export(reset_states)
432433
export(run_dir)
433434
export(save_model_hdf5)
435+
export(save_model_tf)
434436
export(save_model_weights_hdf5)
435437
export(save_model_weights_tf)
436438
export(save_text_tokenizer)

R/initializers.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ initializer_identity <- function(gain = 1.0) {
227227
#'
228228
#' @section References:
229229
#' - [Self-Normalizing Neural Networks](https://arxiv.org/abs/1706.02515)
230-
#' - [Efficient Backprop](http://yann.lecun.com/exdb/publis/pdf/lecun-98b.pdf)
230+
#' - Efficient Backprop, \cite{LeCun, Yann et al. 1998}
231231
#'
232232
#' @family initializers
233233
#'
@@ -356,7 +356,6 @@ initializer_he_uniform <- function(seed = NULL) {
356356
#' @inheritParams initializer_random_normal
357357
#'
358358
#' @section References: LeCun 98, Efficient Backprop,
359-
#' http://yann.lecun.com/exdb/publis/pdf/lecun-98b.pdf
360359
#'
361360
#' @family initializers
362361
#'

man/get_weights.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/initializer_lecun_normal.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/initializer_lecun_uniform.Rd

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/model_to_json.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/model_to_yaml.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/save_model_hdf5.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)