Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use raise .. from .. to explicitly chain exceptions #3750

Merged
merged 5 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pytorch_lightning/accelerators/ddp2_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def _resolve_task_idx(self):
# torchelastic or general non_slurm ddp2
try:
self.task_idx = int(os.environ['LOCAL_RANK'])
except Exception as e:
except Exception as exp:
m = 'ddp2 only works in SLURM or via torchelastic with the WORLD_SIZE, LOCAL_RANK, GROUP_RANK flags'
raise MisconfigurationException(m)
raise MisconfigurationException(m) from exp

def train(self):
model = self.trainer.model
Expand Down
4 changes: 2 additions & 2 deletions pytorch_lightning/metrics/metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ def aggregate(self, *tensors: torch.Tensor) -> torch.Tensor:
"""
try:
return torch.cat(tensors).mean(0)
except (ValueError, TypeError):
except (ValueError, TypeError) as e:
akihironitta marked this conversation as resolved.
Show resolved Hide resolved
if isinstance(tensors[0], Mapping):
return {k: torch.stack([tensor[k] for tensor in tensors]).mean(0) for k in tensors[0].keys()}
elif isinstance(tensors[0], Sequence) and not isinstance(tensors[0], torch.Tensor):
return tuple([torch.stack(tmp).mean(0) for tmp in zip(*tensors)])
elif isinstance(tensors[0], torch.Tensor):
return torch.stack(tensors).mean(0)
else:
raise TypeError("unknown metric value format to aggregate")
raise TypeError("unknown metric value format to aggregate") from e
akihironitta marked this conversation as resolved.
Show resolved Hide resolved

@staticmethod
def compute(self, data: Any, output: Any):
Expand Down
4 changes: 2 additions & 2 deletions pytorch_lightning/trainer/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ def process_dict_result(self, output, train=False):
if train:
try:
loss = output['loss']
except Exception:
except Exception as exp:
if isinstance(output, torch.Tensor):
loss = output
else:
raise RuntimeError(
'No `loss` value in the dictionary returned from `model.training_step()`.'
)
) from exp

# when using dp need to reduce the loss
if self.use_dp or self.use_ddp2:
Expand Down
4 changes: 2 additions & 2 deletions pytorch_lightning/utilities/parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ class AttributeDict(Dict):
def __getattr__(self, key):
try:
return self[key]
except KeyError:
raise AttributeError(f'Missing attribute "{key}"')
except KeyError as exp:
raise AttributeError(f'Missing attribute "{key}"') from exp

def __setattr__(self, key, val):
self[key] = val
Expand Down
4 changes: 2 additions & 2 deletions tests/base/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

try:
from test_tube import HyperOptArgumentParser
except ImportError:
except ImportError as exp:
# TODO: this should be discussed and moved out of this package
raise ImportError('Missing test-tube package.')
raise ImportError('Missing test-tube package.') from exp

from pytorch_lightning.core.lightning import LightningModule

Expand Down