Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
20eed540
P
Paddle
项目概览
OPTHREE
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
20eed540
编写于
3月 31, 2020
作者:
G
GaoWei8
提交者:
GitHub
3月 31, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change fluid.layers.where‘s C++ operator name (#23250)
上级
12355ccc
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
53 addition
and
31 deletion
+53
-31
paddle/fluid/operators/where_index_op.cc
paddle/fluid/operators/where_index_op.cc
+18
-12
paddle/fluid/operators/where_index_op.cu
paddle/fluid/operators/where_index_op.cu
+5
-5
paddle/fluid/operators/where_index_op.h
paddle/fluid/operators/where_index_op.h
+6
-6
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+4
-2
python/paddle/fluid/tests/unittests/test_where_index.py
python/paddle/fluid/tests/unittests/test_where_index.py
+20
-6
未找到文件。
paddle/fluid/operators/where_op.cc
→
paddle/fluid/operators/where_
index_
op.cc
浏览文件 @
20eed540
...
...
@@ -12,23 +12,28 @@ 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/where_op.h"
#include "paddle/fluid/operators/where_
index_
op.h"
namespace
paddle
{
namespace
operators
{
class
WhereOp
:
public
framework
::
OperatorWithKernel
{
class
Where
Index
Op
:
public
framework
::
OperatorWithKernel
{
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Condition"
),
"Input(Condition) of WhereOp should not be null."
);
PADDLE_ENFORCE
(
ctx
->
GetInputDim
(
"Condition"
).
size
()
>=
1
,
"Input(Condition) should have number of dimension at least 1"
);
PADDLE_ENFORCE
(
ctx
->
HasOutput
(
"Out"
),
"Output(OUt) of WhereOp should not be null."
);
PADDLE_ENFORCE_EQ
(
ctx
->
HasInput
(
"Condition"
),
true
,
platform
::
errors
::
NotFound
(
"Input(Condition) of layers.where should not be null."
));
PADDLE_ENFORCE_GE
(
ctx
->
GetInputDim
(
"Condition"
).
size
(),
1UL
,
platform
::
errors
::
InvalidArgument
(
"Input(Condition) should have number of dimension at least 1"
));
PADDLE_ENFORCE_EQ
(
ctx
->
HasOutput
(
"Out"
),
true
,
platform
::
errors
::
NotFound
(
"Output(Out) of layers.where should not be null."
));
ctx
->
SetOutputDim
(
"Out"
,
{
-
1
,
ctx
->
GetInputDim
(
"Condition"
).
size
()});
}
...
...
@@ -40,7 +45,7 @@ class WhereOp : public framework::OperatorWithKernel {
}
};
class
WhereOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
class
Where
Index
OpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
void
Make
()
override
{
AddInput
(
"Condition"
,
"A bool tensor whose rank is at least 1"
);
...
...
@@ -54,5 +59,6 @@ class WhereOpMaker : public framework::OpProtoAndCheckerMaker {
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_WITHOUT_GRADIENT
(
where
,
ops
::
WhereOp
,
ops
::
WhereOpMaker
);
REGISTER_OP_CPU_KERNEL
(
where
,
ops
::
CPUWhereKernel
<
int64_t
>
);
REGISTER_OP_WITHOUT_GRADIENT
(
where_index
,
ops
::
WhereIndexOp
,
ops
::
WhereIndexOpMaker
);
REGISTER_OP_CPU_KERNEL
(
where_index
,
ops
::
CPUWhereIndexKernel
<
int64_t
>
);
paddle/fluid/operators/where_op.cu
→
paddle/fluid/operators/where_
index_
op.cu
浏览文件 @
20eed540
...
...
@@ -15,7 +15,7 @@ limitations under the License. */
#include <thrust/device_vector.h>
#include "paddle/fluid/framework/ddim.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/where_op.h"
#include "paddle/fluid/operators/where_
index_
op.h"
#include "paddle/fluid/platform/cuda_primitives.h"
#include "paddle/fluid/platform/for_range.h"
...
...
@@ -25,7 +25,7 @@ namespace operators {
using
CUDADeviceContext
=
paddle
::
platform
::
CUDADeviceContext
;
template
<
typename
T
>
class
CUDAWhereKernel
:
public
framework
::
OpKernel
<
T
>
{
class
CUDAWhere
Index
Kernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
condition
=
context
.
Input
<
framework
::
Tensor
>
(
"Condition"
);
...
...
@@ -67,8 +67,8 @@ class CUDAWhereKernel : public framework::OpKernel<T> {
int
*
ptr_stride
=
thrust
::
raw_pointer_cast
(
d_stride
.
data
());
auto
&
dev_ctx
=
context
.
template
device_context
<
CUDADeviceContext
>();
WhereFunctor
<
int
*>
functor
(
ptr_true_index
,
true_num
,
ptr_stride
,
rank
,
out_ptr
);
Where
Index
Functor
<
int
*>
functor
(
ptr_true_index
,
true_num
,
ptr_stride
,
rank
,
out_ptr
);
platform
::
ForRange
<
CUDADeviceContext
>
for_range
(
dev_ctx
,
true_num
);
for_range
(
functor
);
}
...
...
@@ -78,4 +78,4 @@ class CUDAWhereKernel : public framework::OpKernel<T> {
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_CUDA_KERNEL
(
where
,
ops
::
CUDAWhere
Kernel
<
int64_t
>
);
REGISTER_OP_CUDA_KERNEL
(
where
_index
,
ops
::
CUDAWhereIndex
Kernel
<
int64_t
>
);
paddle/fluid/operators/where_op.h
→
paddle/fluid/operators/where_
index_
op.h
浏览文件 @
20eed540
...
...
@@ -24,9 +24,9 @@ namespace paddle {
namespace
operators
{
template
<
typename
T
>
struct
WhereFunctor
{
Where
Functor
(
const
T
&
true_index
,
int
true_num
,
const
T
&
stride
,
int
rank
,
int64_t
*
out
)
struct
Where
Index
Functor
{
Where
IndexFunctor
(
const
T
&
true_index
,
int
true_num
,
const
T
&
stride
,
int
rank
,
int64_t
*
out
)
:
true_index_
(
true_index
),
true_num_
(
true_num
),
stride_
(
stride
),
...
...
@@ -51,7 +51,7 @@ struct WhereFunctor {
using
CPUDeviceContext
=
paddle
::
platform
::
CPUDeviceContext
;
template
<
typename
T
>
class
CPUWhereKernel
:
public
framework
::
OpKernel
<
T
>
{
class
CPUWhere
Index
Kernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
condition
=
context
.
Input
<
framework
::
Tensor
>
(
"Condition"
);
...
...
@@ -84,8 +84,8 @@ class CPUWhereKernel : public framework::OpKernel<T> {
}
auto
&
dev_ctx
=
context
.
template
device_context
<
CPUDeviceContext
>();
Where
Functor
<
int
*>
functor
(
true_index
.
data
(),
true_num
,
stride
.
data
(),
rank
,
out_ptr
);
Where
IndexFunctor
<
int
*>
functor
(
true_index
.
data
(),
true_num
,
stride
.
data
()
,
rank
,
out_ptr
);
platform
::
ForRange
<
CPUDeviceContext
>
for_range
(
dev_ctx
,
true_num
);
for_range
(
functor
);
}
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
20eed540
...
...
@@ -12976,13 +12976,15 @@ def where(condition):
out = layers.where(condition) # [[]]
"""
helper = LayerHelper("where", **locals())
helper = LayerHelper("where
_index
", **locals())
out = helper.create_variable_for_type_inference(
dtype=core.VarDesc.VarType.INT64)
helper.append_op(
type='where', inputs={'Condition': condition}, outputs={'Out': [out]})
type='where_index',
inputs={'Condition': condition},
outputs={'Out': [out]})
return out
...
...
python/paddle/fluid/tests/unittests/test_where.py
→
python/paddle/fluid/tests/unittests/test_where
_index
.py
浏览文件 @
20eed540
...
...
@@ -19,11 +19,13 @@ import numpy as np
from
op_test
import
OpTest
import
paddle.fluid.core
as
core
from
paddle.fluid.op
import
Operator
import
paddle.fluid
as
fluid
from
paddle.fluid
import
Program
,
program_guard
class
TestWhereOp
(
OpTest
):
class
TestWhere
Index
Op
(
OpTest
):
def
setUp
(
self
):
self
.
op_type
=
"where"
self
.
op_type
=
"where
_index
"
self
.
init_config
()
def
test_check_output
(
self
):
...
...
@@ -37,7 +39,7 @@ class TestWhereOp(OpTest):
class
TestAllFalse
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
op_type
=
"where"
self
.
op_type
=
"where
_index
"
self
.
init_config
()
def
check_with_place
(
self
,
place
):
...
...
@@ -48,7 +50,7 @@ class TestAllFalse(unittest.TestCase):
out
=
scope
.
var
(
"Out"
).
get_tensor
()
out
.
set
(
np
.
full
(
self
.
shape
,
0
).
astype
(
'int64'
),
place
)
op
=
Operator
(
"where"
,
Condition
=
"Condition"
,
Out
=
"Out"
)
op
=
Operator
(
"where
_index
"
,
Condition
=
"Condition"
,
Out
=
"Out"
)
op
.
run
(
scope
,
place
)
out_array
=
np
.
array
(
out
)
...
...
@@ -66,14 +68,14 @@ class TestAllFalse(unittest.TestCase):
self
.
check_with_place
(
core
.
CUDAPlace
(
0
))
class
TestRank2
(
TestWhereOp
):
class
TestRank2
(
TestWhere
Index
Op
):
def
init_config
(
self
):
self
.
inputs
=
{
'Condition'
:
np
.
array
([[
True
,
False
],
[
False
,
True
]]),
}
self
.
outputs
=
{
'Out'
:
np
.
array
([[
0
,
0
],
[
1
,
1
]],
dtype
=
'int64'
)}
class
TestRank3
(
TestWhereOp
):
class
TestRank3
(
TestWhere
Index
Op
):
def
init_config
(
self
):
self
.
inputs
=
{
'Condition'
:
np
.
array
([[[
True
,
False
],
[
False
,
True
]],
...
...
@@ -88,5 +90,17 @@ class TestRank3(TestWhereOp):
}
class
TestWhereOpError
(
unittest
.
TestCase
):
def
test_api
(
self
):
with
program_guard
(
Program
(),
Program
()):
cond
=
fluid
.
layers
.
data
(
name
=
'cond'
,
shape
=
[
4
],
dtype
=
'bool'
)
result
=
fluid
.
layers
.
where
(
cond
)
exe
=
fluid
.
Executor
(
fluid
.
CPUPlace
())
exe
.
run
(
fluid
.
default_startup_program
())
cond_i
=
np
.
array
([
True
,
False
,
False
,
False
]).
astype
(
"bool"
)
out
=
exe
.
run
(
fluid
.
default_main_program
(),
feed
=
{
'cond'
:
cond_i
})
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录