@@ -138,63 +138,56 @@ def _has_dynamic_shapes(
138138 node , torch .fx .Node
139139 ), "Inputs to validator functions must be FX Nodes"
140140
141+ def _contains_dynamic_value (value : Any ) -> bool :
142+ """Recursively checks FX metadata for symbolic values or dimensions."""
143+ if isinstance (value , (SymFloat , SymInt , SymBool )):
144+ return True
145+ if isinstance (value , dict ):
146+ return any (_contains_dynamic_value (item ) for item in value .values ())
147+ if isinstance (value , (list , tuple )):
148+ return any (_contains_dynamic_value (item ) for item in value )
149+ if value is None or isinstance (value , (int , float , bool )):
150+ return False
151+ if hasattr (value , "size" ):
152+ return any (_contains_dynamic_value (dim ) for dim in value .size ())
153+ return False
154+
141155 def _is_subnode_dynamic (subnode : torch .fx .Node ) -> bool :
142- """Checks if a node itself has Dynamic properties"""
143- _has_symbolic_sizes_strides , is_shape_dynamic = False , False
144- if "val" in subnode .meta :
145- _has_symbolic_sizes_strides = getattr (
146- subnode .meta ["val" ], "_has_symbolic_sizes_strides" , False
147- )
148- meta_val = subnode .meta ["val" ]
149- if isinstance (meta_val , (list , tuple )):
150- for val in meta_val :
151- if val is None :
152- continue
153- if isinstance (val , (SymFloat , SymInt , SymBool )):
154- is_shape_dynamic = True
155- break
156- if not hasattr (val , "size" ):
157- continue
158- shape = val .size ()
159- if any (
160- isinstance (dim , (SymFloat , SymInt , SymBool )) for dim in shape
161- ):
162- is_shape_dynamic = True
163- break
164- elif isinstance (meta_val , (SymFloat , SymInt , SymBool )):
165- is_shape_dynamic = True
166- elif isinstance (meta_val , (int , float , bool )):
167- is_shape_dynamic = False
168- else :
169- shape = subnode .meta ["val" ].size ()
170- is_shape_dynamic = any (
171- isinstance (dim , (SymFloat , SymInt , SymBool )) for dim in shape
172- )
156+ """Checks if a node itself has Dynamic properties."""
157+ meta_val = subnode .meta .get ("val" , subnode .meta .get ("example_value" ))
158+ return bool (
159+ getattr (meta_val , "_has_symbolic_sizes_strides" , False )
160+ or _contains_dynamic_value (meta_val )
161+ )
173162
174- return _has_symbolic_sizes_strides or is_shape_dynamic
163+ def _is_argument_dynamic (argument : Argument ) -> bool :
164+ """Checks nodes nested inside FX container arguments."""
165+ if isinstance (argument , torch .fx .Node ):
166+ return _is_subnode_dynamic (argument )
167+ if isinstance (argument , dict ):
168+ return any (_is_argument_dynamic (item ) for item in argument .values ())
169+ if isinstance (argument , (list , tuple )):
170+ return any (_is_argument_dynamic (item ) for item in argument )
171+ return False
175172
176173 # Check node value itself
177174 if arg_positions_to_check is None and _is_subnode_dynamic (node ):
178175 return True
179176
180177 # Check node arguments individually
181178 if arg_positions_to_check is None and any (
182- _is_subnode_dynamic (arg ) for arg in node .args if isinstance ( arg , torch . fx . Node )
179+ _is_argument_dynamic (arg ) for arg in node .args
183180 ):
184181 return True
185182 # Check specific arg positions if the caller has specified positions to check
186183 elif arg_positions_to_check is not None and any (
187- _is_subnode_dynamic (node .args [i ])
188- for i in arg_positions_to_check
189- if isinstance (node .args [i ], torch .fx .Node )
184+ _is_argument_dynamic (node .args [i ]) for i in arg_positions_to_check
190185 ):
191186 return True
192187
193188 # Check node keyword arguments individually
194189 if arg_positions_to_check is None and any (
195- _is_subnode_dynamic (kwarg )
196- for kwarg in node .kwargs .values ()
197- if isinstance (kwarg , torch .fx .Node )
190+ _is_argument_dynamic (kwarg ) for kwarg in node .kwargs .values ()
198191 ):
199192 return True
200193
0 commit comments