Remove explicit MemoryFormatOpsPass transform from clone_dim_order tests

Author: keyprocedure

exir/tests/test_memory_format_ops_pass.py

@@ -23,14 +23,12 @@
     is_contiguous_dim_order,
 )
 from executorch.exir.pass_base import ExportPass, ProxyValue
-from executorch.exir.passes.memory_format_ops_pass import MemoryFormatOpsPass
 
 from executorch.exir.tests.test_memory_format_ops_pass_utils import (
     AmbiguousDimOrderError,
     MemoryFormatOpsPassTestUtils,
     MemoryFormatTestSet,
     PropagateToCopyChannalsLastModule,
-    SimpleCloneChannelsLastModule,
     SimpleEmptyChannelLastModule,
     SimpleEmptyContiguoustModule,
     SimpleToCopyChannelsLastModule,
@@ -327,6 +325,58 @@ def call_operator(self, op, args, kwargs, meta):
         self.assertTrue(is_contiguous_dim_order(actual))
         self.assertTrue(is_contiguous_dim_order(expected))
 
+    def test_op_clone_replacement_channels_last_survives(self):
+        _clone_dim_order_op_str = (
+            "executorch_exir_dialects_edge__ops_dim_order_ops__clone_dim_order_default"
+        )
+
+        model = SimpleCloneChannelsLastModule()
+        x = torch.randn(3, 4, 5, 6).to(memory_format=torch.contiguous_format)
+
+        exported = export(model.eval(), (x,), strict=True)
+        before_epm = to_edge(
+            exported, compile_config=EdgeCompileConfig(_skip_dim_order=False)
+        )
+
+        updated_epm = before_epm.transform([RemoveCloneOpsTransform()])
+
+        FileCheck().check_count(_clone_dim_order_op_str, 1, exactly=True).run(
+            updated_epm.exported_program().graph_module.code
+        )
+
+        expected = before_epm.exported_program().module()(x)
+        actual = updated_epm.exported_program().module()(x)
+        assert torch.allclose(actual, expected)
+        assert is_channel_last_dim_order(actual)
+
+    def test_op_clone_without_transformation_removed(self):
+        _clone_dim_order_op_str = (
+            "executorch_exir_dialects_edge__ops_dim_order_ops__clone_dim_order_default"
+        )
+
+        model = SimpleCloneChannelsLastModule()
+        x = torch.randn(3, 4, 5, 6).to(memory_format=torch.channels_last)
+
+        exported = export(model.eval(), (x,), strict=True)
+        before_epm = to_edge(
+            exported, compile_config=EdgeCompileConfig(_skip_dim_order=False)
+        )
+
+        FileCheck().check_count(_clone_dim_order_op_str, 1, exactly=True).run(
+            before_epm.exported_program().graph_module.code
+        )
+
+        updated_epm = before_epm.transform([RemoveCloneOpsTransform()])
+
+        FileCheck().check_not(_clone_dim_order_op_str).run(
+            updated_epm.exported_program().graph_module.code
+        )
+
+        expected = before_epm.exported_program().module()(x)
+        actual = updated_epm.exported_program().module()(x)
+        assert torch.allclose(actual, expected)
+        assert is_channel_last_dim_order(actual)
+
     def test_resnet18(self) -> None:
         model = torchvision.models.resnet18()
         MemoryFormatOpsPassTestUtils.memory_format_test_runner(
@@ -392,56 +442,3 @@ def test_mobilenet_v3_xnnpack(self) -> None:
                 rtol=1e-3,
             ),
         )
-
-    def test_op_clone_replacement_channels_last_survives(self):
-        clone_dim_order_op_str = (
-            "executorch_exir_dialects_edge__ops_dim_order_ops__clone_dim_order_default"
-        )
-
-        model = SimpleCloneChannelsLastModule()
-        x = torch.randn(3, 4, 5, 6).to(memory_format=torch.contiguous_format)
-
-        exported = export(model.eval(), (x,), strict=True)
-        before_epm = to_edge(
-            exported, compile_config=EdgeCompileConfig(_skip_dim_order=False)
-        )
-
-        updated_epm = before_epm.transform([MemoryFormatOpsPass()])
-        updated_epm = updated_epm.transform([RemoveCloneOpsTransform()])
-
-        FileCheck().check_count(clone_dim_order_op_str, 1, exactly=True).run(
-            updated_epm.exported_program().graph_module.code
-        )
-
-        expected = before_epm.exported_program().module()(x)
-        actual = updated_epm.exported_program().module()(x)
-        assert torch.allclose(actual, expected)
-        assert is_channel_last_dim_order(actual)
-
-    def test_op_clone_without_transformation_removed(self):
-        clone_dim_order_op_str = (
-            "executorch_exir_dialects_edge__ops_dim_order_ops__clone_dim_order_default"
-        )
-
-        model = SimpleCloneChannelsLastModule()
-        x = torch.randn(3, 4, 5, 6).to(memory_format=torch.channels_last)
-
-        exported = export(model.eval(), (x,), strict=True)
-        before_epm = to_edge(
-            exported, compile_config=EdgeCompileConfig(_skip_dim_order=False)
-        )
-
-        updated_epm = before_epm.transform([MemoryFormatOpsPass()])
-        FileCheck().check_count(clone_dim_order_op_str, 1, exactly=True).run(
-            updated_epm.exported_program().graph_module.code
-        )
-
-        updated_epm = updated_epm.transform([RemoveCloneOpsTransform()])
-        FileCheck().check_not(clone_dim_order_op_str).run(
-            updated_epm.exported_program().graph_module.code
-        )
-
-        expected = before_epm.exported_program().module()(x)
-        actual = updated_epm.exported_program().module()(x)
-        assert torch.allclose(actual, expected)
-        assert is_channel_last_dim_order(actual)