Revert "[Dynamo] Handle extracted unbound tensor methods (pytorch#137227

)" This reverts commit 14eabd6. Reverted pytorch#137227 on behalf of https://github.com/malfet due to Need to revert to be able to revert pytorch#136910 ([comment](pytorch#137227 (comment)))
jessejay-ch · Oct 8, 2024 · 76c5bdd · 76c5bdd
1 parent c88c0e6
commit 76c5bdd
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 24 deletions.
diff --git a/test/dynamo/test_functions.py b/test/dynamo/test_functions.py
@@ -938,16 +938,6 @@ def test_tensor_is_complex(x):
         else:
             return x - 1
 
-    @make_test
-    def test_tensor_size(x):
-        fn = torch.Tensor.size
-        return fn(x + 1)
-
-    @make_test
-    def test_tensor_dim(x):
-        fn = torch.Tensor.dim
-        return fn(x + 1)
-
     @make_test
     def test_tensor_is_inference(x):
         if x.is_inference():

diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_bfloat16 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_bfloat16
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_bool b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_bool
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_complex128 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_complex128
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_complex64 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_complex64
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float16 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float16
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float32 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float32
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float64 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_float64
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int16 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int16
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int32 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int32
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int64 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int64
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int8 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_int8
diff --git a/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_uint8 b/test/dynamo_expected_failures/TestAsArrayCPU.test_copy_list_cpu_uint8
diff --git a/torch/_dynamo/variables/tensor.py b/torch/_dynamo/variables/tensor.py
@@ -772,7 +772,7 @@ def method_item(self, *args, **kwargs):
             self._warn_capture_scalar_outputs()
             unimplemented("Tensor.item")
 
-    def method___getitem__(self, *args, **kwargs):
+    def method_getitem(self, *args, **kwargs):
         from ..symbolic_convert import InstructionTranslator
         from .builder import wrap_fx_proxy
 

diff --git a/torch/_dynamo/variables/torch.py b/torch/_dynamo/variables/torch.py
@@ -871,6 +871,10 @@ def handle_set_default_device(
 
             return ConstantVariable.create(None)
 
+        @register(torch._C.TensorBase.__getitem__)
+        def handle_getitem(self, tx: "InstructionTranslator", *args, **kwargs):
+            return args[0].call_method(tx, "getitem", args[1:], kwargs)
+
         return handlers
 
     def call_function(
@@ -900,9 +904,6 @@ def call_function(
                 ),
             )
 
-        if self.is_tensor_method():
-            return self.call_tensor_method(tx, args, kwargs)
-
         special_handler = self._get_handlers().get(self.value)
         if special_handler:
             result = special_handler(self, tx, *args, **kwargs)
@@ -1175,16 +1176,6 @@ def _nn_param_via_prefix_insert(tx: "InstructionTranslator", data, requires_grad
         )
         return result
 
-    def call_tensor_method(self, tx, args, kwargs):
-        return args[0].call_method(tx, self.get_function().__name__, args[1:], kwargs)
-
-    def is_tensor_method(self):
-        return (
-            inspect.ismethoddescriptor(self.get_function())
-            and hasattr(self.get_function(), "__objclass__")
-            and self.get_function().__objclass__ == torch._C.TensorBase
-        )
-
     def torch_function_override_enabled(self, tx, args, kwargs):
         return (
             self.get_function() in get_overridable_functions()