move TypedStorage handling to assertEqual

torch/testing/_comparison.py

@@ -927,34 +927,9 @@ def originate_pairs(
     Returns:
         (List[Pair]): Originated pairs.
     """
-    if (
-        isinstance(actual, torch.TypedStorage)
-        and isinstance(expected, torch.TypedStorage)
-    ):
-        actual_len = actual._size()
-        expected_len = expected._size()
-        if actual_len != expected_len:
-            raise ErrorMeta(
-                AssertionError, f"The length of the sequences mismatch: {actual_len} != {expected_len}", id=id
-            )
-
-        pairs = []
-        for idx in range(actual_len):
-            pairs.extend(
-                originate_pairs(
-                    actual._getitem(idx),
-                    expected._getitem(idx),
-                    pair_types=pair_types,
-                    sequence_types=sequence_types,
-                    mapping_types=mapping_types,
-                    id=(*id, idx),
-                    **options,
-                )
-            )
-        return pairs
     # We explicitly exclude str's here since they are self-referential and would cause an infinite recursion loop:
     # "a" == "a"[0][0]...
-    elif (
+    if (
         isinstance(actual, sequence_types)
         and not isinstance(actual, str)
         and isinstance(expected, sequence_types)

torch/testing/_internal/common_utils.py

@@ -2567,6 +2567,10 @@ def to_list(input):
         if isinstance(y, torch.Tensor) and y.is_nested:
             y = y.unbind()
 
+        # TODO: explain why this is needed
+        if isinstance(x, torch.TypedStorage) and isinstance(y, torch.TypedStorage):
+            x, y = [[storage._getitem(idx) for idx in storage._size()] for storage in [x, y]]
+
         assert_equal(
             x,
             y,
@@ -2582,7 +2586,6 @@ def to_list(input):
             ),
             sequence_types=(
                 Sequence,
-                torch.storage.TypedStorage,
                 Sequential,
                 ModuleList,
                 ParameterList,