Fix tests broken by 2.7.0rc1

- batch dimensions are no longer
  automatically expanded by predict().

- layer_cropping_1d() is more strict now,
  does not implicitly allow for a dimension
  of size 0 to be returned.

Author: t-kalinowski

tests/testthat/test-Layer.R

@@ -55,7 +55,7 @@ test_succeeds("Can use custom layers in sequential models", {
     layer_multiply_by_x(2) %>%
     layer_multiply_by_x(2)
 
-  out <- predict(model, c(1,2,3,4,5))
+  out <- predict(model, matrix(c(1,2,3,4,5), ncol = 1))
 
   expect_equal(out, matrix(1:5, ncol = 1)*2*2)
 })

tests/testthat/test-layers.R

@@ -257,8 +257,8 @@ test_call_succeeds("layer_zero_padding_3d", {
 test_call_succeeds("layer_cropping_1d", {
   skip_if_cntk() # crashes CNTK
   keras_model_sequential() %>%
-    layer_dense(32, input_shape = c(784)) %>%
-    layer_reshape(target_shape = c(2,16)) %>%
+    layer_dense(64, input_shape = c(784)) %>%
+    layer_reshape(target_shape = c(4,16)) %>%
     layer_cropping_1d()
 })
 

tools/check1

@@ -11,7 +11,7 @@ export TF_CPP_MIN_LOG_LEVEL=2
 
 
 
-TMPDIR="/tmp/r-keras-tests/tf-2.6-cpu/"
+TMPDIR="/tmp/r-keras-tests/tf-2.7-cpu/"
 mkdir -p $TMPDIR
 rsync -a --delete . $TMPDIR
 

tools/setup-test-envs.R

@@ -5,7 +5,7 @@ args <- commandArgs(TRUE)
 if("--fresh" %in% args) # fresh start
   unlink(reticulate::miniconda_path(), recursive = TRUE)
 
-tf_vers <- c("2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7.0rc0",  "nightly")
+tf_vers <- c("2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7.0rc1",  "nightly")
 tf_vers <- paste0(tf_vers, "-cpu")
 py_vers <- c("3.6", "3.6", "3.7", "3.8", "3.8", "3.9", "3.9", "3.9")