Add tensor.h #2611
Add tensor.h #2611
Conversation
wangkuiyi
requested review from
reyoung,
pkuyym,
luotao1,
qingqing01,
JiayiFeng,
Xreki,
hedaoyuan and
QiJune
paddle/framework/tensor.h
Outdated
| public: | ||
| explicit Tensor(DDim dims) : dims_(dims), place_(get_place()) {} | ||
| explicit Tensor(DDim dims, Place place) : dims_(dims), place_(place) {} | ||
|
|
There was a problem hiding this comment.
Missing GetDim() and GetPlace() ?
There was a problem hiding this comment.
I am not sure when would they be necessary, but we can add them in the future once we know we need them.
paddle/framework/tensor.h
Outdated
| explicit Tensor(DDim dims, Place place) : dims_(dims), place_(place) {} | ||
|
|
||
| template <typename T> | ||
| const T* data() const { |
There was a problem hiding this comment.
Should function name be Data()? https://google.github.io/styleguide/cppguide.html#Function_Names
There was a problem hiding this comment.
Cite from the link you pasted:
Accessors and mutators (get and set functions) may be named like variables. These often correspond to actual member variables, but this is not required. For example, int count() and void set_count(int count).
Here we use data and mutable_data since they are accessors of Tensor.
paddle/framework/tensor.h
Outdated
|
|
||
| std::unique_ptr<Placeholder> holder_; // holds the memory block if allocated. | ||
| DDim dims_; // could be smallers than the holder_->Size(). | ||
| paddle::platform::Place place_; |
There was a problem hiding this comment.
I wonder why the place_ is both located in Tensor and PlaceholderImpl at first. From the line 39, we can see that the Place in PlaceholderImpl is always equal to it in Tensor.
But it seems reasonable the user can use mutable_data(DDim dims, Place place) to get a pointer whose Place is different from the existed holder_.
There was a problem hiding this comment.
You are right. The current syntax of Tensor is that we can allocate memory in either of the following two ways:
Tensor t(dim, place);
int* p = t.mutable_data<int>();or
Tensor t;
int* p = t.mutable_data(dim, place);Should we remove one of them? @qingqing01
There was a problem hiding this comment.
Done. Removed the first choice.
paddle/framework/tensor.h
Outdated
| template <typename T> | ||
| struct PlaceholderImpl : public Placeholder { | ||
| PlaceholderImpl(Place pl, size_t size) | ||
| : ptr_(memory::Alloc(pl, size), paddle::memory::Deleter(pl)), |
There was a problem hiding this comment.
we don't need to define Deleter, because we can use lamda function in shared_ptr's reset function.
holder_.reset(new PlaceholderImpl(place_, dims.product() * sizeof(T)), [&](){
....
memory::Free(place_, ptr_.get());
});
There was a problem hiding this comment.
I knew that we can use lambda or anything that casts to std::function<void(T*)>, but I think we need a class here to save the place and size.
paddle/framework/tensor.h
Outdated
| @@ -0,0 +1,76 @@ | |||
| /* | |||
| Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | |||
There was a problem hiding this comment.
The copyright message has a different style with former，what format should we use in the newly added code?
There was a problem hiding this comment.
Done. Switched back to the former one.
|
Here is my implementation draft based on current design: #2645. Please review it. |
This is a work in progress. It's primary purpose is to verify my ideas presented in the design of tensor at #2579 (review).