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.

Sign up for GitHub

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

Jump to bottom

move example inputs to correct device when tracing module #4360

Merged
merged 14 commits into from
Oct 29, 2020
Merged

move example inputs to correct device when tracing module #4360

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cbbf04f
use move_data_to_device instead of to; docstring also allow tuple of …
stefempath Oct 26, 2020
fb72416
Use isinstance to check if example_inputs is a Mapping, instead of type
NumesSanguis Oct 26, 2020
8421c5e
import Mapping for isinstance check
stefempath Oct 26, 2020
8cb11da
multi-line docstring code to test TorchScript trace()
stefempath Oct 26, 2020
95c00b7
Fix PEP8 f-string is missing placeholders
stefempath Oct 26, 2020
f5f7cf3
minor code style improvements
awaelchli Oct 27, 2020
7e769e8
Use (possibly user overwritten) transfer_batch_to_device instead of m…
NumesSanguis Oct 27, 2020
0c71dba
Merge branch 'master' into master
NumesSanguis Oct 27, 2020
c1fc753
fixed weird comment about trace() log error
stefempath Oct 27, 2020
d3da5f1
Remove unused import
NumesSanguis Oct 28, 2020
8c82c58
Merge branch 'master' into master
NumesSanguis Oct 28, 2020
5b74cd3
Merge branch 'master' into master
NumesSanguis Oct 28, 2020
8bec5b7
Merge branch 'master' into master
rohitgr7 Oct 29, 2020
a8c7e15
Remove logger warning about dict not example_inputs not supported by …
stefempath Oct 29, 2020
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
11 changes: 7 additions & 4 deletions pytorch_lightning/core/lightning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import tempfile
from abc import ABC
from argparse import Namespace
from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union, Mapping

import torch
from pytorch_lightning import _logger as log
Expand Down Expand Up @@ -1539,7 +1539,7 @@ def to_onnx(self, file_path: str, input_sample: Optional[Tensor] = None, **kwarg

def to_torchscript(
self, file_path: Optional[str] = None, method: Optional[str] = 'script',
example_inputs: Optional[torch.Tensor] = None, **kwargs
example_inputs: Optional[Union[torch.Tensor, Tuple[torch.Tensor]]] = None, **kwargs
) -> Union[ScriptModule, Dict[str, ScriptModule]]:
"""
By default compiles the whole model to a :class:`~torch.jit.ScriptModule`.
Expand Down Expand Up @@ -1576,6 +1576,9 @@ def to_torchscript(
>>> model = SimpleModel()
>>> torch.jit.save(model.to_torchscript(), "model.pt") # doctest: +SKIP
>>> os.path.isfile("model.pt") # doctest: +SKIP
>>> torch.jit.save(model.to_torchscript(file_path="model_trace.pt", method='trace', # doctest: +SKIP
... example_inputs=torch.randn(1, 64))) # doctest: +SKIP
>>> os.path.isfile("model_trace.pt") # doctest: +SKIP
True

Return:
Expand All @@ -1592,8 +1595,8 @@ def to_torchscript(
if example_inputs is None:
example_inputs = self.example_input_array
# automatically send example inputs to the right device and use trace
torchscript_module = torch.jit.trace(func=self.eval(), example_inputs=example_inputs.to(self.device),
**kwargs)
example_inputs = self.transfer_batch_to_device(example_inputs, device=self.device)
torchscript_module = torch.jit.trace(func=self.eval(), example_inputs=example_inputs, **kwargs)
else:
raise ValueError(f"The 'method' parameter only supports 'script' or 'trace', but value given was:"
f"{method}")
Expand Down