Update on "Use MetaProxy more pervasively"

bobrenjc93 · bobrenjc93 · commit cd31cf8cfa63 · 2024-10-09T09:12:48.000-07:00
[ghstack-poisoned]
diff --git a/torch/fx/passes/_tensorify_python_scalars.py b/torch/fx/passes/_tensorify_python_scalars.py
@@ -119,7 +119,7 @@ def _sympy_interp(expr: sympy.Expr) -> MetaProxy:
             # This is guaranteed to be populated by invariant established by
             # insert_deferred_runtime_asserts
             expr_to_tensor_proxy[expr] = torch.ops.aten.scalar_tensor.default(
-                expr_to_sym_proxy[expr].node
+                expr_to_sym_proxy[expr]
             )
 
         # cache constants, why not
diff --git a/torch/fx/proxy.py b/torch/fx/proxy.py
@@ -561,8 +561,7 @@ def __torch_function__(cls, orig_method, types, args=None, kwargs=None):
                 *[a.node.meta["val"] if isinstance(a, Proxy) else a for a in args],
                 **kwargs
             )
-
-        return MetaProxy(proxy.node, proxy.tracer)
+        return MetaProxy(proxy.node, proxy.tracer, meta_proxy.fake_mode)
 
 @compatibility(is_backward_compatible=True)
 class Attribute(Proxy):

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ def _sympy_interp(expr: sympy.Expr) -> MetaProxy:`
`119`	`119`	`# This is guaranteed to be populated by invariant established by`
`120`	`120`	`# insert_deferred_runtime_asserts`
`121`	`121`	`expr_to_tensor_proxy[expr] = torch.ops.aten.scalar_tensor.default(`
`122`		`- expr_to_sym_proxy[expr].node`
	`122`	`+ expr_to_sym_proxy[expr]`
`123`	`123`	`)`
`124`	`124`
`125`	`125`	`# cache constants, why not`
Original file line number	Diff line number	Diff line change
`@@ -561,8 +561,7 @@ def __torch_function__(cls, orig_method, types, args=None, kwargs=None):`
`561`	`561`	`*[a.node.meta["val"] if isinstance(a, Proxy) else a for a in args],`
`562`	`562`	`**kwargs`
`563`	`563`	`)`
`564`		`-`
`565`		`- return MetaProxy(proxy.node, proxy.tracer)`
	`564`	`+ return MetaProxy(proxy.node, proxy.tracer, meta_proxy.fake_mode)`
`566`	`565`
`567`	`566`	`@compatibility(is_backward_compatible=True)`
`568`	`567`	`class Attribute(Proxy):`