diff --git a/test/export/test_export.py b/test/export/test_export.py index db206da874b..632559abba4 100755 --- a/test/export/test_export.py +++ b/test/export/test_export.py @@ -3,7 +3,6 @@ # flake8: noqa import copy import dataclasses -import io import logging import operator import re @@ -19,7 +18,7 @@ import torch._dynamo as torchdynamo import torch.nn.functional as F from functorch.experimental.control_flow import cond, map from torch import Tensor -from torch._decomp import decomposition_table, get_decompositions +from torch._decomp import decomposition_table from torch._dynamo.test_case import TestCase from torch._dynamo.testing import normalize_gm from torch._export.pass_base import _ExportPassBaseDeprecatedDoNotUse @@ -59,7 +58,6 @@ from torch.testing._internal.common_cuda import ( PLATFORM_SUPPORTS_FLASH_ATTENTION, SM90OrLater, ) -from torch.testing._internal.common_device_type import onlyCPU, onlyCUDA from torch.testing._internal.common_utils import ( find_library_location, IS_FBCODE, diff --git a/test/export/test_hop.py b/test/export/test_hop.py index bef41c61745..aef6bc3ebb0 100644 --- a/test/export/test_hop.py +++ b/test/export/test_hop.py @@ -14,11 +14,7 @@ from torch.testing._internal.common_device_type import ( instantiate_device_type_tests, ops, ) -from torch.testing._internal.common_utils import ( - IS_WINDOWS, - run_tests, - TestCase as TorchTestCase, -) +from torch.testing._internal.common_utils import IS_WINDOWS, run_tests from torch.testing._internal.hop_db import ( FIXME_hop_that_doesnt_have_opinfo_test_allowlist, hop_db, diff --git a/test/export/test_swap.py b/test/export/test_swap.py index 15628012380..8833c3c94ae 100644 --- a/test/export/test_swap.py +++ b/test/export/test_swap.py @@ -1,51 +1,18 @@ # Owner(s): ["oncall: export"] # flake8: noqa -import copy -import dataclasses import unittest -from contextlib import contextmanager from dataclasses import dataclass -from re import escape from typing import Any, List from parameterized import parameterized_class import torch import torch._dynamo as torchdynamo -from functorch.experimental.control_flow import cond, map from torch import Tensor -from torch._export.utils import ( - get_buffer, - get_param, - is_buffer, - is_param, - register_dataclass_as_pytree_node, -) -from torch._higher_order_ops.torchbind import enable_torchbind_tracing -from torch.export import Constraint, Dim, export, FlatArgsAdapter, unflatten +from torch._export.utils import register_dataclass_as_pytree_node +from torch.export import export from torch.export._swap import _swap_modules -from torch.export._trace import DEFAULT_EXPORT_DYNAMO_CONFIG -from torch.fx.experimental.proxy_tensor import make_fx -from torch.testing import FileCheck -from torch.testing._internal.common_utils import ( - find_library_location, - IS_FBCODE, - IS_MACOS, - IS_SANDCASTLE, - IS_WINDOWS, - run_tests, - skipIfTorchDynamo, - TestCase, -) -from torch.testing._internal.torchbind_impls import init_torchbind_implementations -from torch.utils._pytree import ( - LeafSpec, - tree_flatten, - tree_unflatten, - TreeSpec, - treespec_dumps, - treespec_loads, -) +from torch.testing._internal.common_utils import IS_WINDOWS, run_tests, TestCase @unittest.skipIf(IS_WINDOWS, "Windows not supported for this test") diff --git a/test/export/test_unflatten.py b/test/export/test_unflatten.py index dacecf7c6aa..0bc7ce391cc 100644 --- a/test/export/test_unflatten.py +++ b/test/export/test_unflatten.py @@ -1,49 +1,23 @@ # Owner(s): ["oncall: export"] # flake8: noqa import copy -import dataclasses import unittest -from contextlib import contextmanager -from dataclasses import dataclass from re import escape from typing import Any, List import torch import torch._dynamo as torchdynamo -from functorch.experimental.control_flow import cond, map -from torch import Tensor -from torch._export.utils import ( - get_buffer, - get_param, - is_buffer, - is_param, - register_dataclass_as_pytree_node, -) from torch._higher_order_ops.torchbind import enable_torchbind_tracing -from torch.export import Constraint, Dim, export, FlatArgsAdapter, unflatten -from torch.export._trace import DEFAULT_EXPORT_DYNAMO_CONFIG +from torch.export import export, FlatArgsAdapter, unflatten from torch.export.unflatten import _disable_interpreter -from torch.fx.experimental.proxy_tensor import make_fx -from torch.testing import FileCheck from torch.testing._internal.common_utils import ( - find_library_location, - IS_FBCODE, - IS_MACOS, - IS_SANDCASTLE, IS_WINDOWS, run_tests, skipIfTorchDynamo, TestCase, ) from torch.testing._internal.torchbind_impls import init_torchbind_implementations -from torch.utils._pytree import ( - LeafSpec, - tree_flatten, - tree_unflatten, - TreeSpec, - treespec_dumps, - treespec_loads, -) +from torch.utils._pytree import TreeSpec @unittest.skipIf(not torchdynamo.is_dynamo_supported(), "dynamo isn't support")