Skip to content

Commit 1b26ac4

Browse files
[pre-commit.ci] pre-commit suggestions (#20532)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> Co-authored-by: Jirka B <j.borovec+github@gmail.com>
1 parent 76f0c54 commit 1b26ac4

File tree

289 files changed

+628
-511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+628
-511
lines changed

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ We welcome any useful contribution! For your convenience here's a recommended wo
182182
1. Use tags in PR name for the following cases:
183183

184184
- **\[blocked by #<number>\]** if your work is dependent on other PRs.
185-
- **\[wip\]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime.
185+
- **[wip]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime.
186186

187187
### Question & Answer
188188

.github/workflows/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Brief description of all our automation tools used for boosting development perf
1616
| .azure-pipelines/gpu-benchmarks.yml | Run speed/memory benchmarks for parity with vanila PyTorch. | GPU |
1717
| .github/workflows/ci-flagship-apps.yml | Run end-2-end tests with full applications, including deployment to the production cloud. | CPU |
1818
| .github/workflows/ci-tests-pytorch.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU |
19-
| .github/workflows/tpu-tests.yml | Run only TPU-specific tests. Requires that the PR title contains '\[TPU\]' | TPU |
19+
| .github/workflows/tpu-tests.yml | Run only TPU-specific tests. Requires that the PR title contains '[TPU]' | TPU |
2020

2121
\* Each standalone test needs to be run in separate processes to avoid unwanted interactions between test cases.
2222

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ci:
2323

2424
repos:
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v4.6.0
26+
rev: v5.0.0
2727
hooks:
2828
- id: end-of-file-fixer
2929
- id: trailing-whitespace
@@ -65,12 +65,12 @@ repos:
6565
args: ["--in-place"]
6666

6767
- repo: https://github.com/sphinx-contrib/sphinx-lint
68-
rev: v0.9.1
68+
rev: v1.0.0
6969
hooks:
7070
- id: sphinx-lint
7171

7272
- repo: https://github.com/astral-sh/ruff-pre-commit
73-
rev: v0.5.0
73+
rev: v0.8.6
7474
hooks:
7575
# try to fix what is possible
7676
- id: ruff
@@ -81,7 +81,7 @@ repos:
8181
- id: ruff
8282

8383
- repo: https://github.com/executablebooks/mdformat
84-
rev: 0.7.17
84+
rev: 0.7.21
8585
hooks:
8686
- id: mdformat
8787
additional_dependencies:

examples/fabric/build_your_own_trainer/run.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import lightning as L
21
import torch
32
from torchmetrics.functional.classification.accuracy import accuracy
43
from trainer import MyCustomTrainer
54

5+
import lightning as L
6+
67

78
class MNISTModule(L.LightningModule):
89
def __init__(self) -> None:

examples/fabric/build_your_own_trainer/trainer.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
from functools import partial
44
from typing import Any, Literal, Optional, Union, cast
55

6-
import lightning as L
76
import torch
7+
from lightning_utilities import apply_to_collection
8+
from tqdm import tqdm
9+
10+
import lightning as L
811
from lightning.fabric.accelerators import Accelerator
912
from lightning.fabric.loggers import Logger
1013
from lightning.fabric.strategies import Strategy
1114
from lightning.fabric.wrappers import _unwrap_objects
1215
from lightning.pytorch.utilities.model_helpers import is_overridden
13-
from lightning_utilities import apply_to_collection
14-
from tqdm import tqdm
1516

1617

1718
class MyCustomTrainer:

examples/fabric/dcgan/train_fabric.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import torch.utils.data
1717
import torchvision.transforms as transforms
1818
import torchvision.utils
19-
from lightning.fabric import Fabric, seed_everything
2019
from torchvision.datasets import CelebA
2120

21+
from lightning.fabric import Fabric, seed_everything
22+
2223
# Root directory for dataset
2324
dataroot = "data/"
2425
# Number of workers for dataloader

examples/fabric/fp8_distributed_transformer/train.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import lightning as L
21
import torch
32
import torch.nn as nn
43
import torch.nn.functional as F
5-
from lightning.fabric.strategies import ModelParallelStrategy
6-
from lightning.pytorch.demos import Transformer, WikiText2
74
from torch.distributed._composable.fsdp.fully_shard import fully_shard
85
from torch.distributed.device_mesh import DeviceMesh
96
from torch.utils.data import DataLoader
107
from torchao.float8 import Float8LinearConfig, convert_to_float8_training
118
from tqdm import tqdm
129

10+
import lightning as L
11+
from lightning.fabric.strategies import ModelParallelStrategy
12+
from lightning.pytorch.demos import Transformer, WikiText2
13+
1314

1415
def configure_model(model: nn.Module, device_mesh: DeviceMesh) -> nn.Module:
1516
float8_config = Float8LinearConfig(

examples/fabric/image_classifier/train_fabric.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@
3636
import torch.nn.functional as F
3737
import torch.optim as optim
3838
import torchvision.transforms as T
39-
from lightning.fabric import Fabric, seed_everything
4039
from torch.optim.lr_scheduler import StepLR
4140
from torchmetrics.classification import Accuracy
4241
from torchvision.datasets import MNIST
4342

43+
from lightning.fabric import Fabric, seed_everything
44+
4445
DATASETS_PATH = path.join(path.dirname(__file__), "..", "..", "..", "Datasets")
4546

4647

examples/fabric/kfold_cv/train_fabric.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
import torch.nn.functional as F
2121
import torch.optim as optim
2222
import torchvision.transforms as T
23-
from lightning.fabric import Fabric, seed_everything
2423
from sklearn import model_selection
2524
from torch.utils.data import DataLoader, SubsetRandomSampler
2625
from torchmetrics.classification import Accuracy
2726
from torchvision.datasets import MNIST
2827

28+
from lightning.fabric import Fabric, seed_everything
29+
2930
DATASETS_PATH = path.join(path.dirname(__file__), "..", "..", "..", "Datasets")
3031

3132

examples/fabric/language_model/train.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import lightning as L
21
import torch
32
import torch.nn.functional as F
4-
from lightning.pytorch.demos import Transformer, WikiText2
53
from torch.utils.data import DataLoader, random_split
64

5+
import lightning as L
6+
from lightning.pytorch.demos import Transformer, WikiText2
7+
78

89
def main():
910
L.seed_everything(42)

examples/fabric/meta_learning/train_fabric.py

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import cherry
1919
import learn2learn as l2l
2020
import torch
21+
2122
from lightning.fabric import Fabric, seed_everything
2223

2324

examples/fabric/reinforcement_learning/rl/agent.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import gymnasium as gym
44
import torch
55
import torch.nn.functional as F
6-
from lightning.pytorch import LightningModule
76
from torch import Tensor
87
from torch.distributions import Categorical
98
from torchmetrics import MeanMetric
109

10+
from lightning.pytorch import LightningModule
1111
from rl.loss import entropy_loss, policy_loss, value_loss
1212
from rl.utils import layer_init
1313

examples/fabric/reinforcement_learning/train_fabric.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
import gymnasium as gym
2626
import torch
2727
import torchmetrics
28-
from lightning.fabric import Fabric
29-
from lightning.fabric.loggers import TensorBoardLogger
3028
from rl.agent import PPOLightningAgent
3129
from rl.utils import linear_annealing, make_env, parse_args, test
3230
from torch import Tensor
3331
from torch.utils.data import BatchSampler, DistributedSampler, RandomSampler
3432

33+
from lightning.fabric import Fabric
34+
from lightning.fabric.loggers import TensorBoardLogger
35+
3536

3637
def train(
3738
fabric: Fabric,

examples/fabric/reinforcement_learning/train_fabric_decoupled.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@
2525

2626
import gymnasium as gym
2727
import torch
28-
from lightning.fabric import Fabric
29-
from lightning.fabric.loggers import TensorBoardLogger
30-
from lightning.fabric.plugins.collectives import TorchCollective
31-
from lightning.fabric.plugins.collectives.collective import CollectibleGroup
32-
from lightning.fabric.strategies import DDPStrategy
3328
from rl.agent import PPOLightningAgent
3429
from rl.utils import linear_annealing, make_env, parse_args, test
3530
from torch.distributed.algorithms.join import Join
3631
from torch.utils.data import BatchSampler, DistributedSampler, RandomSampler
3732
from torchmetrics import MeanMetric
3833

34+
from lightning.fabric import Fabric
35+
from lightning.fabric.loggers import TensorBoardLogger
36+
from lightning.fabric.plugins.collectives import TorchCollective
37+
from lightning.fabric.plugins.collectives.collective import CollectibleGroup
38+
from lightning.fabric.strategies import DDPStrategy
39+
3940

4041
@torch.no_grad()
4142
def player(args, world_collective: TorchCollective, player_trainer_collective: TorchCollective):

examples/fabric/tensor_parallel/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ Training successfully completed!
4141
Peak memory usage: 17.95 GB
4242
```
4343

44-
> \[!NOTE\]
44+
> [!NOTE]
4545
> The `ModelParallelStrategy` is experimental and subject to change. Report issues on [GitHub](https://github.com/Lightning-AI/pytorch-lightning/issues).

examples/fabric/tensor_parallel/train.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import lightning as L
21
import torch
32
import torch.nn.functional as F
43
from data import RandomTokenDataset
5-
from lightning.fabric.strategies import ModelParallelStrategy
64
from model import ModelArgs, Transformer
75
from parallelism import parallelize
86
from torch.distributed.tensor.parallel import loss_parallel
97
from torch.utils.data import DataLoader
108

9+
import lightning as L
10+
from lightning.fabric.strategies import ModelParallelStrategy
11+
1112

1213
def train():
1314
strategy = ModelParallelStrategy(

examples/pytorch/basics/autoencoder.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222

2323
import torch
2424
import torch.nn.functional as F
25+
from torch import nn
26+
from torch.utils.data import DataLoader, random_split
27+
2528
from lightning.pytorch import LightningDataModule, LightningModule, Trainer, callbacks, cli_lightning_logo
2629
from lightning.pytorch.cli import LightningCLI
2730
from lightning.pytorch.demos.mnist_datamodule import MNIST
2831
from lightning.pytorch.utilities import rank_zero_only
2932
from lightning.pytorch.utilities.imports import _TORCHVISION_AVAILABLE
30-
from torch import nn
31-
from torch.utils.data import DataLoader, random_split
3233

3334
if _TORCHVISION_AVAILABLE:
3435
import torchvision

examples/pytorch/basics/backbone_image_classifier.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
from typing import Optional
2222

2323
import torch
24+
from torch.nn import functional as F
25+
from torch.utils.data import DataLoader, random_split
26+
2427
from lightning.pytorch import LightningDataModule, LightningModule, cli_lightning_logo
2528
from lightning.pytorch.cli import LightningCLI
2629
from lightning.pytorch.demos.mnist_datamodule import MNIST
2730
from lightning.pytorch.utilities.imports import _TORCHVISION_AVAILABLE
28-
from torch.nn import functional as F
29-
from torch.utils.data import DataLoader, random_split
3031

3132
if _TORCHVISION_AVAILABLE:
3233
from torchvision import transforms

examples/pytorch/basics/profiler_example.py

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import torch
2929
import torchvision
3030
import torchvision.transforms as T
31+
3132
from lightning.pytorch import LightningDataModule, LightningModule, cli_lightning_logo
3233
from lightning.pytorch.cli import LightningCLI
3334
from lightning.pytorch.profilers.pytorch import PyTorchProfiler

examples/pytorch/basics/transformer.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import lightning as L
21
import torch
32
import torch.nn.functional as F
4-
from lightning.pytorch.demos import Transformer, WikiText2
53
from torch.utils.data import DataLoader, random_split
64

5+
import lightning as L
6+
from lightning.pytorch.demos import Transformer, WikiText2
7+
78

89
class LanguageModel(L.LightningModule):
910
def __init__(self, vocab_size):

examples/pytorch/bug_report/bug_report_model.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import os
22

33
import torch
4-
from lightning.pytorch import LightningModule, Trainer
54
from torch.utils.data import DataLoader, Dataset
65

6+
from lightning.pytorch import LightningModule, Trainer
7+
78

89
class RandomDataset(Dataset):
910
def __init__(self, size, length):

examples/pytorch/domain_templates/computer_vision_fine_tuning.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646

4747
import torch
4848
import torch.nn.functional as F
49-
from lightning.pytorch import LightningDataModule, LightningModule, cli_lightning_logo
50-
from lightning.pytorch.callbacks.finetuning import BaseFinetuning
51-
from lightning.pytorch.cli import LightningCLI
52-
from lightning.pytorch.utilities import rank_zero_info
53-
from lightning.pytorch.utilities.model_helpers import get_torchvision_model
5449
from torch import nn, optim
5550
from torch.optim.lr_scheduler import MultiStepLR
5651
from torch.optim.optimizer import Optimizer
@@ -60,6 +55,12 @@
6055
from torchvision.datasets import ImageFolder
6156
from torchvision.datasets.utils import download_and_extract_archive
6257

58+
from lightning.pytorch import LightningDataModule, LightningModule, cli_lightning_logo
59+
from lightning.pytorch.callbacks.finetuning import BaseFinetuning
60+
from lightning.pytorch.cli import LightningCLI
61+
from lightning.pytorch.utilities import rank_zero_info
62+
from lightning.pytorch.utilities.model_helpers import get_torchvision_model
63+
6364
log = logging.getLogger(__name__)
6465
DATA_URL = "https://storage.googleapis.com/mledu-datasets/cats_and_dogs_filtered.zip"
6566

examples/pytorch/domain_templates/generative_adversarial_net.py

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import torch
2626
import torch.nn as nn
2727
import torch.nn.functional as F
28+
2829
from lightning.pytorch import cli_lightning_logo
2930
from lightning.pytorch.core import LightningModule
3031
from lightning.pytorch.demos.mnist_datamodule import MNISTDataModule

examples/pytorch/domain_templates/imagenet.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@
4343
import torch.utils.data.distributed
4444
import torchvision.datasets as datasets
4545
import torchvision.transforms as transforms
46+
from torch.utils.data import Dataset
47+
from torchmetrics import Accuracy
48+
4649
from lightning.pytorch import LightningModule
4750
from lightning.pytorch.callbacks import ModelCheckpoint, TQDMProgressBar
4851
from lightning.pytorch.cli import LightningCLI
4952
from lightning.pytorch.strategies import ParallelStrategy
5053
from lightning.pytorch.utilities.model_helpers import get_torchvision_model
51-
from torch.utils.data import Dataset
52-
from torchmetrics import Accuracy
5354

5455

5556
class ImageNetLightningModel(LightningModule):

examples/pytorch/domain_templates/reinforce_learn_Qnet.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
import torch
4242
import torch.nn as nn
4343
import torch.optim as optim
44-
from lightning.pytorch import LightningModule, Trainer, cli_lightning_logo, seed_everything
4544
from torch.optim.optimizer import Optimizer
4645
from torch.utils.data import DataLoader
4746
from torch.utils.data.dataset import IterableDataset
4847

48+
from lightning.pytorch import LightningModule, Trainer, cli_lightning_logo, seed_everything
49+
4950

5051
class DQN(nn.Module):
5152
"""Simple MLP network.

examples/pytorch/domain_templates/reinforce_learn_ppo.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535

3636
import gym
3737
import torch
38-
from lightning.pytorch import LightningModule, Trainer, cli_lightning_logo, seed_everything
3938
from torch import nn
4039
from torch.distributions import Categorical, Normal
4140
from torch.optim.optimizer import Optimizer
4241
from torch.utils.data import DataLoader, IterableDataset
4342

43+
from lightning.pytorch import LightningModule, Trainer, cli_lightning_logo, seed_everything
44+
4445

4546
def create_mlp(input_shape: tuple[int], n_actions: int, hidden_size: int = 128):
4647
"""Simple Multi-Layer Perceptron network."""

0 commit comments

Comments
 (0)