Accept NA in shape argumennts

Author: t-kalinowski

NEWS.md

@@ -13,19 +13,19 @@
     - `layer_stacked_rnn_cells()`
   To learn more, including how to make a custom cell layer, see the new vignette:
   "Working with RNNs".
-  
+
 - New dataset loader `text_dataset_from_directory()`.
 
 - New layers:
     - `layer_additive_attention()`
     - `layer_conv_lstm_1d()`
     - `layer_conv_lstm_3d()`
 
-- `layer_cudnn_gru()` and `layer_cudnn_lstm()` are deprecated. 
+- `layer_cudnn_gru()` and `layer_cudnn_lstm()` are deprecated.
   `layer_gru()` and `layer_lstm()` will automatically use CuDNN if it is available.
 
-- `layer_lstm()` and `layer_gru()`: 
-    default value for `recurrent_activation` changed 
+- `layer_lstm()` and `layer_gru()`:
+    default value for `recurrent_activation` changed
     from `"hard_sigmoid"` to `"sigmoid"`.
 
 - `layer_gru()`: default value `reset_after` changed from `FALSE` to `TRUE`
@@ -35,7 +35,7 @@
 - New applications:
     - MobileNet V3: `application_mobilenet_v3_large()`, `application_mobilenet_v3_small()`
     - ResNet: `application_resnet101()`, `application_resnet152()`, `resnet_preprocess_input()`
-    - ResNet V2:`application_resnet50_v2()`, `application_resnet101_v2()`, 
+    - ResNet V2:`application_resnet50_v2()`, `application_resnet101_v2()`,
                 `application_resnet152_v2()` and `resnet_v2_preprocess_input()`
     - EfficientNet: `application_efficientnet_b{0,1,2,3,4,5,6,7}()`
 
@@ -51,19 +51,23 @@
   `keepdims` argument with default value `FALSE`.
 
 - Signatures for layer functions are in the process of being simplified.
-  Standard layer arguments are moving to `...` where appropriate 
+  Standard layer arguments are moving to `...` where appropriate
   (and will need to be provided as named arguments).
-  Standard layer arguments include: 
-    `input_shape`, `batch_input_shape`, `batch_size`, `dtype`, 
+  Standard layer arguments include:
+    `input_shape`, `batch_input_shape`, `batch_size`, `dtype`,
     `name`, `trainable`, `weights`.
-  Layers updated: 
-    `layer_global_{max,average}_pooling_{1,2,3}d()`, 
+  Layers updated:
+    `layer_global_{max,average}_pooling_{1,2,3}d()`,
     `time_distributed()`, `bidirectional()`,
     `layer_gru()`, `layer_lstm()`, `layer_simple_rnn()`
 
 - All the backend function with a shape argument `k_*(shape =)` that now accept a
   a mix of integer tensors and R numerics in the supplied list.
 
+- All layer functions now accept `NA` as a synonym for `NULL` in arguments
+  that specify shape as a vector of dimension values,
+  e.g., `input_shape`, `batch_input_shape`.
+
 - `k_random_uniform()` now automatically casts `minval` and `maxval` to the output dtype.
 
 # keras 2.6.1

tests/testthat/test-model.R

@@ -126,12 +126,16 @@ test_succeeds("can call model with R objects", {
 })
 
 
-test_succeeds("layer_input() ", {
+test_succeeds("layer_input()", {
   # can take dtype = Dtype
   layer_input(shape = 1, dtype = tf$string)
 
-  expect_identical(as.list(layer_input(shape = c(NA))$shape),
-                   list(NULL, NULL))
+  # can take shape=NA correctly
+  shp <- layer_input(shape = c(NA))$shape
+  if(inherits(shp, "tensorflow.python.framework.tensor_shape.TensorShape"))
+    shp <- shp$as_list()
+
+  expect_identical(shp, list(NULL, NULL))
 })
 
 

tools/test

@@ -10,14 +10,15 @@ export TF_CPP_MIN_LOG_LEVEL=2
   # 3 = INFO, WARNING, and ERROR messages are not printed
 
 
-for i in 2.{4..7} nightly
+for i in 2.{6..7}
+# for i in 2.{4..7} nightly
 # for i in 2.{1..3}
 do
 TMPDIR="/tmp/r-keras-tests/tf-$i/"
 mkdir -p $TMPDIR
 rsync -a --delete . $TMPDIR
 gnome-terminal --title="keras test: tf $i" --working-directory=$TMPDIR -- \
-  Rscript -e "{options(error=recover); cat('\n\n\n'); reticulate::use_miniconda('tf-$i-cpu', required=TRUE); devtools::test(); cat('Done!')}"
+  Rscript -e "{options(error=recover); cat('\n\n\n'); Sys.unsetenv('RETICULATE_PYTHON'); reticulate::use_miniconda('tf-$i-cpu', required=TRUE); devtools::test(); cat('Done!')}"
   # Rscript -e "{cat('\n\n\n'); }"
   # ; scan('stdin',  nlines=1)
 done