[phi] move isnan_v2、isfinite_v2、isinf_v2 to phi #40076
Merged
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! |
chenwhql
reviewed
Mar 2, 2022
| @@ -0,0 +1,95 @@ | |||
| // Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | |||
There was a problem hiding this comment.
我看了下底层的TensorContainsInfV2这几个实现，还是属于cpu和gpu公用的实现，这样的话，这个还是属于应该在cpu和gpu子目录下分别创建cc和cu文件的情况，kernels根目录下是放置纯设备无关的kernel实现，比如说这个也需要在xpu和将来的其他设备上能用才行，目前的实现是不行的
There was a problem hiding this comment.
@chenwhql Done.已在cpu和gpu子目录下分别创建cc和cu文件
zyfncg
reviewed
Mar 2, 2022
Comment on lines
44
to
54
| #define DEFINE_ISFINITE_SR(isfinite_sr, functor) \ | ||
| template <typename T, typename Context> \ | ||
| void isfinite_sr( \ | ||
| const Context& ctx, const SelectedRows& x, SelectedRows* out) { \ | ||
| IsfiniteSRImpl<T, Context, functor>(ctx, x, out); \ | ||
| } | ||
|
|
||
| DEFINE_ISFINITE_SR(IsinfSR, funcs::InfinityV2Functor) | ||
| DEFINE_ISFINITE_SR(IsnanSR, funcs::NANV2Functor) | ||
| DEFINE_ISFINITE_SR(IsfiniteSR, funcs::IsfiniteV2Functor) | ||
| #undef DEFINE_ISFINITE_SR |
There was a problem hiding this comment.
SelectedRows相关的kernel逻辑需要放在selected_rows目录下
paddle/phi/kernels/isfinite_kernel.h
Outdated
Comment on lines
32
to
40
| #define DEFINE_ISFINITE_SR(isfinite_sr) \ | ||
| template <typename T, typename Context> \ | ||
| void isfinite_sr( \ | ||
| const Context& ctx, const SelectedRows& x, SelectedRows* out); | ||
|
|
||
| DEFINE_ISFINITE_SR(IsinfSR) | ||
| DEFINE_ISFINITE_SR(IsnanSR) | ||
| DEFINE_ISFINITE_SR(IsfiniteSR) | ||
| #undef DEFINE_ISFINITE_SR |
YuanRisheng
previously approved these changes
Mar 3, 2022
zyfncg
previously approved these changes
Mar 3, 2022
wjj19950828
dismissed stale reviews from zyfncg, YuanRisheng, and MingMingShangTian
via
e8daa44
chenwhql
reviewed
Mar 8, 2022
| @@ -0,0 +1,39 @@ | |||
| // Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | |||
| namespace phi { | ||
|
|
||
| template <typename T, typename Context, typename Functor> | ||
| inline void IsfiniteSRImpl(const Context& dev_ctx, |
There was a problem hiding this comment.
SelectedRows在这几个kernel上，建议直接调用DenseTensor的kernel，而不是单独为它实现一个类似的，参考现有的几个SelectedRows kernel
| #include "paddle/phi/core/kernel_registry.h" | ||
| #include "paddle/phi/kernels/selected_rows/isfinite_kernel_impl.h" | ||
|
|
||
| namespace phi { |
There was a problem hiding this comment.
selected_rows目录下命名空间加一层sr，kernel名也不需要加SR的中缀了，参考其他几个SelectedRows kernel
| @@ -14,39 +14,32 @@ | |||
|
|
|||
| #pragma once | |||
|
|
|||
| #include <vector> | |||
|
|
|||
| #include "paddle/fluid/framework/eigen.h" | |||
| #include "paddle/fluid/framework/op_registry.h" | |||
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
Function optimization
PR changes
OPs
Describe
迁移phi算子：isnan_v2、isfinite_v2、isinf_v2
1、包括两个kernel的实现：densetensor以及selectedrows
2、将selected_rows kernel相关的声明头文件调整到selected_rows目录下
3、多加一层传入functor