Revert "Milestone3.1: Support tanh op in XNNPACK backend (#11364)"

backends/xnnpack/operators/__init__.py

@@ -51,6 +51,5 @@
     op_static_constant_pad,
     op_static_resize_bilinear_2d,
     op_sub,
-    op_tanh,
     op_to_copy,
 )

backends/xnnpack/partition/config/__init__.py

@@ -50,7 +50,6 @@
     SoftmaxConfig,
     SquareRootConfig,
     SubConfig,
-    TanhConfig,
     UpsampleBilinear2dConfig,
 )
 from executorch.backends.xnnpack.partition.config.node_configs import (
@@ -102,7 +101,6 @@
     PreluConfig,
     ReciprocalSquareRootConfig,
     ReLUConfig,
-    TanhConfig,
     # SDPAConfig, TODO: D60553559: preserving SDPA for fairseq fails
     SigmoidConfig,
     SliceCopyConfig,

backends/xnnpack/partition/config/generic_node_configs.py

@@ -378,13 +378,6 @@ def supported_precision_types(self) -> List[ConfigPrecisionType]:
         return [ConfigPrecisionType.FP32]
 
 
-class TanhConfig(GenericNodePartitionerConfig):
-    target_name = "tanh.default"
-
-    def supported_precision_types(self) -> List[ConfigPrecisionType]:
-        return [ConfigPrecisionType.FP32]
-
-
 class MeanDimConfig(GenericNodePartitionerConfig):
     target_name = "mean.dim"
 

backends/xnnpack/partition/configs.py

@@ -67,7 +67,6 @@
     exir_ops.edge.aten.rsqrt.default,
     exir_ops.edge.aten.log.default,
     exir_ops.edge.aten.gelu.default,
-    exir_ops.edge.aten.tanh.default,
 ]
 
 SUPPORTED_MODULES = [

backends/xnnpack/runtime/XNNCompiler.cpp

@@ -1521,36 +1521,6 @@ Error defineGeluNode(
   return Error::Ok;
 }
 
-/*
-Define serialized tanh node into the subgraph, using the remapped ids
-to map the serialized ids, to the new ids generated when defining the
-tensor value
-*/
-Error defineTanhNode(
-    xnn_subgraph_t subgraph_ptr,
-    const std::unordered_map<uint32_t, uint32_t>& remapped_ids,
-    const NodePtr node,
-    const fb_xnnpack::XNNGraph* graph) noexcept {
-  MAYBE_UNUSED(graph);
-
-  auto graph_node = node->xnode_union_as_XNNTanh();
-
-  xnn_status status = xnn_define_tanh(
-      subgraph_ptr,
-      remapped_ids.at(graph_node->input_id()),
-      remapped_ids.at(graph_node->output_id()),
-      graph_node->flags());
-
-  ET_CHECK_OR_RETURN_ERROR(
-      status == xnn_status_success,
-      Internal,
-      "Failed to create tanh node %i with code: %s",
-      node->debug_handle(),
-      xnn_status_to_string(status));
-
-  return Error::Ok;
-}
-
 /*
 Define serialized ceiling node into the subgraph, using the remapped ids
 to map the serialized ids, to the new ids generated when defining the
@@ -2146,7 +2116,6 @@ DefineNodeFunc getDefineNodeFunc(fb_xnnpack::XNodeUnion nodeType) {
     _DEFINE(Hardswish)
     _DEFINE(LeakyReLU)
     _DEFINE(Log)
-    _DEFINE(Tanh)
     _DEFINE(Maximum)
     _DEFINE(Negate)
     _DEFINE(Square)

backends/xnnpack/serialization/runtime_schema.fbs

@@ -155,7 +155,6 @@ union XNodeUnion {
   XNNReciprocalSquareRoot: _XNNNode1x1,
   XNNLog: _XNNNode1x1,
   XNNGelu: _XNNNode1x1,
-  XNNTanh: _XNNNode1x1,
 }
 
 union XValueUnion {

backends/xnnpack/serialization/schema.fbs

@@ -151,7 +151,6 @@ union XNodeUnion {
   XNNReciprocalSquareRoot: _XNNNode1x1,
   XNNLog: _XNNNode1x1,
   XNNGelu: _XNNNode1x1,
-  XNNTanh: _XNNNode1x1,
 }
 
 union XValueUnion {

backends/xnnpack/serialization/xnnpack_graph_schema.py

@@ -324,11 +324,6 @@ class XNNLog(XNNNode1x1):
     pass
 
 
-@dataclass
-class XNNTanh(XNNNode1x1):
-    pass
-
-
 @dataclass
 class XNNMaximum(XNNNode2x1):
     pass
@@ -401,7 +396,6 @@ class XNNScaledDotProductAttention:
     XNNReciprocalSquareRoot,
     XNNLog,
     XNNGelu,
-    XNNTanh,
 ]