Re-org into common folder

Author: Kaiyu Shi

onnxscript/rewriter/rules/common/__init__.py

@@ -2,18 +2,21 @@
 # Licensed under the MIT License.
 __all__ = [
     "add_0_rule",
+    "affine_conv_fusion_rule",
     "cast_cast_rule",
     "cast_constant_of_shape_rule",
     "cast_constant_of_shape_without_value_rule",
     "collapse_slice_rule",
     "collapse_slice2_rule",
+    "conv_affine_fusion_rule",
     "div_by_1_rule",
     "dropout_inference_rule",
     "dropout_zero_rule",
     "flatten_to_reshape_rule",
     "fuse_batchnorm_into_conv_rule",
     "fuse_batchnorm_into_conv_transpose_rule",
     "fuse_batchnorm_into_gemm_rule",
+    "fuse_hardswish_rules",
     "fuse_pad_into_conv_integer_rule",
     "fuse_pad_into_conv_rule",
     "min_min_rule",
@@ -113,3 +116,8 @@
     no_op_dynamic_scatter_nd_rule,
     no_op_static_scatter_nd_rule,
 )
+from onnxscript.rewriter.rules.common._fuse_conv_affine import (
+    affine_conv_fusion_rule,
+    conv_affine_fusion_rule,
+)
+from onnxscript.rewriter.rules.common._fuse_hardswish import fuse_hardswish_rules

onnxscript/rewriter/fuse_conv_affine.py …writer/rules/common/_fuse_conv_affine.pyonnxscript/rewriter/fuse_conv_affine.py renamed to onnxscript/rewriter/rules/common/_fuse_conv_affine.py onnxscript/rewriter/fuse_conv_affine.py renamed to onnxscript/rewriter/rules/common/_fuse_conv_affine.py

@@ -6,7 +6,7 @@
 
 from onnxscript import ir
 from onnxscript.rewriter import rewrite, testing
-from onnxscript.rewriter.fuse_conv_affine import (
+from onnxscript.rewriter.rules.common import (
     affine_conv_fusion_rule,
     conv_affine_fusion_rule,
 )
@@ -95,7 +95,6 @@ def test_affine_conv_fusion_without_pad(self):
             ),
             ir_version=8,
         )
-        model.display()
         rewritten_model = self.clone_model(model)
         rewritten_model = rewrite(
             rewritten_model,

…script/rewriter/fuse_conv_affine_test.py …r/rules/common/_fuse_conv_affine_test.pyonnxscript/rewriter/fuse_conv_affine_test.py renamed to onnxscript/rewriter/rules/common/_fuse_conv_affine_test.py onnxscript/rewriter/fuse_conv_affine_test.py renamed to onnxscript/rewriter/rules/common/_fuse_conv_affine_test.py

@@ -10,7 +10,7 @@
 
 from onnxscript import optimizer
 from onnxscript.rewriter import testing
-from onnxscript.rewriter.fuse_hardswish import fuse_hardswish_rules
+from onnxscript.rewriter.rules.common import fuse_hardswish_rules
 
 
 class FuseHardSwishTest(unittest.TestCase):