Skip to content

Commit 1c08139

Browse files
authored
Merge pull request #1308 from rstudio/release/2.8
Release/2.8
2 parents 16572fb + bb260e8 commit 1c08139

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
continue-on-error: ${{ matrix.tf == 'nightly' || contains(matrix.tf, 'rc') || matrix.r == 'devel' }}
5555
env:
5656
R_REMOTES_NO_ERRORS_FROM_WARNINGS: 'true'
57-
R_COMPILE_AND_INSTALL_PACKAGES: 'never'
57+
# R_COMPILE_AND_INSTALL_PACKAGES: 'never' # commented out until CRAN builds TF 2.8
5858
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
5959

6060
steps:
@@ -82,7 +82,7 @@ jobs:
8282
id: r-package-cache
8383
with:
8484
path: ${{ env.R_LIBS_USER }}
85-
key: ${{ matrix.os }}-${{ steps.setup-r.outputs.installed-r-version }}-${{ steps.get-date.outputs.year-week }}-2
85+
key: ${{ matrix.os }}-${{ steps.setup-r.outputs.installed-r-version }}-${{ steps.get-date.outputs.year-week }}-3
8686

8787
- name: Install remotes
8888
if: steps.r-package-cache.outputs.cache-hit != 'true'

DESCRIPTION

Lines changed: 1 addition & 4 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.7.0.9000
4+
Version: 2.8.0
55
Authors@R: c(
66
person("Tomasz", "Kalinowski", role = c("ctb", "cph", "cre"),
77
email = "[email protected]"),
@@ -51,6 +51,3 @@ Suggests:
5151
Roxygen: list(markdown = TRUE, r6 = FALSE)
5252
RoxygenNote: 7.1.2
5353
VignetteBuilder: knitr
54-
Remotes:
55-
rstudio/reticulate,
56-
rstudio/tensorflow

NEWS.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
# keras (development version)
1+
# keras 2.8.0
22

33
- Breaking change: The semantics of passing a named list to `keras_model()` have changed.
44

55
Previously, `keras_model()` would `unname()` supplied `inputs` and `outputs`.
66
Then, if a named list was passed to subsequent
77
`fit()`/`evaluate()`/`call()`/`predict()` invocations,
8-
matching of `x` and `y` was done to the model's `tensor$name`'s.
9-
Now, matching is done to `names()` of `inputs` and/or `outputs`.
8+
matching of `x` and `y` was done to the model's input and outpt `tensor$name`'s.
9+
Now, matching is done to `names()` of `inputs` and/or `outputs` supplied to `keras_model()`.
1010
Call `unname()` on `inputs` and `outputs` to restore the old behavior, e.g.:
11-
```keras_model(unname(inputs), unname(outputs))```
11+
```
12+
keras_model(unname(inputs), unname(outputs))
13+
```
1214
1315
`keras_model()` can now accept a named list for multi-input and/or multi-output
14-
models. (Requires Tensorflow >= 2.4). The named list is converted to a `dict` in python.
16+
models. The named list is converted to a `dict` in python.
17+
(Requires Tensorflow >= 2.4, Python >= 3.7).
1518
1619
If `inputs` is a named list:
1720
- `call()`, `fit()`, `evaluate()`, and `predict()` methods can also
@@ -26,14 +29,19 @@
2629
2730
- New layer `layer_depthwise_conv_1d()`.
2831
29-
- Models gain default `format()` and `print()` S3 methods for compatibility
32+
- Models gain `format()` and `print()` S3 methods for compatibility
3033
with the latest reticulate. Both are powered by `model$summary()`.
3134
35+
- `summary()` method for Models gains arguments `expand_nested` and `show_trainable`,
36+
both default to `FALSE`.
37+
3238
- `keras_model_custom()` is soft deprecated. Please define custom models by
3339
subclassing `keras$Model` directly using `%py_class%` or `R6::R6Class()`.
3440
3541
- Fixed warning issued by `k_random_binomial()`.
42+
3643
- Fixed error raised when `k_random_binomial()` was passed a non-floating dtype.
44+
3745
- Added `k_random_bernouli()` as an alias for `k_random_binomial()`.
3846
3947
- `image_load()` gains a `color_mode` argument.

R/layers-recurrent.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ layer_cudnn_gru <- function(object, units,
239239
#' @template roxlate-recurrent-layer
240240
#'
241241
#' @section References:
242-
#' - [Long short-term memory](https://www.bioinf.jku.at/publications/older/2604.pdf) (original 1997 paper)
242+
#' - [Long short-term memory](http://www.bioinf.jku.at/publications/older/2604.pdf) (original 1997 paper)
243243
#' - [Supervised sequence labeling with recurrent neural networks](https://www.cs.toronto.edu/~graves/preprint.pdf)
244244
#' - [A Theoretically Grounded Application of Dropout in Recurrent Neural Networks](https://arxiv.org/abs/1512.05287)
245245
#'
@@ -291,7 +291,7 @@ function(object,
291291
#' @inheritParams layer_dense
292292
#'
293293
#' @section References:
294-
#' - [Long short-term memory](https://www.bioinf.jku.at/publications/older/2604.pdf) (original 1997 paper)
294+
#' - [Long short-term memory](http://www.bioinf.jku.at/publications/older/2604.pdf) (original 1997 paper)
295295
#' - [Supervised sequence labeling with recurrent neural networks](https://www.cs.toronto.edu/~graves/preprint.pdf)
296296
#' - [A Theoretically Grounded Application of Dropout in Recurrent Neural Networks](https://arxiv.org/abs/1512.05287)
297297
#'

man/layer_cudnn_lstm.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/layer_lstm.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.

vignettes/new-guides/working_with_rnns.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ timestep is to be fed to the next timestep.
4949
[Cho et al., 2014](https://arxiv.org/abs/1406.1078).
5050

5151
3. `layer_lstm()`, first proposed in
52-
[Hochreiter & Schmidhuber, 1997](https://www.bioinf.jku.at/publications/older/2604.pdf).
52+
[Hochreiter & Schmidhuber, 1997](http://www.bioinf.jku.at/publications/older/2604.pdf).
5353

5454
Here is a simple example of a sequential model that processes sequences of integers,
5555
embeds each integer into a 64-dimensional vector, then processes the sequence of

0 commit comments

Comments
 (0)