diff --git a/test/distributed/_composable/fsdp/test_fully_shard_comm.py b/test/distributed/_composable/fsdp/test_fully_shard_comm.py index 5ae26ae9b97..ccef35bf94f 100644 --- a/test/distributed/_composable/fsdp/test_fully_shard_comm.py +++ b/test/distributed/_composable/fsdp/test_fully_shard_comm.py @@ -6,7 +6,8 @@ import itertools import os import tempfile import unittest -from typing import Callable, Optional, Union +from collections.abc import Callable +from typing import Optional, Union from unittest.mock import MagicMock import torch diff --git a/test/distributed/_composable/fsdp/test_fully_shard_overlap.py b/test/distributed/_composable/fsdp/test_fully_shard_overlap.py index e8d52f70e0f..a857b421974 100644 --- a/test/distributed/_composable/fsdp/test_fully_shard_overlap.py +++ b/test/distributed/_composable/fsdp/test_fully_shard_overlap.py @@ -3,7 +3,7 @@ import copy import functools import unittest -from typing import Callable +from collections.abc import Callable import torch import torch.distributed as dist diff --git a/test/distributed/_composable/test_replicate_with_compiler.py b/test/distributed/_composable/test_replicate_with_compiler.py index 291b3a42682..8b6ed2d74ff 100644 --- a/test/distributed/_composable/test_replicate_with_compiler.py +++ b/test/distributed/_composable/test_replicate_with_compiler.py @@ -3,8 +3,9 @@ import contextlib import functools import unittest +from collections.abc import Callable from copy import deepcopy -from typing import Callable, Optional, Union +from typing import Optional, Union import torch import torch.distributed as dist diff --git a/test/distributed/_tools/test_runtime_estimator.py b/test/distributed/_tools/test_runtime_estimator.py index 042fd90ef42..4087b8a8552 100644 --- a/test/distributed/_tools/test_runtime_estimator.py +++ b/test/distributed/_tools/test_runtime_estimator.py @@ -1,7 +1,8 @@ # Owner(s): ["oncall: distributed"] import unittest +from collections.abc import Callable from dataclasses import dataclass -from typing import Any, Callable, cast, Union +from typing import Any, cast, Union import torch from torch import nn, optim diff --git a/test/distributed/checkpoint/test_fsspec.py b/test/distributed/checkpoint/test_fsspec.py index 9d69d6d386a..530ffae8527 100644 --- a/test/distributed/checkpoint/test_fsspec.py +++ b/test/distributed/checkpoint/test_fsspec.py @@ -2,8 +2,9 @@ import shutil import tempfile +from collections.abc import Callable from functools import wraps -from typing import Any, Callable, Optional +from typing import Any, Optional import torch import torch.distributed as dist diff --git a/test/distributed/checkpoint/test_state_dict.py b/test/distributed/checkpoint/test_state_dict.py index a42215e0ea0..050e16720f2 100644 --- a/test/distributed/checkpoint/test_state_dict.py +++ b/test/distributed/checkpoint/test_state_dict.py @@ -3,8 +3,9 @@ import copy import functools import sys +from collections.abc import Callable from itertools import chain -from typing import Callable, Union +from typing import Union import torch import torch.distributed as dist diff --git a/test/distributed/elastic/agent/server/test/local_elastic_agent_test.py b/test/distributed/elastic/agent/server/test/local_elastic_agent_test.py index ff89b5c51f0..22310a9ba49 100644 --- a/test/distributed/elastic/agent/server/test/local_elastic_agent_test.py +++ b/test/distributed/elastic/agent/server/test/local_elastic_agent_test.py @@ -16,8 +16,9 @@ import tempfile import time import unittest import uuid +from collections.abc import Callable from dataclasses import dataclass -from typing import Callable, Optional +from typing import Optional from unittest import mock from unittest.mock import Mock, patch diff --git a/test/distributed/elastic/multiprocessing/api_test.py b/test/distributed/elastic/multiprocessing/api_test.py index 80c17f6dea9..458859356c4 100644 --- a/test/distributed/elastic/multiprocessing/api_test.py +++ b/test/distributed/elastic/multiprocessing/api_test.py @@ -15,8 +15,9 @@ import signal import sys import tempfile import time +from collections.abc import Callable from itertools import product -from typing import Callable, Union +from typing import Union from unittest import mock import torch diff --git a/test/distributed/elastic/rendezvous/c10d_rendezvous_backend_test.py b/test/distributed/elastic/rendezvous/c10d_rendezvous_backend_test.py index 82bc62d439d..a0cffd57438 100644 --- a/test/distributed/elastic/rendezvous/c10d_rendezvous_backend_test.py +++ b/test/distributed/elastic/rendezvous/c10d_rendezvous_backend_test.py @@ -9,8 +9,9 @@ import os import tempfile from base64 import b64encode +from collections.abc import Callable from datetime import timedelta -from typing import Callable, cast, ClassVar +from typing import cast, ClassVar from unittest import mock, TestCase from rendezvous_backend_test import RendezvousBackendTestMixin diff --git a/test/distributed/elastic/rendezvous/dynamic_rendezvous_test.py b/test/distributed/elastic/rendezvous/dynamic_rendezvous_test.py index 173effd5cd0..0ee10159877 100644 --- a/test/distributed/elastic/rendezvous/dynamic_rendezvous_test.py +++ b/test/distributed/elastic/rendezvous/dynamic_rendezvous_test.py @@ -14,8 +14,9 @@ import threading import time from abc import ABC, abstractmethod from base64 import b64encode +from collections.abc import Callable from datetime import datetime, timedelta, timezone -from typing import Callable, cast, Optional +from typing import cast, Optional from unittest import TestCase from unittest.mock import call, MagicMock, Mock, patch, PropertyMock diff --git a/test/distributed/elastic/rendezvous/rendezvous_backend_test.py b/test/distributed/elastic/rendezvous/rendezvous_backend_test.py index 48815e21718..f4c0fd7b88d 100644 --- a/test/distributed/elastic/rendezvous/rendezvous_backend_test.py +++ b/test/distributed/elastic/rendezvous/rendezvous_backend_test.py @@ -7,7 +7,8 @@ # LICENSE file in the root directory of this source tree. from abc import ABC, abstractmethod -from typing import Any, Callable, cast, Optional +from collections.abc import Callable +from typing import Any, cast, Optional from torch.distributed.elastic.rendezvous import RendezvousStateError from torch.distributed.elastic.rendezvous.dynamic_rendezvous import ( diff --git a/test/distributed/fsdp/test_fsdp_core.py b/test/distributed/fsdp/test_fsdp_core.py index d6ee32c1f2e..45e58ea3d04 100644 --- a/test/distributed/fsdp/test_fsdp_core.py +++ b/test/distributed/fsdp/test_fsdp_core.py @@ -4,7 +4,8 @@ import functools import itertools import sys import unittest -from typing import Any, Callable, Optional +from collections.abc import Callable +from typing import Any, Optional from unittest import mock import torch diff --git a/test/distributed/fsdp/test_fsdp_optim_state.py b/test/distributed/fsdp/test_fsdp_optim_state.py index 09d24d5fba8..4db192ed7c3 100644 --- a/test/distributed/fsdp/test_fsdp_optim_state.py +++ b/test/distributed/fsdp/test_fsdp_optim_state.py @@ -2,9 +2,10 @@ import bisect import sys +from collections.abc import Callable from copy import deepcopy from enum import auto, Enum -from typing import Any, Callable, Optional +from typing import Any, Optional import torch import torch.nn as nn diff --git a/test/distributed/fsdp/test_wrap.py b/test/distributed/fsdp/test_wrap.py index f5769f8b534..aa224edaefa 100644 --- a/test/distributed/fsdp/test_wrap.py +++ b/test/distributed/fsdp/test_wrap.py @@ -5,8 +5,9 @@ import itertools import os import tempfile import unittest +from collections.abc import Callable from enum import auto, Enum -from typing import Callable, Union +from typing import Union import torch import torch.nn as nn diff --git a/test/distributed/pipelining/schedule_registry.py b/test/distributed/pipelining/schedule_registry.py index 9b401193a17..0b037bd8b99 100644 --- a/test/distributed/pipelining/schedule_registry.py +++ b/test/distributed/pipelining/schedule_registry.py @@ -2,7 +2,8 @@ # Owner(s): ["oncall: distributed"] # This file is a Schedule zoo for testing torch.distributed.pipelining. # It includes schedules designed purely for testing purposes -from typing import Callable, Optional +from collections.abc import Callable +from typing import Optional from torch.distributed.pipelining.schedules import ( _Action, diff --git a/test/distributed/tensor/test_pointwise_ops.py b/test/distributed/tensor/test_pointwise_ops.py index 28dd1ac9def..953709c1975 100644 --- a/test/distributed/tensor/test_pointwise_ops.py +++ b/test/distributed/tensor/test_pointwise_ops.py @@ -1,8 +1,8 @@ # Copyright (c) Meta Platforms, Inc. and affiliates # Owner(s): ["oncall: distributed"] -from collections.abc import Sequence -from typing import Any, Callable, Optional +from collections.abc import Callable, Sequence +from typing import Any, Optional from unittest import skip import torch diff --git a/test/distributed/tensor/test_xla_integration.py b/test/distributed/tensor/test_xla_integration.py index e39931e1f18..727b128b6b4 100644 --- a/test/distributed/tensor/test_xla_integration.py +++ b/test/distributed/tensor/test_xla_integration.py @@ -3,8 +3,9 @@ import os import unittest +from collections.abc import Callable from functools import wraps -from typing import Any, Callable +from typing import Any import numpy as np diff --git a/test/dynamo/test_subclasses.py b/test/dynamo/test_subclasses.py index 9d60cbe81c9..69e65311e90 100644 --- a/test/dynamo/test_subclasses.py +++ b/test/dynamo/test_subclasses.py @@ -2129,7 +2129,8 @@ class GraphModule(torch.nn.Module): @torch._dynamo.config.patch("inline_inbuilt_nn_modules", True) @parametrize("dynamic", [True, False]) def test_mark_static_with_subclass_desugaring(self, dynamic): - from typing import Any, Callable, Optional + from collections.abc import Callable + from typing import Any, Optional from torch._dynamo.decorators import mark_static_address from torch._inductor.compile_fx import compile_fx diff --git a/test/functorch/test_aotdispatch.py b/test/functorch/test_aotdispatch.py index aa0cc23fcd7..6cc214d9e07 100644 --- a/test/functorch/test_aotdispatch.py +++ b/test/functorch/test_aotdispatch.py @@ -10,9 +10,10 @@ import copy import itertools import unittest import warnings +from collections.abc import Callable from contextlib import ContextDecorator, ExitStack, nullcontext from functools import partial, wraps -from typing import Any, Callable, Optional, Union +from typing import Any, Optional, Union from unittest.mock import patch from common_utils import ( diff --git a/test/functorch/test_memory_efficient_fusion.py b/test/functorch/test_memory_efficient_fusion.py index 4926781d7f6..96e0ccaa6f4 100644 --- a/test/functorch/test_memory_efficient_fusion.py +++ b/test/functorch/test_memory_efficient_fusion.py @@ -3,7 +3,7 @@ import inspect import random import unittest -from typing import Callable +from collections.abc import Callable import torch import torch.fx as fx diff --git a/test/inductor/test_aot_inductor_package.py b/test/inductor/test_aot_inductor_package.py index 954607cc56e..5b2a3f85581 100644 --- a/test/inductor/test_aot_inductor_package.py +++ b/test/inductor/test_aot_inductor_package.py @@ -9,8 +9,8 @@ import sys import tempfile import unittest import zipfile +from collections.abc import Callable from pathlib import Path -from typing import Callable from parameterized import parameterized_class diff --git a/test/inductor/test_cache.py b/test/inductor/test_cache.py index 18b714c7075..3ff7d359350 100644 --- a/test/inductor/test_cache.py +++ b/test/inductor/test_cache.py @@ -8,7 +8,7 @@ from os import environ from pathlib import Path from random import randint from tempfile import gettempdir -from typing import Any, Callable, Sequence +from typing import Any, TYPE_CHECKING from typing_extensions import Self from unittest.mock import patch @@ -20,6 +20,10 @@ from torch.testing._internal.common_utils import ( ) +if TYPE_CHECKING: + from collections.abc import Callable, Sequence + + class TestMixin: @staticmethod def abstract_cache_types() -> set[type[icache.Cache]]: diff --git a/test/inductor/test_cpu_repro.py b/test/inductor/test_cpu_repro.py index 710f66e6900..32e8049dd7f 100644 --- a/test/inductor/test_cpu_repro.py +++ b/test/inductor/test_cpu_repro.py @@ -8,7 +8,7 @@ import os import platform import sys import unittest -from typing import Callable +from collections.abc import Callable from unittest.mock import patch import torch diff --git a/test/inductor/test_flex_attention.py b/test/inductor/test_flex_attention.py index ed796b0ffbb..e9a8fb6617f 100644 --- a/test/inductor/test_flex_attention.py +++ b/test/inductor/test_flex_attention.py @@ -7,10 +7,11 @@ import string import unittest import warnings from collections import namedtuple +from collections.abc import Callable from contextlib import contextmanager from dataclasses import dataclass from itertools import product -from typing import Callable, Optional, TypeVar, Union +from typing import Optional, TypeVar, Union from unittest import expectedFailure, skip, skipUnless from unittest.mock import patch diff --git a/test/inductor/test_flex_decoding.py b/test/inductor/test_flex_decoding.py index 849aefff8a9..ce0985c5726 100644 --- a/test/inductor/test_flex_decoding.py +++ b/test/inductor/test_flex_decoding.py @@ -5,7 +5,8 @@ import functools import sys import unittest from collections import namedtuple -from typing import Callable, Optional, Union +from collections.abc import Callable +from typing import Optional, Union from unittest import expectedFailure from unittest.mock import patch diff --git a/test/inductor/test_fxir_backend.py b/test/inductor/test_fxir_backend.py index acb2a844ad1..6ec5a3f9152 100644 --- a/test/inductor/test_fxir_backend.py +++ b/test/inductor/test_fxir_backend.py @@ -6,7 +6,8 @@ Test the FX IR backend. import itertools import operator import unittest -from typing import Callable, Optional +from collections.abc import Callable +from typing import Optional import sympy diff --git a/test/inductor/test_max_autotune.py b/test/inductor/test_max_autotune.py index b61d5dbb757..3419834d856 100644 --- a/test/inductor/test_max_autotune.py +++ b/test/inductor/test_max_autotune.py @@ -10,7 +10,8 @@ import random import re import tempfile import unittest -from typing import Callable, Optional +from collections.abc import Callable +from typing import Optional from unittest import mock import torch diff --git a/test/inductor/test_pattern_matcher.py b/test/inductor/test_pattern_matcher.py index bfdc3710064..5ad43f9a7ee 100644 --- a/test/inductor/test_pattern_matcher.py +++ b/test/inductor/test_pattern_matcher.py @@ -3,7 +3,8 @@ import copy import itertools import os import unittest -from typing import Callable, Optional +from collections.abc import Callable +from typing import Optional import torch import torch._dynamo.config as dynamo_config @@ -180,8 +181,7 @@ class TestPatternMatcher(TestCase): self._test_fused_int_mm_mul_impl(fn2, args, True) def test_duplicate_search(self): - from collections.abc import Iterable - from typing import Callable + from collections.abc import Callable, Iterable import torch from torch._inductor.pattern_matcher import ( diff --git a/test/inductor/test_profiler.py b/test/inductor/test_profiler.py index f22f0374813..e6cf6bbcc91 100644 --- a/test/inductor/test_profiler.py +++ b/test/inductor/test_profiler.py @@ -3,7 +3,8 @@ import json import os import tempfile import unittest -from typing import Callable, Optional +from collections.abc import Callable +from typing import Optional import torch import torch._inductor.test_case diff --git a/test/inductor/test_select_algorithm.py b/test/inductor/test_select_algorithm.py index 101ed60526b..188bc961b58 100644 --- a/test/inductor/test_select_algorithm.py +++ b/test/inductor/test_select_algorithm.py @@ -2,7 +2,7 @@ import contextlib import functools import unittest.mock -from typing import Callable +from collections.abc import Callable from unittest.mock import patch import torch diff --git a/test/inductor/test_torchinductor.py b/test/inductor/test_torchinductor.py index e2dbd6e45d4..fdd6180babe 100644 --- a/test/inductor/test_torchinductor.py +++ b/test/inductor/test_torchinductor.py @@ -19,8 +19,9 @@ import time import unittest import unittest.mock import weakref +from collections.abc import Callable from pathlib import Path -from typing import Callable, TypeVar +from typing import TypeVar from typing_extensions import ParamSpec from unittest.mock import patch diff --git a/test/inductor/test_torchinductor_codegen_config_overrides.py b/test/inductor/test_torchinductor_codegen_config_overrides.py index a85c60b625f..3b3014c48e0 100644 --- a/test/inductor/test_torchinductor_codegen_config_overrides.py +++ b/test/inductor/test_torchinductor_codegen_config_overrides.py @@ -1,6 +1,7 @@ # Owner(s): ["module: inductor"] import importlib -from typing import Any, Callable, Optional +from collections.abc import Callable +from typing import Any, Optional from unittest import skipIf import torch diff --git a/test/inductor/test_torchinductor_strided_blocks.py b/test/inductor/test_torchinductor_strided_blocks.py index 9b4da470b62..aa30f6a7cf1 100644 --- a/test/inductor/test_torchinductor_strided_blocks.py +++ b/test/inductor/test_torchinductor_strided_blocks.py @@ -5,7 +5,8 @@ import dataclasses import importlib import math import unittest -from typing import Any, Callable, Optional, Union +from collections.abc import Callable +from typing import Any, Optional, Union import torch import torch.utils._pytree as pytree diff --git a/test/onnx/onnx_test_common.py b/test/onnx/onnx_test_common.py index ab2bfb51bde..bdeeb40cb9f 100644 --- a/test/onnx/onnx_test_common.py +++ b/test/onnx/onnx_test_common.py @@ -7,8 +7,8 @@ import dataclasses import io import os import unittest -from collections.abc import Collection, Iterable, Mapping, Sequence -from typing import Any, Callable, Optional, Union +from collections.abc import Callable, Collection, Iterable, Mapping, Sequence +from typing import Any, Optional, Union import numpy as np import onnxruntime diff --git a/test/onnx/torchlib/ops_test_common.py b/test/onnx/torchlib/ops_test_common.py index 54ecbdc1951..72243faf3b5 100644 --- a/test/onnx/torchlib/ops_test_common.py +++ b/test/onnx/torchlib/ops_test_common.py @@ -12,8 +12,8 @@ import pprint import sys import unittest import warnings -from collections.abc import Collection, Iterable, Mapping, Sequence -from typing import Any, Callable, Optional, TypeVar +from collections.abc import Callable, Collection, Iterable, Mapping, Sequence +from typing import Any, Optional, TypeVar import error_reproduction import numpy as np diff --git a/test/onnx/torchlib/ops_test_data.py b/test/onnx/torchlib/ops_test_data.py index 0194cd0335f..6adb43044e5 100644 --- a/test/onnx/torchlib/ops_test_data.py +++ b/test/onnx/torchlib/ops_test_data.py @@ -39,7 +39,7 @@ from __future__ import annotations import copy import dataclasses import functools -from typing import Any, Callable, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from typing_extensions import Self import numpy as np @@ -52,7 +52,7 @@ from torch.testing._internal.opinfo import definitions as opinfo_definitions if TYPE_CHECKING: - from collections.abc import Collection + from collections.abc import Callable, Collection # Create a copy of the op_db to modify diff --git a/test/onnx/torchlib/test_ops.py b/test/onnx/torchlib/test_ops.py index a7a52698cd2..be4cda66dc2 100644 --- a/test/onnx/torchlib/test_ops.py +++ b/test/onnx/torchlib/test_ops.py @@ -25,7 +25,7 @@ errors. from __future__ import annotations import os -from typing import Callable, Optional, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING import error_reproduction import numpy as np @@ -44,7 +44,7 @@ from torch.utils import _pytree as pytree if TYPE_CHECKING: import unittest - from collections.abc import Sequence + from collections.abc import Callable, Sequence from torch.testing._internal.opinfo import core as opinfo_core diff --git a/test/profiler/test_memory_profiler.py b/test/profiler/test_memory_profiler.py index 4d7a97bdc5f..814074d768e 100644 --- a/test/profiler/test_memory_profiler.py +++ b/test/profiler/test_memory_profiler.py @@ -4,8 +4,8 @@ import gc import itertools as it import textwrap import unittest -from collections.abc import Iterator -from typing import Callable, Optional +from collections.abc import Callable, Iterator +from typing import Optional import torch from torch._C._profiler import _EventType, _TensorMetadata diff --git a/test/test_public_bindings.py b/test/test_public_bindings.py index 09bbbcbadcc..fa21705c76e 100644 --- a/test/test_public_bindings.py +++ b/test/test_public_bindings.py @@ -7,7 +7,7 @@ import logging import os import pkgutil import unittest -from typing import Callable +from collections.abc import Callable import torch from torch._utils_internal import get_file_path_2 # @manual diff --git a/test/test_sympy_utils.py b/test/test_sympy_utils.py index 3f5fcee2ed5..75396631fed 100644 --- a/test/test_sympy_utils.py +++ b/test/test_sympy_utils.py @@ -5,7 +5,7 @@ import itertools import math import pickle import sys -from typing import Callable +from collections.abc import Callable import sympy diff --git a/test/test_testing.py b/test/test_testing.py index 00fb106ac2a..1735bcdcbb0 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -12,7 +12,8 @@ import re import subprocess import sys import unittest.mock -from typing import Any, Callable +from typing import Any +from collections.abc import Callable from collections.abc import Iterator import torch