Merge pull request #62 from williamFalcon/imports

Imports
This commit is contained in:
William Falcon
2019-08-07 10:37:17 -04:00
committed by GitHub
6 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ import shutil
import numpy as np
from ..pt_overrides.override_data_parallel import LightningDistributedDataParallel
from pytorch_lightning.pt_overrides.override_data_parallel import LightningDistributedDataParallel
class Callback(object):
+5 -5
View File
@@ -13,11 +13,11 @@ from torch.utils.data.distributed import DistributedSampler
import torch.multiprocessing as mp
import torch.distributed as dist
from ..root_module.memory import get_gpu_memory_map
from ..root_module.model_saving import TrainerIO
from ..pt_overrides.override_data_parallel import (
from pytorch_lightning.root_module.memory import get_gpu_memory_map
from pytorch_lightning.root_module.model_saving import TrainerIO
from pytorch_lightning.pt_overrides.override_data_parallel import (
LightningDistributedDataParallel, LightningDataParallel)
from ..utilities.debugging import MisconfigurationException
from pytorch_lightning.utilities.debugging import MisconfigurationException
try:
from apex import amp
@@ -261,7 +261,7 @@ class Trainer(TrainerIO):
if '.ckpt' in name:
epoch = name.split('epoch_')[1]
epoch = int(re.sub('[^0-9]', '' ,epoch))
epoch = int(re.sub('[^0-9]', '', epoch))
if epoch > last_epoch:
last_epoch = epoch
@@ -3,7 +3,7 @@ import re
import torch
from ..pt_overrides.override_data_parallel import (
from pytorch_lightning.pt_overrides.override_data_parallel import (
LightningDistributedDataParallel, LightningDataParallel)
+5 -5
View File
@@ -1,10 +1,10 @@
import torch
from .memory import ModelSummary
from .grads import GradInformation
from .model_saving import ModelIO, load_hparams_from_tags_csv
from .hooks import ModelHooks
from .decorators import data_loader
from pytorch_lightning.root_module.memory import ModelSummary
from pytorch_lightning.root_module.grads import GradInformation
from pytorch_lightning.root_module.model_saving import ModelIO, load_hparams_from_tags_csv
from pytorch_lightning.root_module.hooks import ModelHooks
from pytorch_lightning.root_module.decorators import data_loader
class LightningModule(GradInformation, ModelIO, ModelHooks):
+1 -1
View File
@@ -11,7 +11,7 @@ from torchvision.datasets import MNIST
from torchvision import transforms
from test_tube import HyperOptArgumentParser
from ..root_module.root_module import LightningModule
from pytorch_lightning.root_module.root_module import LightningModule
from pytorch_lightning import data_loader
-2
View File
@@ -123,8 +123,6 @@ def test_amp_gpu_ddp():
run_gpu_model_test(trainer_options, model, hparams)
def test_cpu_slurm_save_load():
"""
Verify model save/load/checkpoint on CPU