[dynamo] Remove dead code after introducing UserDefinedDictVariable (pytorch#143699)

Pull Request resolved: pytorch#143699
Approved by: https://github.com/williamwen42, https://github.com/yanboliang, https://github.com/jansel
ghstack dependencies: pytorch#143722

Author: anijain2305

torch/_dynamo/guards.py

@@ -98,7 +98,6 @@
     LocalSource,
     NNModuleSource,
     NumpyTensorSource,
-    ODictGetItemSource,
     OptimizerSource,
     ScriptObjectQualifiedNameSource,
     ShapeEnvSource,
@@ -1055,8 +1054,7 @@ def get_guard_manager_from_source(self, source):
             assert base_guard_manager  # to make mypy happy
             if isinstance(base_example_value, (dict, collections.OrderedDict)):
                 # TODO(anijain2305) - Consider isolating GetItemSource and
-                # DictGetItemSource (or maybe use ODictGetItemSource for
-                # dicts) so that GetItemSource is only for non dict objects.
+                # DictGetItemSource for dicts) so that GetItemSource is only for non dict objects.
                 if isinstance(base_guard_manager, DictGuardManager):
                     assert self.manager_guards_on_keys(base_guard_manager_enum)
                     out = getitem_on_dict_manager(
@@ -1102,24 +1100,6 @@ def get_guard_manager_from_source(self, source):
                     example_value=example_value,
                     guard_manager_enum=guard_manager_enum,
                 )
-        elif istype(source, ODictGetItemSource):
-            if isinstance(base_guard_manager, DictGuardManager):
-                assert self.manager_guards_on_keys(base_guard_manager_enum)
-                out = getitem_on_dict_manager(
-                    source,
-                    base_guard_manager,
-                    base_example_value,
-                    example_value,
-                    guard_manager_enum,
-                )
-            else:
-                assert base_guard_manager  # to make mypy happy
-                out = base_guard_manager.dict_getitem_manager(
-                    key=source.index,
-                    source=source_name,
-                    example_value=example_value,
-                    guard_manager_enum=guard_manager_enum,
-                )
         elif istype(source, DefaultsSource):
             assert base_guard_manager  # to make mypy happy
             assert callable(base_example_value)

torch/_dynamo/side_effects.py

@@ -33,11 +33,6 @@
 from .variables.user_defined import FrozenDataClassVariable
 
 
-def _manual_update_dict(dict_from, dict_to):
-    for k, v in dict_from.items():
-        dict_to[k] = v
-
-
 def _manual_dict_setitem(dict_from, dict_to, mro_index):
     # Carefully calls the dict or OrderedDict `clear` or `__setitem__`. We have
     # to be careful because we don't want to trigger the user defined object

torch/_dynamo/source.py

@@ -1,5 +1,4 @@
 # mypy: allow-untyped-defs
-import collections
 import dataclasses
 import enum
 from typing import Any, Optional, Union
@@ -86,9 +85,7 @@ def is_constant_source(source):
     return False
 
 
-def reconstruct_getitem(
-    source: Union["GetItemSource", "ODictGetItemSource"], codegen, index_is_slice
-):
+def reconstruct_getitem(source: "GetItemSource", codegen, index_is_slice):
     source.base.reconstruct(codegen)
     if isinstance(source.index, Source):
         source.index.reconstruct(codegen)
@@ -567,35 +564,6 @@ def name(self):
         return f"type({self.base.name()})"
 
 
-@dataclasses.dataclass(frozen=True)
-class ODictGetItemSource(ChainedSource):
-    index: Any
-
-    def __post_init__(self):
-        assert self.base is not None
-
-    def reconstruct(self, codegen):
-        codegen.add_push_null(
-            lambda: codegen.append_output(
-                codegen.create_load_const_unchecked(collections.OrderedDict.__getitem__)
-            )
-        )
-        reconstruct_getitem(self, codegen, index_is_slice=False)
-        codegen.extend_output(create_call_function(2, False))
-
-    def guard_source(self):
-        return self.base.guard_source()
-
-    def name(self):
-        if isinstance(self.index, type):
-            rep = f'__load_module("{self.index.__module__}").{self.index.__qualname__}'
-            return f"___odict_getitem({self.base.name()}, {rep})"
-        elif isinstance(self.index, Source):
-            return f"___odict_getitem({self.base.name()}, {self.index.name()})"
-        else:
-            return f"___odict_getitem({self.base.name()}, {self.index!r})"
-
-
 @dataclasses.dataclass(frozen=True)
 class OptimizerSource(ChainedSource):
     def reconstruct(self, codegen):

torch/_dynamo/variables/misc.py

@@ -1,5 +1,4 @@
 # mypy: ignore-errors
-import collections
 import dataclasses
 import functools
 import inspect
@@ -25,7 +24,6 @@
     AttrSource,
     DefaultsSource,
     GetItemSource,
-    ODictGetItemSource,
     TypeSource,
     WeakRefCallSource,
 )
@@ -193,18 +191,6 @@ def call_method(
             return variables.UserMethodVariable(
                 inner_fn.__func__, self.objvar, source=source
             ).call_function(tx, args, kwargs)
-        elif (
-            inner_fn is collections.OrderedDict.__getitem__
-            and isinstance(self.objvar, variables.UserDefinedObjectVariable)
-            and self.objvar.source
-            and len(args) == 1
-            and len(kwargs) == 0
-            and args[0].is_python_constant()
-        ):
-            key = args[0].as_python_constant()
-            value = collections.OrderedDict.__getitem__(self.objvar.value, key)
-            source = ODictGetItemSource(self.objvar.source, key)
-            return VariableTracker.build(tx, value, source)
         elif is_standard_setattr(inner_fn) and isinstance(
             self.objvar, UserDefinedObjectVariable
         ):

torch/_dynamo/variables/user_defined.py

@@ -34,7 +34,6 @@
 from ..source import (
     AttrSource,
     GetItemSource,
-    ODictGetItemSource,
     RandomValueSource,
     UnspecializedParamBufferSource,
 )
@@ -757,12 +756,7 @@ def call_method(
         args: "List[VariableTracker]",
         kwargs: "Dict[str, VariableTracker]",
     ) -> "VariableTracker":
-        from . import (
-            BuiltinVariable,
-            ConstantVariable,
-            TupleVariable,
-            UserMethodVariable,
-        )
+        from . import ConstantVariable, UserMethodVariable
 
         method = self._maybe_get_baseclass_method(name)
         if method is not None:
@@ -772,54 +766,6 @@ def call_method(
             if is_standard_setattr(method) or isinstance(self.value, threading.local):
                 return self.method_setattr_standard(tx, *args, **kwargs)
 
-            # [NOTE] OrderedDict, dict subtypes must always have source
-            # We cannot instantiate such subtypes in-graph due to builtin __new__
-            if method is collections.OrderedDict.keys:
-                # subclass of OrderedDict
-                assert not (args or kwargs)
-                assert self.source  # OrderedDict, dict subtypes must always have source
-                keys = list(self.value.keys())
-                assert all(map(ConstantVariable.is_literal, keys))
-                install_guard(self.source.make_guard(GuardBuilder.DICT_CONST_KEYS))
-                tx.output.guard_on_key_order.add(self.source.name())
-                return TupleVariable([ConstantVariable.create(k) for k in keys])
-
-            if (
-                method in (collections.OrderedDict.__contains__, dict.__contains__)
-                and len(args) == 1
-                and isinstance(args[0], (ConstantVariable, BuiltinVariable))
-                and inspect.getattr_static(type(self.value), "keys")
-                in (collections.OrderedDict.keys, dict.keys)
-            ):
-                assert not kwargs
-                assert self.source  # OrderedDict, dict subtypes must always have source
-
-                # TODO(anijain2305) - Why do we need to guard on all keys?
-                install_guard(self.source.make_guard(GuardBuilder.DICT_CONST_KEYS))
-                return ConstantVariable.create(
-                    args[0].as_python_constant() in self.value
-                )
-
-            if method is collections.OrderedDict.items and isinstance(
-                self.value, collections.OrderedDict
-            ):
-                assert self.source  # OrderedDict, dict subtypes must always have source
-                assert not (args or kwargs)
-                keys = self.call_method(tx, "keys", [], {})
-                items = [
-                    TupleVariable(
-                        [key, self.odict_getitem(tx, key)],
-                    )
-                    for key in keys.force_unpack_var_sequence(tx)
-                ]
-                tx.output.guard_on_key_order.add(self.source.name())
-                return TupleVariable(items)
-
-            if method is collections.OrderedDict.__getitem__ and len(args) == 1:
-                assert not kwargs
-                assert self.source  # OrderedDict, dict subtypes must always have source
-                return self.odict_getitem(tx, args[0])
-
             if len(args) == 1 and not kwargs:
                 if method is object.__eq__:
                     func_var = VariableTracker.build(tx, polyfills.object_eq)
@@ -1279,23 +1225,6 @@ def call_hasattr(self, tx: "InstructionTranslator", name: str) -> "VariableTrack
             handle_observed_exception(tx)
             return variables.ConstantVariable.create(False)
 
-    def odict_getitem(self, tx: "InstructionTranslator", key):
-        from .dicts import is_hashable
-
-        # TODO this should probably be merged with the dict handling
-
-        index = (
-            key.source
-            if is_hashable(key) and key.source is not None
-            else key.as_python_constant()
-        )
-
-        return VariableTracker.build(
-            tx,
-            collections.OrderedDict.__getitem__(self.value, key.as_python_constant()),
-            self.source and ODictGetItemSource(self.source, index),
-        )
-
 
 class FrozenDataClassVariable(UserDefinedObjectVariable):
     @staticmethod