review(min_max_to_clip): rename rules

Author: AyoubMDL

onnxscript/rewriter/rules/common/__init__.py

@@ -15,10 +15,10 @@
     "fuse_batchnorm_into_gemm_rule",
     "fuse_pad_into_conv_integer_rule",
     "fuse_pad_into_conv_rule",
-    "fuse_successive_min_rule",
-    "fuse_successive_max_rule",
-    "fuse_successive_min_max_rule",
-    "fuse_successive_max_min_rule",
+    "min_min_rule",
+    "max_max_rule",
+    "min_max_rule",
+    "max_min_rule",
     "gemm_to_matmul_add_rule",
     "matmul_add_to_gemm_rule",
     "mul_by_1_rule",
@@ -94,10 +94,10 @@
     transpose_b_matmul_add_to_gemm_rule,
 )
 from onnxscript.rewriter.rules.common._min_max_to_clip import (
-    fuse_successive_max_min_rule,
-    fuse_successive_max_rule,
-    fuse_successive_min_max_rule,
-    fuse_successive_min_rule,
+    max_max_rule,
+    max_min_rule,
+    min_max_rule,
+    min_min_rule,
 )
 from onnxscript.rewriter.rules.common._no_op import (
     add_0_rule,

onnxscript/rewriter/rules/common/_min_max_to_clip.py

@@ -237,17 +237,17 @@ def pattern(self, op, x):
         )
 
 
-fuse_successive_min_rule = FuseSuccessiveMin().rule()
-fuse_successive_max_rule = FuseSuccessiveMax().rule()
-fuse_successive_min_max_rule = FuseMinMaxToClip().rule()
-fuse_successive_max_min_rule = FuseMaxMinToClip().rule()
+min_min_rule = FuseSuccessiveMin().rule()
+max_max_rule = FuseSuccessiveMax().rule()
+min_max_rule = FuseMinMaxToClip().rule()
+max_min_rule = FuseMaxMinToClip().rule()
 
 
 rules = RewriteRuleSet(
     [
-        fuse_successive_min_rule,
-        fuse_successive_max_rule,
-        fuse_successive_min_max_rule,
-        fuse_successive_max_min_rule,
+        min_min_rule,
+        max_max_rule,
+        min_max_rule,
+        max_min_rule,
     ]
 )

onnxscript/rewriter/rules/common/_min_max_to_clip_test.py

@@ -11,10 +11,10 @@
 
 from onnxscript.rewriter import MatchingTracer, MatchStatus, RewriteRule, testing
 from onnxscript.rewriter.rules.common._min_max_to_clip import (
-    fuse_successive_max_min_rule,
-    fuse_successive_max_rule,
-    fuse_successive_min_max_rule,
-    fuse_successive_min_rule,
+    max_max_rule,
+    max_min_rule,
+    min_max_rule,
+    min_min_rule,
     rules,
 )
 
@@ -154,8 +154,8 @@ def test_successful_fuse_successive_min_or_max_constants(self, _, op_type):
 
     @parameterized.expand(
         [
-            ("min_nonconst", "Min", fuse_successive_min_rule),
-            ("max_nonconst", "Max", fuse_successive_max_rule),
+            ("min_nonconst", "Min", min_min_rule),
+            ("max_nonconst", "Max", max_max_rule),
         ]
     )
     def test_failure_fuse_successive_min_or_max_non_constant(self, _, op_type, rewrite_rule):
@@ -239,9 +239,7 @@ def test_failure_min_max_to_clip_invalid_bounds(self):
                 Y = Max(x1, max)
             }
         """)
-        self.run_failed_condition_test(
-            base_model, fuse_successive_min_max_rule, "Invalid bounds:"
-        )
+        self.run_failed_condition_test(base_model, min_max_rule, "Invalid bounds:")
 
     def test_failure_fuse_min_max_to_clip_non_constant(self):
         model = ir.from_onnx_text("""
@@ -254,9 +252,7 @@ def test_failure_fuse_min_max_to_clip_non_constant(self):
                 Y = Max(x1, max)
             }
         """)
-        self.run_failed_condition_test(
-            model, fuse_successive_min_max_rule, "is not a constant."
-        )
+        self.run_failed_condition_test(model, min_max_rule, "is not a constant.")
 
     def test_failure_min_max_to_clip_need_scalars(self):
         base_model = ir.from_onnx_text("""
@@ -268,9 +264,7 @@ def test_failure_min_max_to_clip_need_scalars(self):
                 Y = Max(x1, max)
             }
         """)
-        self.run_failed_condition_test(
-            base_model, fuse_successive_min_max_rule, "is not a scalar"
-        )
+        self.run_failed_condition_test(base_model, min_max_rule, "is not a scalar")
 
 
 class TestMaxMinToClip(_TestMinMaxToClipBase):
@@ -334,9 +328,7 @@ def test_failure_fuse_max_min_to_clip_non_constant(self):
                 Y = Min(x1, min)
             }
         """)
-        self.run_failed_condition_test(
-            model, fuse_successive_max_min_rule, "is not a constant."
-        )
+        self.run_failed_condition_test(model, max_min_rule, "is not a constant.")
 
     def test_failure_max_min_to_clip_need_scalars(self):
         base_model = ir.from_onnx_text("""
@@ -348,9 +340,7 @@ def test_failure_max_min_to_clip_need_scalars(self):
                 Y = Min(x1, max)
             }
         """)
-        self.run_failed_condition_test(
-            base_model, fuse_successive_max_min_rule, "is not a scalar"
-        )
+        self.run_failed_condition_test(base_model, max_min_rule, "is not a scalar")
 
 
 class TestIntegrationMinMaxToClip(_TestMinMaxToClipBase):