Move index sample #39905
Merged
Move index sample #39905
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
|
Thanks for your contribution! |
…ddle into move_index_sample
zyfncg
reviewed
Feb 25, 2022
| @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
| See the License for the specific language governing permissions and | |||
| limitations under the License. */ | |||
|
|
|||
| #include "paddle/fluid/operators/index_sample_op.h" | |||
|
|
|||
| //#include "paddle/fluid/operators/index_sample_op.h" | |||
paddle/phi/infermeta/binary.cc
Outdated
Comment on lines
247
to
265
| // if (ctx->IsRuntime()) { | ||
| PADDLE_ENFORCE_EQ(input_dims[0], | ||
| index_dims[0], | ||
| errors::InvalidArgument( | ||
| "Inputs(X)'s value of dimension 0 must same with " | ||
| "Inputs(Index)'s value of dimension 0, but " | ||
| "got %d of Inputs(X), and got %d of Inputs(Index), " | ||
| "please check Inputs shape.", | ||
| input_dims[0], | ||
| index_dims[0])); | ||
| //} | ||
| // ctx->SetOutputDim("Out", index_dims); | ||
| out->set_dims(index_dims); | ||
| // auto type = ctx->GetInputsVarType("Index")[0]; | ||
| // if (type == framework::proto::VarType::LOD_TENSOR) { | ||
| // ctx->ShareLoD("Index", /*->*/ "Out"); | ||
| // } | ||
| out->share_lod(y); | ||
| } |
There was a problem hiding this comment.
注释部分可删除
如果有if (ctx->IsRuntime())的逻辑建议传入MetaConfig参数进行判断，可参考UnfoldInferMeta，直接去掉CE可能会有问题
| int v_i = b * value_length + static_cast<int>(index_vec[i]); | ||
| x_grad_vec[v_i] += out_grad_vec[i]; | ||
| } | ||
| x_grad->mutable_data<T>(context.GetPlace()); |
There was a problem hiding this comment.
使用context.template Alloc<T>()替换mutable_data<T>
| const DenseTensor& x, | ||
| const DenseTensor& index, | ||
| DenseTensor* x_grad) { | ||
| const auto& index_type = |
There was a problem hiding this comment.
这里不需要再转成ProtoVarType了，下面直接判断DataType是否相等就行
| #include "paddle/phi/backends/cpu/cpu_context.h" | ||
| #include "paddle/phi/core/kernel_registry.h" | ||
|
|
||
| #include "paddle/phi/kernels/funcs/common_shape.h" |
Comment on lines
41
to
42
| using Tensor = paddle::framework::Tensor; | ||
| using LoDTensor = paddle::framework::LoDTensor; |
| T* input_grad_data = x_grad->mutable_data<T>(ctx.GetPlace()); | ||
|
|
||
| const auto& index_type = | ||
| paddle::framework::TransToProtoVarType(index.dtype()); |
Comment on lines
41
to
42
| using Tensor = paddle::framework::Tensor; | ||
| using LoDTensor = paddle::framework::LoDTensor; |
Comment on lines
69
to
71
| // auto* input = ctx.Input<LoDTensor>("X"); | ||
| // auto* index = ctx.Input<LoDTensor>("Index"); | ||
| // auto* output = ctx.Output<LoDTensor>("Out"); |
|
|
||
| KernelSignature IndexSampleOpArgumentMapping( | ||
| const ArgumentMappingContext& ctx) { | ||
| return KernelSignature("index_sample", {"X", "Index"}, {}, {"Out"}); |
There was a problem hiding this comment.
这里前向的Mapping映射应该可以不写，使用默认op_proto映射即可
There was a problem hiding this comment.
尝试了一下，这句删了，编译不能通过
zyfncg
reviewed
Feb 25, 2022
| input_dims[0], | ||
| index_dims[0])); | ||
| } | ||
| out->set_dims(index_dims); |
Comment on lines
20
to
22
| #include "paddle/phi/kernels/funcs/eigen/common.h" | ||
| #include "paddle/phi/kernels/funcs/eigen/eigen_function.h" | ||
| #include "paddle/phi/kernels/funcs/math_function.h" |
There was a problem hiding this comment.
eigen和math_function的相关函数似乎没看到使用的地方，可以再确认下，如果没有用的话可以去掉
|
|
||
| #include "paddle/fluid/framework/convert_utils.h" | ||
| namespace phi { | ||
| using DataType = paddle::experimental::DataType; |
There was a problem hiding this comment.
这里应该可以直接用DataType，不需要using了
|
|
||
| #include "paddle/fluid/framework/tensor_util.h" | ||
| #include "paddle/phi/backends/cpu/cpu_context.h" | ||
| #include "paddle/phi/backends/cpu/cpu_context.h" |
Comment on lines
22
to
23
| #include "paddle/phi/kernels/funcs/diagonal.h" | ||
| #include "paddle/phi/kernels/funcs/eigen/common.h" |
|
|
||
| #include "paddle/fluid/framework/convert_utils.h" | ||
| namespace phi { | ||
| using DataType = paddle::experimental::DataType; |
| #include "paddle/phi/core/kernel_registry.h" | ||
| #include "paddle/phi/kernels/funcs/complex_functors.h" | ||
| #include "paddle/phi/kernels/funcs/elementwise_base.h" | ||
| #include "paddle/phi/kernels/index_sample_grad_kernel.h" |
There was a problem hiding this comment.
index_sample_grad_kernel.h放在最开头
Comment on lines
24
to
25
| #include "paddle/phi/kernels/funcs/complex_functors.h" | ||
| #include "paddle/phi/kernels/funcs/elementwise_base.h" |
| #include "paddle/fluid/platform/device/gpu/gpu_primitives.h" | ||
| #include "paddle/phi/backends/gpu/gpu_context.h" | ||
| #include "paddle/phi/common/data_type.h" | ||
| #include "paddle/phi/core/dense_tensor.h" |
There was a problem hiding this comment.
data_type.h和dense_tensor.h应该不需要include了
Comment on lines
19
to
24
| #include "paddle/phi/common/data_type.h" | ||
| #include "paddle/phi/core/dense_tensor.h" | ||
| #include "paddle/phi/core/kernel_registry.h" | ||
| #include "paddle/phi/kernels/funcs/complex_functors.h" | ||
| #include "paddle/phi/kernels/funcs/elementwise_base.h" | ||
| #include "paddle/phi/kernels/index_sample_kernel.h" |
YuanRisheng
approved these changes
Feb 28, 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
Others
PR changes
Others
Describe
move index sample op.