Merge branch 'hparams_from_checkpoint' of https://github.com/neggert/pytorch-lightning

pl_examples/basic_examples/lightning_module_template.py

@@ -158,7 +158,7 @@ class LightningTemplateModel(LightningModule):
             val_loss = output['val_loss']
 
             # reduce manually when using dp
-            if self.trainer.use_dp:
+            if self.trainer.use_dp or self.trainer.use_ddp2:
                 val_loss = torch.mean(val_loss)
             val_loss_mean += val_loss