Skip to content

Move register_canonicalize to graph.rewriting.utils, Adjust function signature, and enhance AttributeError handling #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Move register_canonicalize to graph.rewriting.utils, Adjust function signature, and enhance AttributeError handling #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
405689e
Move register_canonicalize to graph.rewriting.utils
OmGhadge Jan 23, 2024
30b4507
Move register_canonicalize to graph.rewriting.utils
OmGhadge Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion pytensor/graph/rewriting/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from typing import TYPE_CHECKING, Optional, Union, cast

import pytensor
from pytensor import compile
from pytensor.graph.basic import (
Apply,
Variable,
Expand All @@ -11,7 +12,8 @@
vars_between,
)
from pytensor.graph.fg import FunctionGraph
from pytensor.graph.rewriting.db import RewriteDatabaseQuery
from pytensor.graph.rewriting.basic import NodeRewriter
from pytensor.graph.rewriting.db import RewriteDatabase, RewriteDatabaseQuery


if TYPE_CHECKING:
Expand Down Expand Up @@ -238,3 +240,21 @@ def get_clients_at_depth(
else:
assert var.owner is not None
yield var.owner


def register_canonicalize(
node_rewriter: Union[RewriteDatabase, NodeRewriter, str], *tags: str, **kwargs
):
if isinstance(node_rewriter, str):

def register(inner_rewriter: Union[RewriteDatabase, NodeRewriter]):
return register_canonicalize(inner_rewriter, node_rewriter, *tags, **kwargs)

return register
else:
name = kwargs.pop("name", None) or getattr(node_rewriter, "__name__", None)

compile.optdb["canonicalize"].register(
name, node_rewriter, "fast_run", "fast_compile", *tags, **kwargs
)
return node_rewriter
18 changes: 1 addition & 17 deletions pytensor/tensor/rewriting/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
node_rewriter,
)
from pytensor.graph.rewriting.db import RewriteDatabase
from pytensor.graph.rewriting.utils import register_canonicalize
from pytensor.raise_op import Assert, CheckAndRaise, assert_op
from pytensor.tensor.basic import (
Alloc,
Expand Down Expand Up @@ -153,23 +154,6 @@ def register(inner_rewriter: Union[RewriteDatabase, Rewriter]):
return node_rewriter


def register_canonicalize(
node_rewriter: Union[RewriteDatabase, NodeRewriter, str], *tags: str, **kwargs
):
if isinstance(node_rewriter, str):

def register(inner_rewriter: Union[RewriteDatabase, Rewriter]):
return register_canonicalize(inner_rewriter, node_rewriter, *tags, **kwargs)

return register
else:
name = kwargs.pop("name", None) or node_rewriter.__name__
compile.optdb["canonicalize"].register(
name, node_rewriter, "fast_run", "fast_compile", *tags, **kwargs
)
return node_rewriter


def register_stabilize(
node_rewriter: Union[RewriteDatabase, NodeRewriter, str], *tags: str, **kwargs
):
Expand Down