clear imports (#143)

* clear imports

* install pkg

.github/workflows/install-pkg.yml

@@ -39,14 +39,14 @@ jobs:
       # max-parallel: 6
       matrix:
         # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5
-        os: [ubuntu-20.04]  # , windows-2019
-        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-20.04, macOS-10.15]  # , windows-2019
+        python-version: [3.7, 3.8]
 
     steps:
       - uses: actions/checkout@master
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: ${{ matrix.python-version }}
 
       - name: Create package
         run: |

pl_bolts/callbacks/vision/confused_logit.py

@@ -1,6 +1,6 @@
 import torch
-from torch import nn
 from pytorch_lightning import Callback
+from torch import nn
 
 
 class ConfusedLogitCallback(Callback):  # pragma: no-cover

pl_bolts/datamodules/__init__.py

@@ -1,11 +1,11 @@
+from pl_bolts.datamodules.async_dataloader import AsynchronousLoader
 from pl_bolts.datamodules.cifar10_datamodule import CIFAR10DataModule, TinyCIFAR10DataModule
+from pl_bolts.datamodules.dummy_dataset import DummyDataset
+from pl_bolts.datamodules.experience_source import (ExperienceSourceDataset, ExperienceSource,
+                                                    NStepExperienceSource, EpisodicExperienceStream)
+from pl_bolts.datamodules.fashion_mnist_datamodule import FashionMNISTDataModule
 from pl_bolts.datamodules.imagenet_datamodule import ImagenetDataModule
 from pl_bolts.datamodules.mnist_datamodule import MNISTDataModule
 from pl_bolts.datamodules.sklearn_datamodule import SklearnDataset, SklearnDataModule, TensorDataset, TensorDataModule
 from pl_bolts.datamodules.ssl_imagenet_datamodule import SSLImagenetDataModule
 from pl_bolts.datamodules.stl10_datamodule import STL10DataModule
-from pl_bolts.datamodules.fashion_mnist_datamodule import FashionMNISTDataModule
-from pl_bolts.datamodules.dummy_dataset import DummyDataset
-from pl_bolts.datamodules.experience_source import (ExperienceSourceDataset, ExperienceSource,
-                                                    NStepExperienceSource, EpisodicExperienceStream)
-from pl_bolts.datamodules.async_dataloader import AsynchronousLoader

pl_bolts/datamodules/async_dataloader.py

@@ -1,9 +1,9 @@
-from threading import Thread
 from queue import Queue
+from threading import Thread
 
 import torch
-from torch.utils.data import Dataset
 from torch.utils.data import DataLoader
+from torch.utils.data import Dataset
 
 
 class AsynchronousLoader(object):

pl_bolts/datamodules/experience_source.py

@@ -5,6 +5,7 @@
 """
 from collections import deque, namedtuple
 from typing import Iterable, Callable, Tuple, List
+
 import numpy as np
 import torch
 from torch.utils.data import IterableDataset

pl_bolts/datamodules/sklearn_datamodule.py

@@ -1,10 +1,11 @@
 import math
 from typing import Any
-import torch
+
 import numpy as np
+import torch
+from pytorch_lightning import LightningDataModule
 from sklearn.utils import shuffle as sk_shuffle
 from torch.utils.data import Dataset, DataLoader
-from pytorch_lightning import LightningDataModule
 
 
 class SklearnDataset(Dataset):

pl_bolts/losses/rl.py

@@ -4,9 +4,9 @@
 
 from typing import Tuple, List
 
+import numpy as np
 import torch
 from torch import nn
-import numpy as np
 
 
 def dqn_loss(batch: Tuple[torch.Tensor, torch.Tensor], net: nn.Module,

pl_bolts/models/autoencoders/basic_ae/basic_ae_module.py

@@ -1,4 +1,3 @@
-import os
 from argparse import ArgumentParser
 
 import torch

pl_bolts/models/autoencoders/basic_vae/basic_vae_module.py

@@ -2,12 +2,10 @@
 from argparse import ArgumentParser
 
 import torch
-import torchvision
 from pytorch_lightning import LightningDataModule, LightningModule, Trainer
 from torch import distributions
 from torch.nn import functional as F
 
-import pl_bolts
 from pl_bolts.datamodules import MNISTDataModule
 from pl_bolts.models.autoencoders.basic_vae.components import Encoder, Decoder
 from pl_bolts.utils.pretrained_weights import load_pretrained

pl_bolts/models/gans/basic/basic_gan_module.py

@@ -1,3 +1,4 @@
+import os
 from argparse import ArgumentParser
 from collections import OrderedDict
 
@@ -6,10 +7,9 @@
 from pytorch_lightning.callbacks import ModelCheckpoint
 from torch.nn import functional as F
 
-from pl_bolts.datamodules import MNISTDataModule, STL10DataModule
 from pl_bolts.callbacks import LatentDimInterpolator
+from pl_bolts.datamodules import MNISTDataModule, STL10DataModule
 from pl_bolts.models.gans.basic.components import Generator, Discriminator
-import os
 
 
 class GAN(LightningModule):

pl_bolts/models/gans/basic/components.py

@@ -1,7 +1,7 @@
 import numpy as np
-from torch import nn
-import torch.nn.functional as F
 import torch
+import torch.nn.functional as F
+from torch import nn
 
 
 class Generator(nn.Module):

pl_bolts/models/regression/linear_regression.py

@@ -1,10 +1,10 @@
+import pytorch_lightning as pl
 import torch
 from torch import nn
 from torch.nn import functional as F
-from torch.optim.optimizer import Optimizer
 from torch.optim import Adam
+from torch.optim.optimizer import Optimizer
 
-import pytorch_lightning as pl
 from pl_bolts.datamodules.sklearn_datamodule import SklearnDataModule
 
 

pl_bolts/models/regression/logistic_regression.py

@@ -1,12 +1,12 @@
+import pytorch_lightning as pl
 import torch
+from pytorch_lightning.metrics.classification import accuracy
 from torch import nn
 from torch.nn import functional as F
-from torch.optim.optimizer import Optimizer
 from torch.optim import Adam
+from torch.optim.optimizer import Optimizer
 
-import pytorch_lightning as pl
 from pl_bolts.datamodules.sklearn_datamodule import SklearnDataModule
-from pytorch_lightning.metrics.classification import accuracy
 
 
 class LogisticRegression(pl.LightningModule):

pl_bolts/models/rl/double_dqn_model.py

@@ -5,8 +5,8 @@
 from collections import OrderedDict
 from typing import Tuple
 
-import torch
 import pytorch_lightning as pl
+import torch
 
 from pl_bolts.losses.rl import double_dqn_loss
 from pl_bolts.models.rl.common import cli

pl_bolts/models/rl/dqn_model.py

@@ -8,7 +8,6 @@
 
 import pytorch_lightning as pl
 import torch
-import torch.nn as nn
 import torch.optim as optim
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader

pl_bolts/models/rl/dueling_dqn_model.py

@@ -2,6 +2,7 @@
 Dueling DQN
 """
 import argparse
+
 import pytorch_lightning as pl
 
 from pl_bolts.models.rl.common import cli

pl_bolts/models/rl/n_step_dqn_model.py

@@ -2,9 +2,7 @@
 N Step DQN
 """
 import argparse
-from pprint import pprint
 
-import torch
 import pytorch_lightning as pl
 
 from pl_bolts.models.rl.common import cli

pl_bolts/models/rl/noisy_dqn_model.py

@@ -5,8 +5,8 @@
 from collections import OrderedDict
 from typing import Tuple
 
-import torch
 import pytorch_lightning as pl
+import torch
 
 from pl_bolts.losses.rl import dqn_loss
 from pl_bolts.models.rl.common import cli

pl_bolts/models/rl/per_dqn_model.py

@@ -3,10 +3,9 @@
 """
 import argparse
 from collections import OrderedDict
-from typing import Tuple, List
 
-import torch
 import pytorch_lightning as pl
+import torch
 
 from pl_bolts.losses.rl import per_dqn_loss
 from pl_bolts.models.rl.common import cli

pl_bolts/models/rl/reinforce_model.py

@@ -5,7 +5,6 @@
 from collections import OrderedDict
 from copy import deepcopy
 from itertools import chain
-from pprint import pprint
 from typing import Tuple, List
 
 import gym
@@ -17,7 +16,6 @@
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader
 
-from pl_bolts.models.rl import DQN
 from pl_bolts.models.rl.common import cli
 from pl_bolts.models.rl.common.agents import PolicyAgent
 from pl_bolts.models.rl.common.experience import EpisodicExperienceStream

pl_bolts/models/self_supervised/amdim/amdim_module.py

@@ -7,7 +7,6 @@
 import torch.optim as optim
 from torch.utils.data import DataLoader
 
-import pl_bolts
 from pl_bolts.losses.self_supervised_learning import FeatureMapContrastiveTask
 from pl_bolts.models.self_supervised.amdim.datasets import AMDIMPretraining
 from pl_bolts.models.self_supervised.amdim.networks import AMDIMEncoder

pl_bolts/models/self_supervised/amdim/ssl_datasets.py

@@ -1,4 +1,3 @@
-import math
 from abc import ABC
 from typing import Callable
 

pl_bolts/models/self_supervised/cpc/cpc_module.py

@@ -12,7 +12,6 @@
 import torch.optim as optim
 from pytorch_lightning.utilities import rank_zero_warn
 
-import pl_bolts
 from pl_bolts import metrics
 from pl_bolts.datamodules import CIFAR10DataModule, STL10DataModule
 from pl_bolts.datamodules.ssl_imagenet_datamodule import SSLImagenetDataModule

pl_bolts/models/self_supervised/cpc/networks.py

@@ -1,4 +1,3 @@
-import torch
 import torch.nn.functional as F
 from torch import nn
 

pl_bolts/models/self_supervised/moco/moco2_module.py

@@ -13,9 +13,8 @@
 import torchvision
 from torch import nn
 
-import pl_bolts
-from pl_bolts.datamodules.ssl_imagenet_datamodule import SSLImagenetDataModule
 from pl_bolts.datamodules import CIFAR10DataModule, STL10DataModule
+from pl_bolts.datamodules.ssl_imagenet_datamodule import SSLImagenetDataModule
 from pl_bolts.metrics import precision_at_k, mean
 from pl_bolts.models.self_supervised.moco.transforms import (
     Moco2TrainCIFAR10Transforms,

pl_bolts/models/self_supervised/simclr/simclr_module.py

@@ -5,7 +5,6 @@
 from torch.optim.lr_scheduler import StepLR
 from torchvision.models import densenet
 
-import pl_bolts
 from pl_bolts import metrics
 from pl_bolts.datamodules import CIFAR10DataModule, STL10DataModule, ImagenetDataModule
 from pl_bolts.losses.self_supervised_learning import nt_xent_loss

pl_bolts/models/vision/image_gpt/gpt2.py

@@ -1,6 +1,6 @@
+import pytorch_lightning as pl
 import torch
 import torch.nn as nn
-import pytorch_lightning as pl
 
 
 class Block(nn.Module):

pl_bolts/models/vision/image_gpt/igpt_module.py

@@ -1,9 +1,9 @@
 import os
+
+import pytorch_lightning as pl
 import torch
 import torch.nn as nn
-from torch.utils.data import TensorDataset, DataLoader, random_split
-import pytorch_lightning as pl
-import numpy as np
+
 from pl_bolts.datamodules import FashionMNISTDataModule, ImagenetDataModule
 from pl_bolts.models.vision.image_gpt.gpt2 import GPT2
 

pl_bolts/utils/semi_supervised.py

@@ -1,6 +1,7 @@
-import torch
-import numpy as np
 import math
+
+import numpy as np
+import torch
 from sklearn.utils import shuffle as sk_shuffle