Back out "Tests failing for exp op in xnnpack"

backends/xnnpack/operators/__init__.py

@@ -19,7 +19,6 @@
     op_dynamic_dequantize_ops,
     op_dynamic_quantize_ops,
     op_elu,
-    op_exp,
     op_floor,
     op_gelu,
     op_hardswish,

backends/xnnpack/partition/config/__init__.py

@@ -25,11 +25,10 @@
     ConstantPadConfig,
     DeQuantizedPerTensorConfig,
     DivConfig,
-    # EluConfig,
-    # ExpConfig, # Bug in XNNPACK with exp op
     FloorConfig,
     GeluConfig,
     HardswishConfig,
+    # EluConfig,
     HardtanhConfig,
     LeakyReLUConfig,
     LogConfig,
@@ -81,7 +80,6 @@
     ClampConfig,
     DivConfig,
     # EluConfig, # Waiting for PyTorch Pin Update
-    # ExpConfig, # Bug in XNNPACK with exp op
     FloorConfig,
     GeluConfig,
     HardtanhConfig,

backends/xnnpack/partition/config/generic_node_configs.py

@@ -336,13 +336,6 @@ def get_original_aten(self) -> Optional[torch._ops.OpOverload]:
         return torch.ops.aten.upsample_bilinear2d.vec
 
 
-class ExpConfig(GenericNodePartitionerConfig):
-    target_name = "exp.default"
-
-    def supported_precision_types(self) -> List[ConfigPrecisionType]:
-        return [ConfigPrecisionType.FP32]
-
-
 class FloorConfig(GenericNodePartitionerConfig):
     target_name = "floor.default"
 

backends/xnnpack/partition/configs.py

@@ -59,7 +59,6 @@
     exir_ops.edge.aten.sigmoid.default,
     exir_ops.edge.aten._softmax.default,
     exir_ops.edge.aten.cat.default,
-    # exir_ops.edge.aten.exp.default, # Bug in XNNPACK with exp op
     exir_ops.edge.aten.elu.default,
     exir_ops.edge.aten.avg_pool2d.default,
     exir_ops.edge.aten.leaky_relu.default,

backends/xnnpack/runtime/XNNCompiler.cpp

@@ -1761,36 +1761,6 @@ Error defineELUNode(
   return Error::Ok;
 }
 
-/*
-Define serialized exp node into the subgraph, using the remapped ids
-to map the serialized ids, to the new ids generated when defining the
-tensor value
-*/
-Error defineExpNode(
-    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_XNNExp();
-
-  xnn_status status = xnn_define_exp(
-      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 exp node %i with code: %s",
-      node->debug_handle(),
-      xnn_status_to_string(status));
-
-  return Error::Ok;
-}
-
 /*
 Defines absolute value node into subgraph using the remapped ids to map the
 serialized ids to the new ids generated when defining the tensor value
@@ -2151,7 +2121,6 @@ DefineNodeFunc getDefineNodeFunc(fb_xnnpack::XNodeUnion nodeType) {
     _DEFINE(Negate)
     _DEFINE(Square)
     _DEFINE(ELU)
-    _DEFINE(Exp)
     _DEFINE(Abs)
     _DEFINE(PReLU)
     _DEFINE(Concatenate2)

backends/xnnpack/serialization/runtime_schema.fbs

@@ -141,7 +141,6 @@ union XNodeUnion {
   XNNNegate: _XNNNode1x1,
   XNNSquare: _XNNNode1x1,
   XNNELU,
-  XNNExp: _XNNNode1x1,
   XNNAbs: _XNNNode1x1,
   XNNPReLU: _XNNNode2x1,
   XNNConcatenate2: _XNNCat,

backends/xnnpack/serialization/schema.fbs

@@ -137,7 +137,6 @@ union XNodeUnion {
   XNNNegate: _XNNNode1x1,
   XNNSquare: _XNNNode1x1,
   XNNELU,
-  XNNExp: _XNNNode1x1,
   XNNAbs: _XNNNode1x1,
   XNNPReLU: _XNNNode2x1,
   XNNConcatenate2: _XNNCat,

backends/xnnpack/serialization/xnnpack_graph_schema.py

@@ -291,11 +291,6 @@ class XNNCeiling(XNNNode1x1):
     pass
 
 
-@dataclass
-class XNNExp(XNNNode1x1):
-    pass
-
-
 @dataclass
 class XNNGelu(XNNNode1x1):
     pass