Skip to content

Commit 6b6877f

Browse files
committed
add standard layer arguments to layer_separable_conv_2d
1 parent 3f3c921 commit 6b6877f

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ Install the development version with: `install_github("rstudio/keras")`
4646

4747
- Remove deprecated `implementation` argument from recurrent layers
4848

49-
- Support all standard arguments for `layer_flatten()`
50-
5149
- Support for passing generators for validation data in `fit_generator()`
5250

5351
- Accept single integer arguments for kernel sizes
5452

53+
- Add standard layer arguments to `layer_flatten()` and `layer_separable_conv_2d()`
54+
5555

5656
## keras 2.0.8 (CRAN)
5757

R/layers-convolutional.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,9 @@ layer_separable_conv_2d <- function(object, filters, kernel_size, strides = c(1L
469469
depth_multiplier = 1L, activation = NULL, use_bias = TRUE,
470470
depthwise_initializer = "glorot_uniform", pointwise_initializer = "glorot_uniform", bias_initializer = "zeros",
471471
depthwise_regularizer = NULL, pointwise_regularizer = NULL, bias_regularizer = NULL, activity_regularizer = NULL,
472-
depthwise_constraint = NULL, pointwise_constraint = NULL, bias_constraint = NULL,
473-
batch_size = NULL, name = NULL, trainable = NULL, weights = NULL) {
472+
depthwise_constraint = NULL, pointwise_constraint = NULL, bias_constraint = NULL, input_shape = NULL,
473+
batch_input_shape = NULL, batch_size = NULL, dtype = NULL,
474+
name = NULL, trainable = NULL, weights = NULL) {
474475

475476
create_layer(keras$layers$SeparableConv2D, object, list(
476477
filters = as.integer(filters),
@@ -491,7 +492,10 @@ layer_separable_conv_2d <- function(object, filters, kernel_size, strides = c(1L
491492
depthwise_constraint = depthwise_constraint,
492493
pointwise_constraint = pointwise_constraint,
493494
bias_constraint = bias_constraint,
495+
input_shape = normalize_shape(input_shape),
496+
batch_input_shape = normalize_shape(batch_input_shape),
494497
batch_size = as_nullable_integer(batch_size),
498+
dtype = dtype,
495499
name = name,
496500
trainable = trainable,
497501
weights = weights

man/layer_separable_conv_2d.Rd

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)