Rename FromFunctionOptimizer to FromFunctionGraphRewriter

aesara/graph/__init__.py

@@ -13,7 +13,7 @@ from aesara.graph.basic import (
 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, optimizer
+from aesara.graph.opt import node_rewriter, graph_rewriter
 from aesara.graph.opt_utils import optimize_graph
 from aesara.graph.optdb import OptimizationQuery
 

aesara/graph/opt.py

@@ -189,7 +189,7 @@ class NodeRewriter(Rewriter):
         print(f"{' ' * level}{self.__class__.__name__} id={id(self)}", file=stream)
 
 
-class FromFunctionOptimizer(GraphRewriter):
+class FromFunctionGraphRewriter(GraphRewriter):
     """A `GraphRewriter` constructed from a given function."""
 
     def __init__(self, fn, requirements=()):
@@ -213,18 +213,18 @@ class FromFunctionOptimizer(GraphRewriter):
         return self.__name__
 
 
-def optimizer(f):
-    """Decorator for `FromFunctionOptimizer`."""
-    rval = FromFunctionOptimizer(f)
+def graph_rewriter(f):
+    """Decorator for `FromFunctionGraphRewriter`."""
+    rval = FromFunctionGraphRewriter(f)
     rval.__name__ = f.__name__
     return rval
 
 
-def inplace_optimizer(f):
-    """Decorator for `FromFunctionOptimizer` that also adds the `DestroyHandler` features."""
+def inplace_graph_rewriter(f):
+    """Decorator for `FromFunctionGraphRewriter` that also adds the `DestroyHandler` features."""
     dh_handler = dh.DestroyHandler
     requirements = (lambda fgraph: fgraph.attach_feature(dh_handler()),)
-    rval = FromFunctionOptimizer(f, requirements)
+    rval = FromFunctionGraphRewriter(f, requirements)
     rval.__name__ = f.__name__
     return rval
 
@@ -3131,6 +3131,21 @@ DEPRECATED_NAMES = [
         "`pre_greedy_local_optimizer` is deprecated: use `pre_greedy_node_rewriter` instead.",
         pre_greedy_node_rewriter,
     ),
+    (
+        "FromFunctionOptimizer",
+        "`FromFunctionOptimizer` is deprecated: use `FromFunctionGraphRewriter` instead.",
+        FromFunctionGraphRewriter,
+    ),
+    (
+        "optimizer",
+        "`optimizer` is deprecated: use `graph_rewriter` instead.",
+        graph_rewriter,
+    ),
+    (
+        "inplace_optimizer",
+        "`inplace_optimizer` is deprecated: use `graph_rewriter` instead.",
+        graph_rewriter,
+    ),
 ]
 
 

aesara/tensor/nnet/basic.py

@@ -18,7 +18,7 @@ from aesara.compile import optdb
 from aesara.gradient import DisconnectedType, grad_not_implemented
 from aesara.graph.basic import Apply
 from aesara.graph.op import Op
-from aesara.graph.opt import copy_stack_trace, node_rewriter, optimizer
+from aesara.graph.opt import copy_stack_trace, graph_rewriter, node_rewriter
 from aesara.link.c.op import COp
 from aesara.raise_op import Assert
 from aesara.scalar import UnaryScalarOp
@@ -1847,7 +1847,7 @@ crossentropy_categorical_1hot = CrossentropyCategorical1Hot()
 
 @register_stabilize("fast_compile")
 @register_specialize("fast_compile")
-@optimizer
+@graph_rewriter
 def crossentropy_to_crossentropy_with_softmax_with_bias(fgraph):
     def search_make_one_sub():
         for node in fgraph.toposort():
@@ -1874,7 +1874,7 @@ def crossentropy_to_crossentropy_with_softmax_with_bias(fgraph):
     return
 
 
-@optimizer
+@graph_rewriter
 def crossentropy_to_crossentropy_with_softmax(fgraph):
     """
     This is a stabilization rewrite that is more general than

doc/extending/graph_rewriting.rst

@@ -944,7 +944,7 @@ This will output something like this:
               validate_time 6.43730163574e-05
               callback_time 0.000783205032349
               time_toposort 0.0035240650177
-       0.090089s - ('inplace_elemwise_optimizer', 'FromFunctionOptimizer', 30) - 0.019s
+       0.090089s - ('inplace_elemwise_optimizer', 'FromFunctionGraphRewriter', 30) - 0.019s
        0.048993s - ('BlasOpt', 'SeqOptimizer', 8) - 0.000s
          SeqOptimizer      BlasOpt  time 0.049s for 81/80 nodes before/after optimization
            0.000s for fgraph.validate()