Removing some dependency edges from Blob to other caffe2#11923
Closed
Removing some dependency edges from Blob to other caffe2#11923
Conversation
Differential Revision: D9623916 Differential Version: 56705898
Differential Revision: D9623916 Differential Version: 56858422
Differential Revision: D9644700 Differential Version: 56870160
Differential Revision: D9623916 Differential Version: 56900314
Differential Revision: D9644700 Differential Version: 56900331
Differential Revision: D9652088 Differential Version: 56917655
Differential Revision: D9652088 Differential Version: 56918713
Differential Revision: D9652089 Differential Version: 56918714
Differential Revision: D9623916 Differential Version: 56982469
Differential Revision: D9644700 Differential Version: 56982494
Differential Revision: D9652088 Differential Version: 56982465
Differential Revision: D9652089 Differential Version: 56982470
Differential Revision: D9663476 Differential Version: 56982467
Differential Revision: D9623916 Differential Version: 57101548
Differential Revision: D9644700 Differential Version: 57101652
Differential Revision: D9652088 Differential Version: 57101545
Differential Revision: D9652089 Differential Version: 57101550
Differential Revision: D9663476 Differential Version: 57101556
Differential Revision: D9623916 Differential Version: 57135223
Differential Revision: D9644700 Differential Version: 57135224
Differential Revision: D9652088 Differential Version: 57135218
Differential Revision: D9652089 Differential Version: 57135219
Differential Revision: D9663476 Differential Version: 57135226
Differential Revision: D9694327 Differential Version: 57135227
Differential Revision: D9694326 Differential Version: 57135216
Differential Revision: D9694918 Differential Version: 57140103
Differential Revision: D9623916 Differential Version: 57214033
Differential Revision: D9644700 Differential Version: 57214023
Differential Revision: D9652088 Differential Version: 57214005
Differential Revision: D9652089 Differential Version: 57214030
This was referenced Sep 21, 2018
Closed
Contributor
|
I'm a little confused. Why would having these methods on Blob prevent movement to ATen/core? Tensor is going to live in ATen/core, and I can't think of anything else these methods could refer to that you can't reference in core? |
Contributor
Author
|
It's two things. (1) it unblocks me from having to wait until Tensor merge is complete (because before that, blob references c2 tensor), and (2) we want to do this anyhow because the final blob design doesn't let it store tensor anymore. |
Contributor
|
ghexport has messed this one up too. What it looks like is that you updated export-D9882726 without also reexporting this one. A gh from the top of the stack should fix it. |
Differential Revision: D9979976 Differential Version: 58691284
Contributor
Author
|
I think this might have been broken by landing the diff below. I re-exported it. |
ezyang
approved these changes
Sep 24, 2018
Differential Revision: D9979976 Differential Version: 58749277
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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:
:black_circle: #11923 Removing some dependency edges from Blob to other caffe2 💚
:white_circle: #11924 Move Blob to ATen/core 💛
:white_circle: #11414 IValue can store Blob 💚
:white_circle: #11548 Blob doesn't allow access to destroyCall anymore 💚
:white_circle: #11500 Use TypeMeta::dtor() instead of Blob::DestroyCall 💛
:white_circle: #11925 Serialization takes pointers instead of Blob 💛
:white_circle: #11926 Remove Blob::ShareExternal from serialization 💛
This is pre-work to allow moving Blob to ATen/core, which cannot depend on caffe2 anymore.
(1) Removing the Blob -> Tensor dependency allows us to move Blob to ATen/core and use it inside IValue without having to wait for the Tensor merge to be complete.
(2) In the final Blob design, we want it to be a very small class that doesn't have any special treatment for Tensor (or to be more correct, doesn't allow storing Tensor anymore), , so this is anyhow the direction we want to go.
This changes call sites that will have to be moved to IValue later, but they cannot be moved to IValue directly, because for that, IValue first needs to be able to store Blob, which in turn first needs this diff and some other changes coming up in future diffs.
Codemods:
$ codemod --extensions h,hpp,c,cpp,cc "([a-zA-Z0-9_]+)\.IsTensorType\(" "BlobIsTensorType(\1, "
$ codemod --extensions h,hpp,c,cpp,cc "([a-zA-Z0-9_]+)->IsTensorType\(" "BlobIsTensorType(\1, "
$ codemod --extensions h,hpp,c,cpp,cc "([a-zA-Z0-9_]+)\.GetMutableTensor\(" "BlobGetMutableTensor(\1, "
$ codemod --extensions h,hpp,c,cpp,cc "([a-zA-Z0-9_]+)->GetMutableTensor\(" "BlobGetMutableTensor(\1, "
It is, however, not only these codemods because regex based refactoring was only able to match a small amount of the call sites. To catch more, I wouldn've needed a AST aware tool like clangr, which I didn't figure out how to use.
Differential Revision: D9979976