Allow forward functions with single output to return Variable #23803
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Test Plan: Reviewers: Subscribers: Tasks: Tags:
malvika2147
requested review from
ebetica,
goldsborough and
yf225
as code owners
pytorchbot
added
module: autograd
ezyang
reviewed
Aug 6, 2019
| @@ -56,10 +56,13 @@ TORCH_API variable_list _wrap_outputs( | |||
| // auto y = MyFunction::apply(6, x); | |||
| // Example backward call: | |||
| // y[0].sum().backward(); | |||
| template<typename X, typename... Args> | |||
| using forward_t = decltype(X::forward(nullptr, std::declval<Args>()...)); | |||
There was a problem hiding this comment.
You probably didn't mean to attach the docblock above to forward_t. (Speaking of which, would be nice to have a doc for forward_t too!)
|
@smessmer could you please help review the C++ template metaprogramming in this diff? |
ezyang
approved these changes
Aug 6, 2019
…ble" Summary: Custom `forward()` can return a `Variable` in case of single outputs instead of returning a `variable_list` of size 1. Test Plan: Modified tests involving single output forward functions.
…ble" Summary: Custom `forward()` can return a `Variable` in case of single outputs instead of returning a `variable_list` of size 1. Test Plan: Modified tests involving single output forward functions. Differential Revision: [D16673857](https://our.internmc.facebook.com/intern/diff/D16673857)
smessmer
reviewed
Aug 7, 2019
| @@ -182,7 +198,8 @@ variable_list Function<T>::apply(Args&&... args) { | |||
| node->input_info_.emplace_back(var); | |||
| } | |||
|
|
|||
| variable_list outputs; | |||
| typedef forward_t<X, Args...> forward_return_t; | |||
There was a problem hiding this comment.
nit: using is more readable than typedef
| @@ -159,9 +169,15 @@ template <typename... Args> | |||
| void extract_vars(std::vector<bool> &is_var, variable_list& list, Args&& ... args) { | |||
| } | |||
|
|
|||
| template <typename T> | |||
| typename std::enable_if<std::is_same<T, variable_list>::value, T&>::type to_output_type(variable_list& output_list) { return output_list; } | |||
There was a problem hiding this comment.
nit: we have guts::enable_if_t to avoid the typename
…ble" Summary: Custom `forward()` can return a `Variable` in case of single outputs instead of returning a `variable_list` of size 1. Test Plan: Modified tests involving single output forward functions. Differential Revision: [D16673857](https://our.internmc.facebook.com/intern/diff/D16673857)
…ble" Summary: Custom `forward()` can return a `Variable` in case of single outputs instead of returning a `variable_list` of size 1. Test Plan: Modified tests involving single output forward functions. Differential Revision: [D16673857](https://our.internmc.facebook.com/intern/diff/D16673857)
yf225
pushed a commit
to yf225/pytorch
that referenced
this pull request
Aug 11, 2019
…pytorch#23803)" This reverts commit 81ba2df.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stack from ghstack:
Summary:
Custom
forward()can return aVariablein case of single outputs instead of returning avariable_listof size 1.Test Plan: Modified tests involving single output forward functions.
Differential Revision: D16673857