remove layer_wrapper(), create_wrapper, KerasWrapper

rstudio · Oct 11, 2023 · e7fdfac · e7fdfac
1 parent ff7d4bc
commit e7fdfac
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 268 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -115,7 +115,6 @@ export(constraint_unitnorm)
 export(count_params)
 export(create_layer)
 export(create_layer_wrapper)
-export(create_wrapper)
 export(custom_metric)
 export(dataset_boston_housing)
 export(dataset_cifar10)
@@ -485,7 +484,6 @@ export(layer_unit_normalization)
 export(layer_upsampling_1d)
 export(layer_upsampling_2d)
 export(layer_upsampling_3d)
-export(layer_wrapper)
 export(layer_zero_padding_1d)
 export(layer_zero_padding_2d)
 export(layer_zero_padding_3d)

diff --git a/R/autogen-layers-core.R b/R/autogen-layers-core.R
@@ -758,40 +758,3 @@ function (object, mask_value = 0, ...)
         ignore = "object")
     create_layer(keras$layers$Masking, object, args)
 }
-
-
-# keras$layers$Wrapper
-# keras_core.src.layers.core.wrapper.Wrapper
-r"-(Abstract wrapper base class.
-
-    Wrappers take another layer and augment it in various ways.
-    Do not use this class as a layer, it is only an abstract base class.
-    Two usable wrappers are the `TimeDistributed` and `Bidirectional` layers.
-
-    Args:
-        layer: The layer to be wrapped.
-    )-"
-
-
-# keras_core.src.layers.core.wrapper.Wrapper
-#' Abstract wrapper base class.
-#'
-#' @description
-#' Wrappers take another layer and augment it in various ways.
-#' Do not use this class as a layer, it is only an abstract base class.
-#' Two usable wrappers are the `TimeDistributed` and `Bidirectional` layers.
-#'
-#' @param layer The layer to be wrapped.
-#'
-#' @export
-#' @family core layers
-#' @seealso
-#' + <https://www.tensorflow.org/api_docs/python/tf/keras/layers/Wrapper>
-layer_wrapper <-
-function (object, layer, ...)
-{
-    args <- capture_args2(list(input_shape = normalize_shape,
-        batch_size = as_integer, batch_input_shape = normalize_shape),
-        ignore = "object")
-    create_layer(keras$layers$Wrapper, object, args)
-}
diff --git a/R/wrapper_custom.R b/R/wrapper_custom.R
diff --git a/man/create_wrapper.Rd b/man/create_wrapper.Rd
diff --git a/man/layer_dense.Rd b/man/layer_dense.Rd
diff --git a/man/layer_einsum_dense.Rd b/man/layer_einsum_dense.Rd
diff --git a/man/layer_embedding.Rd b/man/layer_embedding.Rd
diff --git a/man/layer_identity.Rd b/man/layer_identity.Rd
diff --git a/man/layer_lambda.Rd b/man/layer_lambda.Rd
diff --git a/man/layer_masking.Rd b/man/layer_masking.Rd
diff --git a/man/layer_wrapper.Rd b/man/layer_wrapper.Rd
diff --git a/tests/testthat/test-custom_wrappers.R b/tests/testthat/test-custom_wrappers.R
@@ -1,7 +1,7 @@
 context("custom-wrappers")
 
 
-
+skip("custom wrappers") # but custom R6 w/ inherits = keras$layers$Wrapper should still work but doesn't...
 # Custom wrapper class
 CustomWrapper <- R6::R6Class(
   "CustomWrapper",

diff --git a/tools/make.R b/tools/make.R
@@ -95,16 +95,20 @@ endpoints <-
   #   # "keras.applications.convnext" is a module, filtered out, has good stuff
   # }) |>
   unlist() %>%
-  setdiff(c("keras.layers.Layer",
-            "keras.layers.InputLayer",
-            "keras.layers.InputSpec",
-            "keras.optimizers.Optimizer",
-            "keras.regularizers.Regularizer",
-            "keras.constraints.Constraint",
-            "keras.initializers.Initializer",
-            "keras.callbacks.CallbackList",
-            "keras.callbacks.History",
-            "keras.callbacks.Callback"))
+  setdiff(c %(% {
+    "keras.layers.Layer"             # only for subclassing
+    "keras.optimizers.Optimizer"     # only for subclassing
+    "keras.regularizers.Regularizer" # only for subclassing
+    "keras.constraints.Constraint"   # only for subclassing
+    "keras.initializers.Initializer" # only for subclassing
+    "keras.callbacks.Callback"       # only for subclassing
+
+    "keras.layers.Wrapper"           # needs thinking
+    "keras.layers.InputLayer"        # use Input instead
+    "keras.layers.InputSpec"         # ??
+    "keras.callbacks.CallbackList"   # just an abstract list
+    "keras.callbacks.History"        # always added to by default
+  })
 
 df <-
   endpoints |>