[Unify Tensors PR #3]Port framework::Tensor members & interfaces to pten::DenseTensor, test=allcases #38473
Conversation
This file contains 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
…faces accordingly
… allocation_rearrange_pr
… allocation_rearrange_pr
… allocation_rearrange_pr PaddlePaddle#2
… allocation_rearrange_pr
… densetensor_interface_change
…to pten::DenseTensor
|
Thanks for your contribution! |
… densetensor_interface_change
jim19930609
force-pushed
the
densetensor_interface_change
branch
from
55445ad
to
3298585
Compare
jim19930609
force-pushed
the
densetensor_interface_change
branch
from
d22b544
to
41ada84
Compare
jim19930609
force-pushed
the
densetensor_interface_change
branch
from
41ada84
to
235503f
Compare
| meta_.offset = 0; | ||
| } | ||
|
|
||
| DenseTensor::DenseTensor(const paddle::framework::proto::VarType::Type& dtype) { |
There was a problem hiding this comment.
暂时保留对protobuf的依赖，1月底前完成清理。已在TrickList中追踪。
| return Split(split_size, axis); | ||
| } | ||
|
|
||
| void* DenseTensor::mutable_data(const paddle::platform::Place& place, |
|
|
||
| DenseTensor(); | ||
|
|
||
| explicit DenseTensor(const paddle::framework::proto::VarType::Type& dtype); |
There was a problem hiding this comment.
暂时保留对protobuf的依赖，1月底前完成清理。已在TrickList中追踪。
|
|
||
| Will be adjusted/removed/moved in the near future | ||
| */ | ||
| public: |
There was a problem hiding this comment.
EigenTensor / EigenMatrix / EigenVector 友元类请在后续调整去除
|
|
||
| std::vector<DenseTensor> Chunk(int64_t chunks, int64_t axis) const; | ||
|
|
||
| paddle::framework::proto::VarType::Type type() const; |
There was a problem hiding this comment.
暂时保留对protobuf的依赖，1月底前完成清理。已在TrickList中追踪。
… densetensor_interface_change
jim19930609
changed the title
… densetensor_interface_change
jim19930609
force-pushed
the
densetensor_interface_change
branch
from
fa0f020
to
ab4e4a7
Compare
… densetensor_interface_change
… densetensor_interface_change
… densetensor_interface_change
… densetensor_interface_change
… densetensor_interface_change
chenwhql
approved these changes
Jan 4, 2022
| meta_.dims = dims; | ||
| mutable_data(); | ||
| if (storage_ != nullptr) { |
There was a problem hiding this comment.
这里如果直接默认构造一个DenseTensor，然后调用resize，是不是没有实际发挥作用，且不会有任何提示，建议在后续PR增加报错提示
There was a problem hiding this comment.
Resize函数定义里加了一个注释。本质上这里是暂时兼容两种用法：
- pten用法：用Allocator初始化DenseTensor，则Resize不仅修改dims还会直接分配内存
- fluid用法：默认构造DenseTensor，place未知，则延迟到调用mutable_data(place)时再行分配内存
| size_t requested_size = 0); | ||
|
|
||
| template <typename T> | ||
| T* mutable_data(const DDim& dims, |
There was a problem hiding this comment.
后续可以在不希望被pten kernel使用、仅用于兼容的方法上均增加注释提示，避免迁移kernel时误用
Shixiaowei02
reviewed
Jan 4, 2022
| data_ = holder; | ||
| } | ||
|
|
||
| std::shared_ptr<paddle::memory::Allocation> move_data_shared() { |
There was a problem hiding this comment.
请问这里是不是返回 shared_ptr&& 好一些
There was a problem hiding this comment.
感谢！提交一个后续Patch进行修改。
Shixiaowei02
approved these changes
Jan 4, 2022
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.
PR types
New features
PR changes
Others
Describe
Port framework::Tensor members & interfaces to pten::DenseTensor