Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/fx/test_matcher_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import os
import sys
from typing import Callable
from collections.abc import Callable

import torch
import torch.nn.functional as F
Expand Down
3 changes: 2 additions & 1 deletion test/test_fx.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
from torch.fx.operator_schemas import get_signature_for_torch_op
from copy import deepcopy
from collections import namedtuple
from typing import Any, Callable, NamedTuple, Optional, Union
from typing import Any, NamedTuple, Optional, Union
from collections.abc import Callable

import torch

Expand Down
3 changes: 2 additions & 1 deletion test/test_fx_experimental.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import typing
import unittest
from types import BuiltinFunctionType
from typing import Callable, NamedTuple, Optional, Union
from typing import NamedTuple, Optional, Union
from collections.abc import Callable

import torch
import torch.fx.experimental.meta_tracer
Expand Down
3 changes: 2 additions & 1 deletion torch/distributed/pipelining/microbatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# Copyright (c) Meta Platforms, Inc. and affiliates
import logging
import operator
from typing import Any, Optional, Sequence
from collections.abc import Sequence
from typing import Any, Optional

import torch
from torch.fx.node import map_aggregate
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/_compatibility.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import textwrap
from typing import Any, Callable, TypeVar
from collections.abc import Callable
from typing import Any, TypeVar


_BACK_COMPAT_OBJECTS: dict[Any, None] = {}
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/_graph_pickler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import io
import pickle
from abc import abstractmethod
from typing import Any, Callable, NewType, Optional, TypeVar, Union
from collections.abc import Callable
from typing import Any, NewType, Optional, TypeVar, Union
from typing_extensions import override, Self

import torch
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/_pytree.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from collections import namedtuple
from typing import Any, Callable, Optional, TypeVar
from collections.abc import Callable
from typing import Any, Optional, TypeVar
from typing_extensions import NamedTuple

import torch.return_types
Expand Down
4 changes: 2 additions & 2 deletions torch/fx/_symbolic_trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import math
import os
import warnings
from collections.abc import Callable
from itertools import chain
from types import CodeType, FunctionType, ModuleType
from typing import Any, Callable, get_args, NamedTuple, Optional, Union
from typing_extensions import TypeAlias
from typing import Any, get_args, NamedTuple, Optional, TypeAlias, Union

import torch
import torch.utils._pytree as pytree
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/_dynamism.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import re
from typing import Any, Callable, Union
from collections.abc import Callable
from typing import Any, Union

import torch
from torch.utils._pytree import tree_flatten_with_path, tree_map
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/const_fold.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mypy: allow-untyped-defs
import re
from typing import Callable, Optional, Union
from collections.abc import Callable
from typing import Optional, Union

import torch.fx
from torch.fx.node import map_arg
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/graph_gradual_typechecker.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# mypy: allow-untyped-defs
import itertools
import operator
from collections.abc import Callable
from functools import reduce
from typing import Callable, TypeVar
from typing import TypeVar
from typing_extensions import ParamSpec

import sympy
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/meta_tracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import builtins
import functools
import warnings
from typing import Any, Callable, Optional, Union
from collections.abc import Callable
from typing import Any, Optional, Union

import torch
import torch.fx
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# mypy: allow-untyped-defs
import operator
import warnings
from collections.abc import Iterable
from typing import Callable, TypeVar
from collections.abc import Callable, Iterable
from typing import TypeVar
from typing_extensions import ParamSpec

import torch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# mypy: ignore-errors
import copy
import itertools
from typing import Callable
from collections.abc import Callable

from torch.fx.experimental.migrate_gradual_types.constraint import (
ApplyBroadcasting,
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/normalize.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mypy: allow-untyped-defs
import operator
from typing import Any, Callable, Optional
from collections.abc import Callable
from typing import Any, Optional

import torch
import torch.fx
Expand Down
6 changes: 3 additions & 3 deletions torch/fx/experimental/proxy_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
import typing_extensions
import weakref
from collections import defaultdict, OrderedDict
from collections.abc import Generator, Mapping, Sequence
from collections.abc import Callable, Generator, Mapping, Sequence
from contextlib import _GeneratorContextManager, contextmanager, ExitStack, nullcontext
from dataclasses import dataclass
from typing import (
Any,
Callable,
Concatenate,
Optional,
overload,
Protocol,
TYPE_CHECKING,
TypeVar,
Union,
)
from typing_extensions import Concatenate, ParamSpec, Self, TypeVarTuple, Unpack
from typing_extensions import ParamSpec, Self, TypeVarTuple, Unpack
from weakref import WeakKeyDictionary

import torch
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/recording.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
import inspect
import itertools
import logging
from collections.abc import Callable
from dataclasses import dataclass
from typing import Any, Callable, Optional, Union
from typing import Any, Optional, Union

import torch
import torch.utils._pytree as pytree
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/rewriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import functools
import inspect
import textwrap
from collections.abc import Callable
from types import FunctionType
from typing import Any, Callable, cast, Optional, Union
from typing import Any, cast, Optional, Union

import torch
from torch._sources import normalize_source_lines
Expand Down
7 changes: 4 additions & 3 deletions torch/fx/experimental/symbolic_shapes.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,24 @@
import threading
import traceback
from collections import Counter, defaultdict
from collections.abc import Generator, Iterator, Mapping, Sequence
from collections.abc import Callable, Generator, Iterator, Mapping, Sequence
from contextlib import _GeneratorContextManager, contextmanager
from dataclasses import asdict, dataclass, field
from enum import Enum
from typing import (
Any,
Callable,
cast,
Generic,
NamedTuple,
NoReturn,
Optional,
TYPE_CHECKING,
TypeAlias,
TypeGuard,
TypeVar,
Union,
)
from typing_extensions import deprecated, ParamSpec, TypeAlias, TypeGuard
from typing_extensions import deprecated, ParamSpec

import torch
import torch.fx
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/unification/multipledispatch/core.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mypy: allow-untyped-defs
import inspect
from typing import Any, Callable, TypeVar
from collections.abc import Callable
from typing import Any, TypeVar
from typing_extensions import TypeVarTuple, Unpack

from .dispatcher import Dispatcher, MethodDispatcher
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/experimental/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
import logging
import math
import operator
from collections.abc import Callable
from dataclasses import dataclass
from typing import Any, Callable, Optional, Union
from typing import Any, Optional, Union

import sympy

Expand Down
4 changes: 2 additions & 2 deletions torch/fx/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import typing
import warnings
from collections import defaultdict
from collections.abc import Iterable, Iterator
from collections.abc import Callable, Iterable, Iterator
from contextlib import contextmanager
from dataclasses import dataclass
from typing import Any, Callable, Literal, NamedTuple, Optional, TYPE_CHECKING
from typing import Any, Literal, NamedTuple, Optional, TYPE_CHECKING

import torch
import torch.utils._pytree as pytree
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/graph_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import sys
import traceback
import warnings
from collections.abc import Callable
from pathlib import Path
from typing import Any, Callable, Optional, Union
from typing import Any, Optional, Union

import torch
import torch.nn as nn
Expand Down
6 changes: 3 additions & 3 deletions torch/fx/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import logging
import operator
import types
from collections.abc import Iterable, Mapping, Sequence
from typing import Any, Callable, Optional, TYPE_CHECKING, Union
from typing_extensions import ParamSpec, TypeAlias, TypeVar
from collections.abc import Callable, Iterable, Mapping, Sequence
from typing import Any, Optional, TYPE_CHECKING, TypeAlias, Union
from typing_extensions import ParamSpec, TypeVar

import torch
from torch._C import _fx_map_aggregate, _fx_map_arg, _NodeBase
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/operator_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import types
import typing
import warnings
from typing import Any, Callable, cast, NamedTuple, Optional, TYPE_CHECKING
from collections.abc import Callable
from typing import Any, cast, NamedTuple, Optional, TYPE_CHECKING

import torch
from torch._jit_internal import boolean_dispatched
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/graph_transform_observer.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mypy: allow-untyped-defs
import os
from typing import Callable, Optional, TypeVar
from collections.abc import Callable
from typing import Optional, TypeVar

from torch.fx import Graph, Node
from torch.fx._compatibility import compatibility
Expand Down
2 changes: 1 addition & 1 deletion torch/fx/passes/infra/pass_manager.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# mypy: allow-untyped-defs
import inspect
import logging
from collections.abc import Callable
from functools import wraps
from queue import Queue
from typing import Callable

import torch.nn as nn
from torch.fx._compatibility import compatibility
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/net_min_base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# mypy: allow-untyped-defs
import logging
from collections.abc import Callable
from dataclasses import dataclass
from typing import Any, Callable, cast, Optional
from typing import Any, cast, Optional

import torch
import torch.fx
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/param_fetch.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Any, Callable
from collections.abc import Callable
from typing import Any

import torch
import torch.nn as nn
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/pass_manager.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# mypy: allow-untyped-defs
import logging
from collections.abc import Callable
from functools import wraps
from inspect import unwrap
from typing import Callable, Optional
from typing import Optional


logger = logging.getLogger(__name__)
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/reinplace.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
import _operator
import itertools
from collections import defaultdict
from collections.abc import Callable
from enum import Enum
from typing import Any, Callable
from typing import Any

import torch
from torch._subclasses.fake_tensor import FakeTensor, FakeTensorMode
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/split_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import inspect
import logging
from collections import OrderedDict
from typing import Any, Callable, Optional
from collections.abc import Callable
from typing import Any, Optional

import torch
from torch.fx._compatibility import compatibility
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/passes/utils/source_matcher_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import logging
import os
from collections.abc import Callable
from dataclasses import dataclass, field
from typing import Any, Callable, Optional
from typing import Any, Optional

from torch.fx._compatibility import compatibility
from torch.fx.graph import Graph
Expand Down
4 changes: 2 additions & 2 deletions torch/fx/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import sys
import traceback
from collections import OrderedDict
from collections.abc import Iterator
from collections.abc import Callable, Iterator
from dataclasses import fields, is_dataclass
from typing import Any, Callable, Optional
from typing import Any, Optional

import torch
import torch.fx.traceback as fx_traceback
Expand Down
3 changes: 2 additions & 1 deletion torch/fx/subgraph_rewriter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import copy
from collections.abc import Callable
from dataclasses import dataclass
from typing import Any, Callable, NamedTuple, Optional, TYPE_CHECKING, Union
from typing import Any, NamedTuple, Optional, TYPE_CHECKING, Union

import torch

Expand Down
Loading