Rooba
/
lightning
mirror of https://github.com/Lightning-AI/lightning.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release (#467) 

* smurf ethics

* smurf ethics

* removed auto ddp fix

* removed auto ddp fix

* removed auto ddp fix

* removed auto ddp fix

* removed auto ddp fix

* removed auto ddp fix
This commit is contained in:
William Falcon 2019-11-06 14:34:50 -05:00 committed by GitHub
parent 7ce5b3f62f
commit a7f3974f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pytorch_lightning/trainer/ddp_mixin.py
View File

@ -49,14 +49,13 @@ class TrainerDDPMixin(object):
'Trainer(distributed_backend=dp) (or ddp)' 'Trainer(distributed_backend=dp) (or ddp)'
raise MisconfigurationException(m) raise MisconfigurationException(m)
# use ddp automatically if nb_gpu_nodes > 1 # throw error to force user ddp or ddp2 choice
if nb_gpu_nodes > 1 and self.use_dp: # pragma: no cover if nb_gpu_nodes > 1 and not (self.use_ddp2 or self.use_ddp): # pragma: no cover
self.use_ddp = True
self.use_dp = False
w = 'DataParallel does not support nb_gpu_nodes > 1. ' \ w = 'DataParallel does not support nb_gpu_nodes > 1. ' \
'Switching to DistributedDataParallel for you. ' \ 'Switching to DistributedDataParallel for you. ' \
'To silence this warning set distributed_backend=ddp' 'To silence this warning set distributed_backend=ddp' \
warnings.warn(w) 'or distributed_backend=ddp2'
raise MisconfigurationException(w)
logging.info(f'gpu available: {torch.cuda.is_available()}, used: {self.on_gpu}') logging.info(f'gpu available: {torch.cuda.is_available()}, used: {self.on_gpu}')
@ -173,7 +172,7 @@ class TrainerDDPMixin(object):
if self.distributed_backend == 'ddp': if self.distributed_backend == 'ddp':
device_ids = [gpu_nb] device_ids = [gpu_nb]
elif self.use_ddp2: elif self.use_ddp2:
device_ids = None device_ids = self.data_parallel_device_ids
# allow user to configure ddp # allow user to configure ddp
model = model.configure_ddp(model, device_ids) model = model.configure_ddp(model, device_ids)