diff --git a/pyproject.toml b/pyproject.toml index 3145ee7dc34e3..33b5501fccb0d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,10 +23,6 @@ known_first_party = [ "tests", ] skip_glob = [ - # todo - "pytorch_lightning/accelerators/*", - - # todo "pytorch_lightning/core/*", diff --git a/pytorch_lightning/accelerators/__init__.py b/pytorch_lightning/accelerators/__init__.py index 6b8414c4d26a2..d8bf7061de11f 100644 --- a/pytorch_lightning/accelerators/__init__.py +++ b/pytorch_lightning/accelerators/__init__.py @@ -11,15 +11,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from pytorch_lightning.accelerators.accelerator import Accelerator # noqa: F401 from pytorch_lightning.accelerators.cpu_accelerator import CPUAccelerator # noqa: F401 from pytorch_lightning.accelerators.ddp2_accelerator import DDP2Accelerator # noqa: F401 from pytorch_lightning.accelerators.ddp_accelerator import DDPAccelerator # noqa: F401 -from pytorch_lightning.accelerators.ddp_spawn_accelerator import DDPSpawnAccelerator # noqa: F401 +from pytorch_lightning.accelerators.ddp_cpu_hpc_accelerator import DDPCPUHPCAccelerator # noqa: F401 from pytorch_lightning.accelerators.ddp_cpu_spawn_accelerator import DDPCPUSpawnAccelerator # noqa: F401 +from pytorch_lightning.accelerators.ddp_hpc_accelerator import DDPHPCAccelerator # noqa: F401 +from pytorch_lightning.accelerators.ddp_spawn_accelerator import DDPSpawnAccelerator # noqa: F401 from pytorch_lightning.accelerators.dp_accelerator import DataParallelAccelerator # noqa: F401 from pytorch_lightning.accelerators.gpu_accelerator import GPUAccelerator # noqa: F401 -from pytorch_lightning.accelerators.tpu_accelerator import TPUAccelerator # noqa: F401 from pytorch_lightning.accelerators.horovod_accelerator import HorovodAccelerator # noqa: F401 -from pytorch_lightning.accelerators.ddp_hpc_accelerator import DDPHPCAccelerator # noqa: F401 -from pytorch_lightning.accelerators.ddp_cpu_hpc_accelerator import DDPCPUHPCAccelerator # noqa: F401 -from pytorch_lightning.accelerators.accelerator import Accelerator # noqa: F401 +from pytorch_lightning.accelerators.tpu_accelerator import TPUAccelerator # noqa: F401 diff --git a/pytorch_lightning/accelerators/accelerator_connector.py b/pytorch_lightning/accelerators/accelerator_connector.py index f04e3704550ff..d9dcc5cbd0a88 100644 --- a/pytorch_lightning/accelerators/accelerator_connector.py +++ b/pytorch_lightning/accelerators/accelerator_connector.py @@ -15,13 +15,19 @@ import torch -from pytorch_lightning.utilities import _HOROVOD_AVAILABLE, DeviceType, DistributedType from pytorch_lightning import _logger as log from pytorch_lightning import accelerators from pytorch_lightning.accelerators.accelerator import Accelerator from pytorch_lightning.cluster_environments.slurm_environment import SLURMEnvironment from pytorch_lightning.cluster_environments.torchelastic_environment import TorchElasticEnvironment -from pytorch_lightning.utilities import device_parser, rank_zero_only, _TPU_AVAILABLE +from pytorch_lightning.utilities import ( + _HOROVOD_AVAILABLE, + _TPU_AVAILABLE, + device_parser, + DeviceType, + DistributedType, + rank_zero_only, +) from pytorch_lightning.utilities.distributed import rank_zero_info, rank_zero_warn from pytorch_lightning.utilities.exceptions import MisconfigurationException diff --git a/pytorch_lightning/accelerators/cpu_accelerator.py b/pytorch_lightning/accelerators/cpu_accelerator.py index b0a6e1b601713..7c80a4a30d223 100644 --- a/pytorch_lightning/accelerators/cpu_accelerator.py +++ b/pytorch_lightning/accelerators/cpu_accelerator.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Any, Optional, Union, Callable +from typing import Any, Callable, Optional, Union import torch diff --git a/pytorch_lightning/accelerators/horovod_accelerator.py b/pytorch_lightning/accelerators/horovod_accelerator.py index cc0297b4de017..150be86210866 100644 --- a/pytorch_lightning/accelerators/horovod_accelerator.py +++ b/pytorch_lightning/accelerators/horovod_accelerator.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. from contextlib import ExitStack -from typing import Any, Optional, Union, Callable +from typing import Any, Callable, Optional, Union import torch from torch.optim.lr_scheduler import _LRScheduler