Move basic rewriting code to aesara.graph.rewriting

- `aesara.graph.opt` has been changed to `aesara.graph.rewriting.basic`
- `aesara.graph.opt_utils` has been changed to `aesara.graph.rewriting.utils`
- `aesara.graph.optdb` has been changed to `aesara.graph.rewriting.db`
- `aesara.graph.unify` has been changed to `aesara.graph.rewriting.unify`
- `aesara.graph.kanren` has been changed to `aesara.graph.rewriting.kanren`

The tests associated with each module have been updated accordingly.

Author: brandonwillard

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
               aesara/breakpoint\.py|
               aesara/graph/op\.py|
               aesara/compile/nanguardmode\.py|
-              aesara/graph/opt\.py|
+              aesara/graph/rewriting/basic\.py|
               aesara/tensor/var\.py|
           )$
       - id: check-merge-conflict

aesara/compile/builders.py

@@ -24,7 +24,7 @@
 from aesara.graph.fg import FunctionGraph
 from aesara.graph.null_type import NullType
 from aesara.graph.op import HasInnerGraph, Op
-from aesara.graph.opt import in2out, node_rewriter
+from aesara.graph.rewriting.basic import in2out, node_rewriter
 from aesara.graph.utils import MissingInputError
 from aesara.tensor.basic_opt import ShapeFeature
 

aesara/compile/mode.py

@@ -10,13 +10,13 @@
 from aesara.compile.function.types import Supervisor
 from aesara.configdefaults import config
 from aesara.graph.destroyhandler import DestroyHandler
-from aesara.graph.opt import (
+from aesara.graph.rewriting.basic import (
     CheckStackTraceRewriter,
     GraphRewriter,
     MergeOptimizer,
     NodeProcessingGraphRewriter,
 )
-from aesara.graph.optdb import (
+from aesara.graph.rewriting.db import (
     EquilibriumDB,
     LocalGroupDB,
     RewriteDatabase,

aesara/graph/__init__.py

@@ -13,8 +13,8 @@
 from aesara.graph.op import Op
 from aesara.graph.type import Type
 from aesara.graph.fg import FunctionGraph
-from aesara.graph.opt import node_rewriter, graph_rewriter
-from aesara.graph.opt_utils import rewrite_graph
-from aesara.graph.optdb import RewriteDatabaseQuery
+from aesara.graph.rewriting.basic import node_rewriter, graph_rewriter
+from aesara.graph.rewriting.utils import rewrite_graph
+from aesara.graph.rewriting.db import RewriteDatabaseQuery
 
 # isort: on

aesara/graph/rewriting/__init__.py

@@ -40,10 +40,10 @@
 
 
 if TYPE_CHECKING:
-    from aesara.graph.unify import Var
+    from aesara.graph.rewriting.unify import Var
 
 
-_logger = logging.getLogger("aesara.graph.opt")
+_logger = logging.getLogger("aesara.graph.rewriting.basic")
 
 RemoveKeyType = Literal["remove"]
 TransformOutputType = Union[
@@ -1586,7 +1586,7 @@ def __init__(
         often.
 
         """
-        from aesara.graph.unify import convert_strs_to_vars
+        from aesara.graph.rewriting.unify import convert_strs_to_vars
 
         var_map: Dict[str, "Var"] = {}
         self.in_pattern = convert_strs_to_vars(in_pattern, var_map=var_map)

aesara/graph/opt.py renamed to aesara/graph/rewriting/basic.py

@@ -6,7 +6,7 @@
 from typing import Dict, Iterable, Optional, Sequence, Tuple, Union
 
 from aesara.configdefaults import config
-from aesara.graph import opt as aesara_rewriting
+from aesara.graph.rewriting import basic as aesara_rewriting
 from aesara.misc.ordered_set import OrderedSet
 from aesara.utils import DefaultOrderedDict
 

aesara/graph/optdb.py renamed to aesara/graph/rewriting/db.py

@@ -6,8 +6,8 @@
 from unification.variable import Var
 
 from aesara.graph.basic import Apply, Variable
-from aesara.graph.opt import NodeRewriter
-from aesara.graph.unify import eval_if_etuple
+from aesara.graph.rewriting.basic import NodeRewriter
+from aesara.graph.rewriting.unify import eval_if_etuple
 
 
 class KanrenRelationSub(NodeRewriter):
@@ -24,7 +24,7 @@ class KanrenRelationSub(NodeRewriter):
         from kanren import eq, conso, var
 
         import aesara.tensor as at
-        from aesara.graph.kanren import KanrenRelationSub
+        from aesara.graph.rewriting.kanren import KanrenRelationSub
 
 
         def relation(in_lv, out_lv):

aesara/graph/kanren.py renamed to aesara/graph/rewriting/kanren.py

@@ -69,7 +69,7 @@ def __str__(self):
         return f"~{self.token} [{self.constraint}]"
 
     def __repr__(self):
-        return f"ConstrainedVar({repr(self.constraint)}, {self.token})"
+        return f"{type(self).__name__}({repr(self.constraint)}, {self.token})"
 
 
 def car_Variable(x):

aesara/graph/unify.py renamed to aesara/graph/rewriting/unify.py

@@ -11,11 +11,11 @@
     vars_between,
 )
 from aesara.graph.fg import FunctionGraph
-from aesara.graph.optdb import RewriteDatabaseQuery
+from aesara.graph.rewriting.db import RewriteDatabaseQuery
 
 
 if TYPE_CHECKING:
-    from aesara.graph.opt import GraphRewriter
+    from aesara.graph.rewriting.basic import GraphRewriter
 
 
 def rewrite_graph(
@@ -89,7 +89,7 @@ def is_same_graph_with_merge(var1, var2, givens=None):
     See help on `aesara.graph.basic.is_same_graph` for additional documentation.
 
     """
-    from aesara.graph.opt import MergeOptimizer
+    from aesara.graph.rewriting.basic import MergeOptimizer
 
     if givens is None:
         givens = {}