Allow freezing of FunctionGraph for hashing#1908
Conversation
ricardoV94
left a comment
There was a problem hiding this comment.
Why did you not go all out?
If you already deduplicate and do internal hash-cons you are one step away from getting hashing for free across different FunctionGraphs. Just do the hash-cons globally. Then FrozenFunctionGrahp([x, y], [foo(x, y)] is equal to another functiongraph if and only if fgraph.outputs == other_fgraph.outputs. No need for recursive hashing or expensive equal_computations.
As it stands you are not doing much better sneaking a default MergeOptimizer at __init__ and adding a FunctionGraph class that has no replace mode.
And cheap hashing/ equality is not just a nice to have, it's really valuable to not slow down compilation. In some of my benchmarks on previous work, some graphs could spend inordinate time on equality checks.
Comments regardless of whether we go:
- Don't create
FrozenFunctionGraphas a subclass ofFrozenGraph, let's push the general principle, shared abstract classes, no-subclass of actually realized objects. Then you don't needcheck_frozen, the methods just don't exist for the frozen subclass. - You could create a frozenApply that uses
tuplefor input/outputs instead oflist. That will help ensuring the immutability because all our current rewrite machinery works on the idea of overriding entries in those lists. Accidentally trying to mutate a graph would 99% fail there.
305e26e to
08609fe
Compare
There was a problem hiding this comment.
This is starting to look good, how are you feeling about it?
Notes:
- Add a
FrozenFunctionGraph.unfreeze(), that yields aFunctionGraph? - Really try to avoid the FrozenConstant stuff
- Ops with inner graph (at least the ones you touched now) should only have a FrozenFunctionGraph internally (not a mutable one as well). Maybe that's already the case.
We need some follow-up issues open:
- Optimizing OpFromGraph: There should be an explicit rewrite that creates a new OpFromGraph with its updated frozen graph, (so it is also reflected immediately in dprint). We should never do any further rewrites of the internal fgraph during compilation.
- Scan/Minimize/Root: Use the new FrozenFunctionGraph as well. This should immediately address #1601
- When compiling OpFromGraph in jitted contexts we should try to avoid recreating inner numba/jax functions when the same OFG is compiled multiple times in a function, this will likely speedup compilation. In the C-backend that already happens due to the caching of
_fn. That's how we can deliver on the promised compilations speedups and it's specially relevant for a library likepytensor-mlthat may want to chains hundreds of the same "LayerOp"s in sequence
78ee1a9 to
eda51d2
Compare
|
I left some comments as I checked the changes. I need to think/discuss a bit about the spec thing, and the desire to have a consistent hashing across runtimes. If you remove that the complexity of this PR drops quite a bit, but maybe this is also fine. Can you confirm this was only needed for the C-backend, and that it would also work if whatever relies on that called something like Besides that this PR look amazing, and it's a game changer to working with inner graph ops. We really need those to work well |
eda51d2 to
7202ca3
Compare
|
I removed the spec stuff and simplified the PR down somewhat. |
4a7bea8 to
445731f
Compare
| for i, out in enumerate(frozen_outputs): | ||
| out.name = f"o{i}" |
There was a problem hiding this comment.
I think this is wrong? The same variable could be output0 in one graph and output 2 in another? Or are these the dummy Output Ops we put in clients?
a9ac55f to
ae73a91
Compare
| self.variables: frozenset[Variable] = frozenset(memo.values()) | ||
| self.apply_nodes: frozenset[Apply] = frozenset(sorted_apply_nodes) | ||
| self._clients: dict[Variable, list[ClientType]] | None = None | ||
| self._toposort: tuple[Apply, ...] = tuple(sorted_apply_nodes) |
There was a problem hiding this comment.
I pre-computed these (except for clients), because we basically have everything we needed already from our loop.
I made them frozenset/tuple instead.
| @property | ||
| def clients(self) -> dict[Variable, list[ClientType]]: # type: ignore[override] | ||
| if self._clients is None: | ||
| clients: dict[Variable, list[ClientType]] = {v: [] for v in self.variables} |
There was a problem hiding this comment.
got rid of the setdefault in the inner loop, speeds up things a bit. We may end with more clients that before, for variables without nodes. I think this is much more robust.
One big difference though between this and the regular FunctionGraph is we don't have the dummy Output Apply in the clients of output vars. I think we should add
bafdb84 to
8a77a26
Compare
Closes #1606
LLM disclosure: this PR made heavy use of Claude in the planning and first cut stages, though I was heavily involved. Still, the code should be subject to extra scrutiny as a result.
The purpose of the PR is to refactor Ops with inner graphs to allow comparison. The linked issue has an exhaustive discussion of the factors at play. There was an attempt in the aesara days to attack this, but it was perhaps too aggressive: it cons-hashed all Apply nodes, which necessitated changes across the codebase. @ricardoV94 suggested a weakref dict approach for subgraphs. This is implemented at the Op level. The plan is for Ops that have inner graphs (
Composite,ScalarLoop,Scan,OpFromGraph, etc) to have a_cacheclass attribute, and implement the op-specific logic for caching, pickling, unpickling, etc. It didn't look super generalizable to me at first blush, but we can argue about it maybe.Changes to
FunctionGraph:FunctionGraphnow has a methodfreezethat returns aFrozenFunctionGraph.FrozenFunctionGraphdoes cons-hashing of Apply nodes within its scope onlyFrozenFunctionGraphswith the same inner graph with evaluate to equal, but theirApplynodes won't be references to the same objects (this is the "conservatism" of my approach)Specific implementation details:
structural_hashof aFrozenFunctionGraphis built from a list of 3-tuples:(name, type, inputs), plus the outputs. For constants,inputsis replaced with the hash of the input data.FrozenFunctionGraphsis done by comparing hashes, then falling back toequal_computationif the hash misses.A consequence of the cons-hashing in this approach is that the inner graph is de-duplicated when we call
fg.freeze(). So aMergeOptimizerpass is no longer required. Usage is demonstrated on theCompositeOp. If we like the approach I can move forward with refactoring other Ops, but I wanted to stop here and discuss the approach.Code example:
Result: