Dedup MethodValue and FunctionValue #12589
Closed
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
zdevito
requested review from
apaszke,
colesbury,
ebetica,
ezyang,
gchanan,
goldsborough and
soumith
as code owners
jamesr66a
approved these changes
Oct 12, 2018
torch/csrc/jit/script/init.cpp
Outdated
| @@ -361,33 +344,17 @@ static void gatherParametersAndBuffers(std::vector<at::Tensor*> & values, const | |||
| } | |||
|
|
|||
| namespace { | |||
| struct PythonResolver : public Resolver { | |||
| struct PythonResolver { | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
zdevito
force-pushed
the
pr/use_method_value
branch
from
2b01e6a to
b2b94cf
Compare
apaszke
approved these changes
Oct 14, 2018
torch/csrc/jit/script/compiler.cpp
Outdated
| @@ -804,14 +804,15 @@ inline bool isSupportedListElementType(TypePtr type) { | |||
| struct to_ir { | |||
| to_ir( | |||
| Def def, | |||
| std::shared_ptr<Resolver> resolver, | |||
| Resolver resolver, | |||
| SugaredValuePtr self, | |||
| Method& method) // method being constructed | |||
| : method(method) | |||
| , graph(method.graph()) | |||
| , def(def) | |||
| , resolver(resolver) | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
torch/csrc/jit/script/compiler.cpp
Outdated
| @@ -152,11 +152,11 @@ struct CastValue : public SugaredValue { | |||
| // the IR API, but for now we choose to pessimisitically create inputs and | |||
| // delete unnecessary ones later with replaceAllusesWith(). | |||
| struct Environment { | |||
| Environment(Method & method, std::shared_ptr<Resolver> resolver, Block* b, std::shared_ptr<Environment> next = nullptr) | |||
| Environment(Method & method, Resolver resolver, Block* b, std::shared_ptr<Environment> next = nullptr) | |||
| : method(method), resolver(resolver), b(b), next(next) {} | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
There was a problem hiding this comment.
zdevito has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
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.
... they are basically the same class and I didn't see it in the initial PR. I also got resolvers back onto std::functions by keeping the function_table logic local to defineMethodInModules.