linter fixes

cbilgin · kirklandsign · commit 94c811436344 · 2024-12-10T23:08:13.000-08:00
diff --git a/backends/xnnpack/test/ops/test_avgpool2d.py b/backends/xnnpack/test/ops/test_avgpool2d.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_bilinear2d.py b/backends/xnnpack/test/ops/test_bilinear2d.py
@@ -106,19 +106,17 @@ def test_fp32_static_resize_bilinear2d(self):
     @unittest.skip('Expected to not find "aten_index_Tensor"')
     def test_fp32_static_resize_bilinear2d_with_align_corners_legacy(self):
         example_inputs = (torch.randn(2, 3, 4, 5),)
-        for legacy in (True, False):
-            tester = Tester(
-                self.StaticResizeBilinear2dModuleWithAlignCorners(), example_inputs
-            )
-            tester.export()
-            tester.to_edge()
-            tester.partition()
-            tester.to_edge_transform_and_lower()
-            tester.check_not(self.ops)
-            tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
-            tester.to_executorch()
-            tester.serialize()
-            tester.run_method_and_compare_outputs()
+        tester = Tester(
+            self.StaticResizeBilinear2dModuleWithAlignCorners(), example_inputs
+        )
+        tester.export()
+        tester.to_edge()
+        tester.partition()
+        tester.check_not(self.ops)
+        tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
+        tester.to_executorch()
+        tester.serialize()
+        tester.run_method_and_compare_outputs()
 
     def test_fp32_static_resize_bilinear2d_with_align_corners(self):
         example_inputs = (torch.randn(2, 3, 4, 5),)
diff --git a/backends/xnnpack/test/ops/test_ceil.py b/backends/xnnpack/test/ops/test_ceil.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_conv2d.py b/backends/xnnpack/test/ops/test_conv2d.py
@@ -10,7 +10,6 @@
 
 import torch
 
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.test_xnnpack_utils import randomize_bn
 from executorch.backends.xnnpack.test.tester import Quantize, Tester
 from torch.ao.quantization.quantizer.xnnpack_quantizer import (
diff --git a/backends/xnnpack/test/ops/test_div.py b/backends/xnnpack/test/ops/test_div.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_hardswish.py b/backends/xnnpack/test/ops/test_hardswish.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_hardtanh.py b/backends/xnnpack/test/ops/test_hardtanh.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_lstm.py b/backends/xnnpack/test/ops/test_lstm.py
@@ -24,7 +24,7 @@ def __init__(self, input_size, hidden_size, out_size):
             self.linear2 = torch.nn.Linear(hidden_size, out_size)
 
         def forward(self, x):
-            x, hs = self.lstm(x)
+            x, _ = self.lstm(x)
             x = self.linear(x[:, -1, :])
             x = self.linear2(x)
             return torch.nn.functional.log_softmax(x, dim=1)
diff --git a/backends/xnnpack/test/ops/test_mean_dim.py b/backends/xnnpack/test/ops/test_mean_dim.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
@@ -92,7 +90,11 @@ def test_qs8_mean_dim(self):
                     torch.ops.quantized_decomposed.quantize_per_tensor.default: 3,
                 }
             )
-            tester.to_edge_transform_and_lower()
+            if legacy:
+                tester.to_edge()
+                tester.partition()
+            else:
+                tester.to_edge_transform_and_lower()
             tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             tester.check_not(
                 [
diff --git a/backends/xnnpack/test/ops/test_minimum.py b/backends/xnnpack/test/ops/test_minimum.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_multiply.py b/backends/xnnpack/test/ops/test_multiply.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_permute.py b/backends/xnnpack/test/ops/test_permute.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_pow.py b/backends/xnnpack/test/ops/test_pow.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
@@ -27,7 +25,11 @@ def _test_pow2(self, inputs):
             tester = Tester(self.Pow(2), inputs)
             tester.export()
             tester.check_count({"torch.ops.aten.pow.Tensor_Scalar": 1})
-            tester.to_edge_transform_and_lower()
+            if legacy:
+                tester.to_edge()
+                tester.partition()
+            else:
+                tester.to_edge_transform_and_lower()
             tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             tester.check_not(
                 ["executorch_exir_dialects_edge__ops_aten_pow_Tensor_Scalar"]
diff --git a/backends/xnnpack/test/ops/test_prelu.py b/backends/xnnpack/test/ops/test_prelu.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_quantize_per_tensor.py b/backends/xnnpack/test/ops/test_quantize_per_tensor.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 from executorch.exir.dialects._ops import ops as exir_ops
diff --git a/backends/xnnpack/test/ops/test_relu.py b/backends/xnnpack/test/ops/test_relu.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_sdpa.py b/backends/xnnpack/test/ops/test_sdpa.py
@@ -10,8 +10,6 @@
 import torch
 from executorch.backends.xnnpack.partition.config.generic_node_configs import SDPAConfig
 from executorch.backends.xnnpack.partition.xnnpack_partitioner import XnnpackPartitioner
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 from executorch.backends.xnnpack.test.tester.tester import ToEdgeTransformAndLower
 
diff --git a/backends/xnnpack/test/ops/test_softmax.py b/backends/xnnpack/test/ops/test_softmax.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_sqrt.py b/backends/xnnpack/test/ops/test_sqrt.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_square.py b/backends/xnnpack/test/ops/test_square.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
diff --git a/backends/xnnpack/test/ops/test_static_constant_pad.py b/backends/xnnpack/test/ops/test_static_constant_pad.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 
@@ -164,7 +162,11 @@ def test_qs8_static_constant_pad_2d(self):
             tester.export()
             tester.check_count({"torch.ops.aten.pad.default": 1})
             tester.check(["torch.ops.quantized_decomposed"])
-            tester.to_edge_transform_and_lower()
+            if legacy:
+                tester.to_edge()
+                tester.partition()
+            else:
+                tester.to_edge_transform_and_lower()
             tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             tester.check_not(
                 [
diff --git a/backends/xnnpack/test/ops/test_sub.py b/backends/xnnpack/test/ops/test_sub.py
@@ -7,8 +7,6 @@
 import unittest
 
 import torch
-
-from executorch.backends.xnnpack.test import tester
 from executorch.backends.xnnpack.test.tester import Tester
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`import unittest`
`8`	`8`
`9`	`9`	`import torch`
`10`		`-`
`11`		`-from executorch.backends.xnnpack.test import tester`
`12`	`10`	`from executorch.backends.xnnpack.test.tester import Tester`
`13`	`11`
`14`	`12`
`@@ -92,7 +90,11 @@ def test_qs8_mean_dim(self):`
`92`	`90`	`torch.ops.quantized_decomposed.quantize_per_tensor.default: 3,`
`93`	`91`	`}`
`94`	`92`	`)`
`95`		`- tester.to_edge_transform_and_lower()`
	`93`	`+ if legacy:`
	`94`	`+ tester.to_edge()`
	`95`	`+ tester.partition()`
	`96`	`+ else:`
	`97`	`+ tester.to_edge_transform_and_lower()`
`96`	`98`	`tester.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})`
`97`	`99`	`tester.check_not(`
`98`	`100`	`[`