[Easy] use BaseListVariable cls_for for all list-y type dispatching (pytorch#110159)

Pull Request resolved: pytorch#110159
Approved by: https://github.com/ezyang

Author: voznesenskym

torch/_dynamo/variables/builder.py

@@ -100,7 +100,6 @@
 from .higher_order_ops import TorchHigherOrderOperatorVariable
 from .lists import (
     BaseListVariable,
-    DequeVariable,
     ListVariable,
     NamedTupleVariable,
     RangeVariable,
@@ -260,20 +259,6 @@ def _common_constants():
             # dynamic_shapes
         }
 
-    @staticmethod
-    def list_type(value):
-        if is_namedtuple(value):
-            return functools.partial(NamedTupleVariable, tuple_cls=type(value))
-        # TODO(voz): Why do we have both this and `BaseListVariable`'s `cls_for`?
-        return {
-            tuple: TupleVariable,
-            list: ListVariable,
-            odict_values: ListVariable,
-            torch.nn.ParameterList: ListVariable,
-            torch.nn.ModuleList: ListVariable,
-            collections.deque: DequeVariable,
-        }[type(value)]
-
     def get_source(self):
         return self.source
 
@@ -835,7 +820,7 @@ def wrap_listlike(self, value: Union[tuple, list, odict_values, NamedTuple]):
             ).add_guards(guards)
             for i, item in enumerate(value)
         ]
-        result = self.list_type(value)(
+        result = BaseListVariable.cls_for_instance(value)(
             output, mutable_local=MutableLocal(), guards=guards
         )
         if istype(value, list):

torch/_dynamo/variables/lists.py

@@ -13,7 +13,13 @@
 from ..exc import unimplemented
 from ..guards import make_dupe_guard
 from ..source import GetItemSource
-from ..utils import get_fake_value, guard_if_dyn, namedtuple_fields
+from ..utils import (
+    get_fake_value,
+    guard_if_dyn,
+    is_namedtuple,
+    namedtuple_fields,
+    odict_values,
+)
 from .base import MutableLocal, VariableTracker
 from .constant import ConstantVariable
 from .functions import UserFunctionVariable, UserMethodVariable
@@ -43,6 +49,12 @@ def _listlike_contains_helper(items, search, tx, options):
 
 
 class BaseListVariable(VariableTracker):
+    @staticmethod
+    def cls_for_instance(obj):
+        if is_namedtuple(obj):
+            return functools.partial(NamedTupleVariable, tuple_cls=type(obj))
+        return BaseListVariable.cls_for(type(obj))
+
     @staticmethod
     def cls_for(obj):
         return {
@@ -52,6 +64,9 @@ def cls_for(obj):
             torch.Size: SizeVariable,
             tuple: TupleVariable,
             set: SetVariable,
+            odict_values: ListVariable,
+            torch.nn.ParameterList: ListVariable,
+            torch.nn.ModuleList: ListVariable,
             collections.deque: DequeVariable,
         }[obj]