Add sigmoid to one-to-one annotator in ArmQuantizer (#6047)

Summary:
Instead of fixed qspec, sigmoid then becomes annotated with the q-spec from the Quantization fix, similar to other table implemented operators.

This fixes the issues introduced by
#5832

Change-Id: I7afccf2036e3bdabea71d3f90b79a04b7f522e1f

Pull Request resolved: #6047

Reviewed By: mergennachin

Differential Revision: D64426085

Pulled By: digantdesai

fbshipit-source-id: 6854e389b94af44d036c25862acb9c46192f62ea

Author: Erik-Lundell

backends/arm/quantizer/arm_quantizer.py

@@ -267,7 +267,6 @@ class ArmQuantizer(Quantizer):
         "add",
         "sub",
         "mul",
-        "sigmoid",
         "mm",
         "cat",
         "one_to_one",

backends/arm/quantizer/quantization_annotation/__init__.py

@@ -59,6 +59,5 @@ def decorator(annotator: AnnotatorType):
     mm_annotator,
     mul_annotator,
     one_to_one_annotator,
-    sigmoid_annotator,
     sub_annotator,
 )

backends/arm/quantizer/quantization_annotation/one_to_one_annotator.py

@@ -40,6 +40,7 @@ def _annotate_one_to_one(
         torch.ops.aten.log.default,
         torch.ops.aten.reciprocal.default,
         torch.ops.aten.rsqrt.default,
+        torch.ops.aten.sigmoid.default,
     )
     for node in gm.graph.nodes:
         if node.op != "call_function" or node.target not in one_to_one_ops:

backends/arm/quantizer/quantization_annotation/sigmoid_annotator.py

@@ -155,18 +155,12 @@ def test_sigmoid_tosa_BI(self, test_name: str, test_data: torch.Tensor):
     def test_add_sigmoid_tosa_MI(self):
         self._test_sigmoid_tosa_MI_pipeline(self.AddSigmoid(), (test_data_suite[0][1],))
 
-    @unittest.skip(
-        reason="Started to fails when PyTorch 2.5->2.6 https://github.com/pytorch/executorch/issues/5832"
-    )
     def test_add_sigmoid_tosa_BI(self):
-        self._test_sigmoid_tosa_BI_pipeline(self.AddSigmoid(), (test_data_suite[0][1],))
+        self._test_sigmoid_tosa_BI_pipeline(self.AddSigmoid(), (test_data_suite[5][1],))
 
     def test_sigmoid_add_tosa_MI(self):
         self._test_sigmoid_tosa_MI_pipeline(self.SigmoidAdd(), (test_data_suite[0][1],))
 
-    @unittest.skip(
-        reason="Started to fails when PyTorch 2.5->2.6 https://github.com/pytorch/executorch/issues/5832"
-    )
     def test_sigmoid_add_tosa_BI(self):
         self._test_sigmoid_tosa_BI_pipeline(self.SigmoidAdd(), (test_data_suite[0][1],))
 
@@ -175,9 +169,6 @@ def test_sigmoid_add_sigmoid_tosa_MI(self):
             self.SigmoidAddSigmoid(), (test_data_suite[4][1], test_data_suite[3][1])
         )
 
-    @unittest.skip(
-        reason="Started to fails when PyTorch 2.5->2.6 https://github.com/pytorch/executorch/issues/5832"
-    )
     def test_sigmoid_add_sigmoid_tosa_BI(self):
         self._test_sigmoid_tosa_BI_pipeline(
             self.SigmoidAddSigmoid(), (test_data_suite[4][1], test_data_suite[3][1])