Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
45171911
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
45171911
编写于
8月 31, 2022
作者:
L
Li Min
提交者:
GitHub
8月 31, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add index add API (#45176)
上级
a119686c
变更
24
显示空白变更内容
内联
并排
Showing
24 changed file
with
1331 addition
and
35 deletion
+1331
-35
paddle/fluid/operators/index_add_op.cc
paddle/fluid/operators/index_add_op.cc
+118
-0
paddle/phi/api/yaml/legacy_api.yaml
paddle/phi/api/yaml/legacy_api.yaml
+11
-0
paddle/phi/api/yaml/legacy_backward.yaml
paddle/phi/api/yaml/legacy_backward.yaml
+11
-0
paddle/phi/infermeta/backward.cc
paddle/phi/infermeta/backward.cc
+22
-0
paddle/phi/infermeta/backward.h
paddle/phi/infermeta/backward.h
+7
-0
paddle/phi/infermeta/binary.cc
paddle/phi/infermeta/binary.cc
+57
-0
paddle/phi/infermeta/binary.h
paddle/phi/infermeta/binary.h
+6
-0
paddle/phi/kernels/cpu/index_add_grad_kernel.cc
paddle/phi/kernels/cpu/index_add_grad_kernel.cc
+71
-0
paddle/phi/kernels/cpu/index_add_impl.h
paddle/phi/kernels/cpu/index_add_impl.h
+118
-0
paddle/phi/kernels/cpu/index_add_kernel.cc
paddle/phi/kernels/cpu/index_add_kernel.cc
+45
-0
paddle/phi/kernels/gpu/index_add_grad_kernel.cu
paddle/phi/kernels/gpu/index_add_grad_kernel.cu
+108
-0
paddle/phi/kernels/gpu/index_add_kernel.cu
paddle/phi/kernels/gpu/index_add_kernel.cu
+128
-0
paddle/phi/kernels/gpu/index_select_impl.h
paddle/phi/kernels/gpu/index_select_impl.h
+45
-0
paddle/phi/kernels/gpu/index_select_kernel.cu
paddle/phi/kernels/gpu/index_select_kernel.cu
+1
-18
paddle/phi/kernels/index_add_grad_kernel.h
paddle/phi/kernels/index_add_grad_kernel.h
+30
-0
paddle/phi/kernels/index_add_kernel.h
paddle/phi/kernels/index_add_kernel.h
+28
-0
paddle/phi/ops/compat/index_add_sig.cc
paddle/phi/ops/compat/index_add_sig.cc
+35
-0
python/paddle/__init__.py
python/paddle/__init__.py
+4
-0
python/paddle/fluid/tests/unittests/CMakeLists.txt
python/paddle/fluid/tests/unittests/CMakeLists.txt
+1
-0
python/paddle/fluid/tests/unittests/test_index_add_op.py
python/paddle/fluid/tests/unittests/test_index_add_op.py
+362
-0
python/paddle/fluid/tests/unittests/white_list/check_shape_white_list.py
...luid/tests/unittests/white_list/check_shape_white_list.py
+4
-16
python/paddle/tensor/__init__.py
python/paddle/tensor/__init__.py
+4
-0
python/paddle/tensor/manipulation.py
python/paddle/tensor/manipulation.py
+114
-0
tools/parallel_UT_rule.py
tools/parallel_UT_rule.py
+1
-1
未找到文件。
paddle/fluid/operators/index_add_op.cc
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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 <memory>
#include "paddle/fluid/framework/infershape_utils.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/phi/infermeta/backward.h"
#include "paddle/phi/infermeta/binary.h"
namespace
paddle
{
namespace
operators
{
class
IndexAddOp
:
public
framework
::
OperatorWithKernel
{
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
framework
::
OpKernelType
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
framework
::
OpKernelType
(
OperatorWithKernel
::
IndicateVarDataType
(
ctx
,
"X"
),
ctx
.
GetPlace
());
}
};
class
IndexAddOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
void
Make
()
override
{
AddInput
(
"X"
,
"(Tensor), "
"the input feature data of IndexAddOp, dtype should be"
"bool, int32, int64, float16, float32, float64."
);
AddInput
(
"Index"
,
"(Tensor), the 1-D tensor containing the indices to index."
);
AddInput
(
"AddValue"
,
"(Tensor), the tensor containing values to add."
);
AddOutput
(
"Out"
,
"(Tensor),"
" the output of IndexAddOp, whose dtype and shape are the same as X."
);
AddAttr
<
int
>
(
"axis"
,
"the dimension in which we index."
).
SetDefault
(
0
);
AddComment
(
R"DOC(
IndexAdd operator
Add the elements of the input tensor with value
by selecting the indices in the order given in index.
This operator also supports inplace modification.
)DOC"
);
}
};
template
<
typename
T
>
class
IndexAddGradMaker
:
public
framework
::
SingleGradOpMaker
<
T
>
{
public:
using
framework
::
SingleGradOpMaker
<
T
>::
SingleGradOpMaker
;
void
Apply
(
GradOpPtr
<
T
>
op
)
const
override
{
op
->
SetType
(
"index_add_grad"
);
op
->
SetInput
(
"Index"
,
this
->
Input
(
"Index"
));
op
->
SetInput
(
"AddValue"
,
this
->
Input
(
"AddValue"
));
op
->
SetInput
(
framework
::
GradVarName
(
"Out"
),
this
->
OutputGrad
(
"Out"
));
op
->
SetAttrMap
(
this
->
Attrs
());
op
->
SetOutput
(
framework
::
GradVarName
(
"X"
),
this
->
InputGrad
(
"X"
));
op
->
SetOutput
(
framework
::
GradVarName
(
"AddValue"
),
this
->
InputGrad
(
"AddValue"
));
}
};
class
IndexAddGradOp
:
public
framework
::
OperatorWithKernel
{
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
protected:
framework
::
OpKernelType
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
framework
::
OpKernelType
(
OperatorWithKernel
::
IndicateVarDataType
(
ctx
,
framework
::
GradVarName
(
"Out"
)),
ctx
.
GetPlace
());
}
};
DECLARE_INPLACE_OP_INFERER
(
IndexAddInplaceInferer
,
{
"X"
,
"Out"
});
DECLARE_INPLACE_OP_INFERER
(
IndexAddGradInplaceInferer
,
{
framework
::
GradVarName
(
"Out"
),
framework
::
GradVarName
(
"X"
)});
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
DECLARE_INFER_SHAPE_FUNCTOR
(
index_add
,
IndexAddInferShapeFunctor
,
PD_INFER_META
(
phi
::
IndexAddInferMeta
));
REGISTER_OPERATOR
(
index_add
,
ops
::
IndexAddOp
,
ops
::
IndexAddOpMaker
,
ops
::
IndexAddGradMaker
<
paddle
::
framework
::
OpDesc
>
,
ops
::
IndexAddGradMaker
<
paddle
::
imperative
::
OpBase
>
,
ops
::
IndexAddInplaceInferer
,
IndexAddInferShapeFunctor
);
DECLARE_INFER_SHAPE_FUNCTOR
(
index_add_grad
,
IndexAddGradInferShapeFunctor
,
PD_INFER_META
(
phi
::
IndexAddGradInferMeta
));
REGISTER_OPERATOR
(
index_add_grad
,
ops
::
IndexAddGradOp
,
ops
::
IndexAddGradInplaceInferer
,
IndexAddGradInferShapeFunctor
);
paddle/phi/api/yaml/legacy_api.yaml
浏览文件 @
45171911
...
...
@@ -1257,6 +1257,17 @@
func
:
increment
inplace
:
(x -> out)
-
api
:
index_add
args
:
(Tensor x, Tensor index, Tensor add_value, int axis)
output
:
Tensor(out)
infer_meta
:
func
:
IndexAddInferMeta
kernel
:
func
:
index_add
data_type
:
x
inplace
:
(x -> out)
backward
:
index_add_grad
-
api
:
index_sample
args
:
(Tensor x, Tensor index)
output
:
Tensor
...
...
paddle/phi/api/yaml/legacy_backward.yaml
浏览文件 @
45171911
...
...
@@ -1092,6 +1092,17 @@
output
:
Tensor(x_grad)
invoke
:
imag_grad_impl(out_grad, x_grad)
-
backward_api
:
index_add_grad
forward
:
index_add(Tensor x, Tensor index, Tensor add_value, int axis) -> Tensor(out)
args
:
(Tensor index, Tensor add_value, Tensor out_grad, int axis)
output
:
Tensor(x_grad), Tensor(add_value_grad)
infer_meta
:
func
:
IndexAddGradInferMeta
kernel
:
func
:
index_add_grad
data_type
:
out_grad
inplace
:
(out_grad -> x_grad)
-
backward_api
:
index_sample_grad
forward
:
index_sample (Tensor x, Tensor index) -> Tensor(out)
args
:
(Tensor x, Tensor index, Tensor out_grad)
...
...
paddle/phi/infermeta/backward.cc
浏览文件 @
45171911
...
...
@@ -981,4 +981,26 @@ void Yolov3LossGradInferMeta(const MetaTensor& x,
}
}
void
IndexAddGradInferMeta
(
const
MetaTensor
&
index
,
const
MetaTensor
&
add_value
,
const
MetaTensor
&
out_grad
,
int
axis
,
MetaTensor
*
x_grad
,
MetaTensor
*
add_value_grad
)
{
auto
do_dims
=
out_grad
.
dims
();
auto
add_value_dims
=
add_value
.
dims
();
if
(
x_grad
)
{
x_grad
->
set_dims
(
do_dims
);
x_grad
->
set_dtype
(
out_grad
.
dtype
());
x_grad
->
set_layout
(
out_grad
.
layout
());
x_grad
->
share_lod
(
out_grad
);
}
if
(
add_value_grad
)
{
add_value_grad
->
set_dims
(
add_value_dims
);
add_value_grad
->
set_dtype
(
add_value
.
dtype
());
add_value_grad
->
set_layout
(
add_value
.
layout
());
add_value_grad
->
share_lod
(
add_value
);
}
}
}
// namespace phi
paddle/phi/infermeta/backward.h
浏览文件 @
45171911
...
...
@@ -398,4 +398,11 @@ void Yolov3LossGradInferMeta(const MetaTensor& x,
MetaTensor
*
gt_label_grad
,
MetaTensor
*
gt_score_grad
);
void
IndexAddGradInferMeta
(
const
MetaTensor
&
index
,
const
MetaTensor
&
add_value
,
const
MetaTensor
&
out_grad
,
int
axis
,
MetaTensor
*
x_grad
,
MetaTensor
*
add_tensor_grad
);
}
// namespace phi
paddle/phi/infermeta/binary.cc
浏览文件 @
45171911
...
...
@@ -1507,6 +1507,63 @@ void IndexSelectInferMeta(const MetaTensor& x,
output
->
share_lod
(
x
);
}
void
IndexAddInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
index
,
const
MetaTensor
&
add_value
,
int
axis
,
MetaTensor
*
output
)
{
auto
input_dim
=
x
.
dims
();
auto
index_dim
=
index
.
dims
();
auto
add_value_dim
=
add_value
.
dims
();
PADDLE_ENFORCE_EQ
(
axis
<
input_dim
.
size
()
&&
axis
>=
(
0
-
input_dim
.
size
()),
true
,
phi
::
errors
::
OutOfRange
(
"Attr(dim) is out of range, It's expected "
"to be in range of [-%d, %d]. But received Attr(axis) = %d."
,
input_dim
.
size
(),
input_dim
.
size
()
-
1
,
axis
));
int
real_axis
=
axis
>=
0
?
axis
:
axis
+
input_dim
.
size
();
PADDLE_ENFORCE_EQ
(
index_dim
.
size
()
==
1
,
true
,
phi
::
errors
::
InvalidArgument
(
"The 'shape' of Input(Index) must be 1-D tensor. "
"But received: the 'shape' of Input(Index) is [%s], "
"the dimension of Input(Index) is [%d]."
,
index_dim
,
index_dim
.
size
()));
PADDLE_ENFORCE_EQ
(
index_dim
[
0
]
!=
0
,
true
,
phi
::
errors
::
InvalidArgument
(
"The length of Input(Index) can't be 0."
));
// Note, add_value does not support broadcast now.
PADDLE_ENFORCE_EQ
(
input_dim
.
size
()
==
add_value_dim
.
size
(),
true
,
phi
::
errors
::
InvalidArgument
(
"The add_value must be the same dimension as x."
));
for
(
int
i
=
0
;
i
<
input_dim
.
size
();
i
++
)
{
if
(
i
!=
real_axis
)
{
PADDLE_ENFORCE_EQ
(
input_dim
[
i
]
==
add_value_dim
[
i
],
true
,
phi
::
errors
::
InvalidArgument
(
"The add_value parameter does not supported "
"broadcast, so input_dim[i] must be equal to "
"add_value_dim[i] when i != axis."
));
}
}
output
->
set_dims
(
x
.
dims
());
output
->
set_dtype
(
x
.
dtype
());
output
->
set_layout
(
x
.
layout
());
output
->
share_lod
(
x
);
}
void
KronInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
)
{
auto
dim_x
=
x
.
dims
();
auto
dim_y
=
y
.
dims
();
...
...
paddle/phi/infermeta/binary.h
浏览文件 @
45171911
...
...
@@ -237,6 +237,12 @@ void IndexSelectInferMeta(const MetaTensor& x,
int
dim
,
MetaTensor
*
output
);
void
IndexAddInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
index
,
const
MetaTensor
&
add_value
,
int
axis
,
MetaTensor
*
output
);
void
KronInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
);
void
LogLossInferMeta
(
const
MetaTensor
&
input
,
...
...
paddle/phi/kernels/cpu/index_add_grad_kernel.cc
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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/phi/kernels/index_add_grad_kernel.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
#include "paddle/phi/kernels/cpu/index_select_impl.h"
namespace
phi
{
template
<
typename
T
,
typename
Context
>
void
IndexAddGradKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
const
DenseTensor
&
out_grad
,
int
axis
,
DenseTensor
*
x_grad
,
DenseTensor
*
add_value_grad
)
{
if
(
axis
<
0
)
{
axis
+=
out_grad
.
dims
().
size
();
}
const
auto
&
index_type
=
index
.
dtype
();
bool
index_type_match
=
index_type
==
phi
::
DataType
::
INT32
||
index_type
==
phi
::
DataType
::
INT64
;
PADDLE_ENFORCE_EQ
(
index_type_match
,
true
,
phi
::
errors
::
InvalidArgument
(
"Input(Index) holds the wrong type, it holds %s, but "
"desires to be %s or %s"
,
index_type
,
phi
::
DataType
::
INT32
,
phi
::
DataType
::
INT64
));
// get x_grad: copy out_grad to x_grad.
ctx
.
template
Alloc
<
T
>(
x_grad
);
phi
::
Copy
(
ctx
,
out_grad
,
ctx
.
GetPlace
(),
false
,
x_grad
);
auto
inputs
=
out_grad
;
// get add_value_grad by using index_select(out_grad, index, axis)
if
(
index_type
==
phi
::
DataType
::
INT32
)
{
IndexSelectInner
<
Context
,
T
,
int
>
(
ctx
,
&
inputs
,
index
,
add_value_grad
,
axis
);
}
else
if
(
index_type
==
phi
::
DataType
::
INT64
)
{
IndexSelectInner
<
Context
,
T
,
int64_t
>
(
ctx
,
&
inputs
,
index
,
add_value_grad
,
axis
);
}
}
}
// namespace phi
PD_REGISTER_KERNEL
(
index_add_grad
,
CPU
,
ALL_LAYOUT
,
phi
::
IndexAddGradKernel
,
float
,
double
,
int
,
int64_t
)
{}
paddle/phi/kernels/cpu/index_add_impl.h
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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.
#pragma once
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/tensor_utils.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/math_function.h"
namespace
phi
{
template
<
typename
Context
,
typename
T
,
typename
IndexT
=
int
>
void
IndexAddInner
(
const
Context
&
ctx
,
DenseTensor
*
input
,
const
DenseTensor
&
index
,
int
axis
,
DenseTensor
*
add_value
,
DenseTensor
*
output
)
{
auto
input_dim
=
input
->
dims
();
auto
input_dim_size
=
input_dim
.
size
();
auto
output_dim
=
output
->
dims
();
auto
index_size
=
index
.
dims
()[
0
];
auto
add_value_dim
=
add_value
->
dims
();
const
IndexT
*
index_data
=
index
.
data
<
IndexT
>
();
ctx
.
template
Alloc
<
T
>(
output
);
// copy x to output.
// todo(@limin29): inplace do not need copy.
phi
::
Copy
(
ctx
,
*
input
,
ctx
.
GetPlace
(),
false
,
output
);
auto
slice_size
=
1
;
for
(
auto
i
=
axis
+
1
;
i
<
input_dim_size
;
i
++
)
{
slice_size
*=
input_dim
[
i
];
}
auto
outer_nums
=
1
;
for
(
auto
i
=
0
;
i
<
axis
;
i
++
)
{
outer_nums
*=
input_dim
[
i
];
}
for
(
int
i
=
0
;
i
<
index_size
;
i
++
)
{
PADDLE_ENFORCE_GE
(
index_data
[
i
],
0
,
phi
::
errors
::
InvalidArgument
(
"Variable value (index) of OP(index_add) "
"expected >= 0 and < %ld, but got %ld. Please check input "
"value."
,
input_dim
[
axis
],
index_data
[
i
]));
PADDLE_ENFORCE_LT
(
index_data
[
i
],
input_dim
[
axis
],
phi
::
errors
::
InvalidArgument
(
"Variable value (index) of OP(index_add) "
"expected >= 0 and < %ld, but got %ld. Please check input "
"value."
,
input_dim
[
axis
],
index_data
[
i
]));
}
VLOG
(
3
)
<<
"Index_Add_Debug; outer_nums: "
<<
outer_nums
<<
"; slice_size: "
<<
slice_size
<<
"; index_size: "
<<
index_size
;
output
->
Resize
(
phi
::
make_ddim
({
outer_nums
,
input_dim
[
axis
],
slice_size
}));
add_value
->
Resize
(
phi
::
make_ddim
({
outer_nums
,
index_size
,
slice_size
}));
VLOG
(
3
)
<<
"output.dims: "
<<
output
->
dims
()
<<
", add_value.dims: "
<<
add_value
->
dims
();
auto
add_value_tensor
=
EigenTensor
<
T
,
3
>::
From
(
*
add_value
);
auto
output_tensor
=
EigenTensor
<
T
,
3
>::
From
(
*
output
);
auto
&
place
=
*
ctx
.
eigen_device
();
for
(
auto
j
=
0
;
j
<
index_size
;
j
++
)
{
IndexT
index_value
=
index_data
[
j
];
auto
output_t
=
output_tensor
.
chip
(
index_value
,
1
);
output_t
.
device
(
place
)
=
output_t
+
add_value_tensor
.
chip
(
j
,
1
);
}
output
->
Resize
(
output_dim
);
add_value
->
Resize
(
add_value_dim
);
}
template
<
typename
T
,
typename
Context
>
void
IndexAddBaseKernel
(
const
Context
&
dev_ctx
,
const
DenseTensor
&
x
,
const
DenseTensor
&
index
,
int
axis
,
const
DenseTensor
&
add_value
,
DenseTensor
*
output
)
{
const
auto
&
index_type
=
index
.
dtype
();
if
(
axis
<
0
)
{
axis
+=
x
.
dims
().
size
();
}
auto
inputs
=
x
;
auto
add_values
=
add_value
;
if
(
index_type
==
phi
::
DataType
::
INT32
)
{
IndexAddInner
<
Context
,
T
,
int
>
(
dev_ctx
,
&
inputs
,
index
,
axis
,
&
add_values
,
output
);
}
else
if
(
index_type
==
phi
::
DataType
::
INT64
)
{
IndexAddInner
<
Context
,
T
,
int64_t
>
(
dev_ctx
,
&
inputs
,
index
,
axis
,
&
add_values
,
output
);
}
}
}
// namespace phi
paddle/phi/kernels/cpu/index_add_kernel.cc
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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/phi/kernels/index_add_kernel.h"
#include "paddle/fluid/memory/memcpy.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
// #include "paddle/phi/kernels/copy_kernel.h"
#include "paddle/phi/kernels/cpu/index_add_impl.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
namespace
phi
{
template
<
typename
T
,
typename
Context
>
void
IndexAddKernel
(
const
Context
&
dev_ctx
,
const
DenseTensor
&
x
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
int
axis
,
DenseTensor
*
output
)
{
IndexAddBaseKernel
<
T
,
Context
>
(
dev_ctx
,
x
,
index
,
axis
,
add_value
,
output
);
}
}
// namespace phi
PD_REGISTER_KERNEL
(
index_add
,
CPU
,
ALL_LAYOUT
,
phi
::
IndexAddKernel
,
float
,
double
,
phi
::
dtype
::
float16
,
int
,
int64_t
)
{}
paddle/phi/kernels/gpu/index_add_grad_kernel.cu
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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/phi/kernels/index_add_grad_kernel.h"
#include "paddle/fluid/platform/device/gpu/gpu_launch_config.h"
#include "paddle/fluid/platform/device/gpu/gpu_primitives.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/gpu/index_select_impl.h"
namespace
phi
{
using
paddle
::
platform
::
PADDLE_CUDA_NUM_THREADS
;
template
<
typename
T
,
typename
Context
>
void
IndexAddGradKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
const
DenseTensor
&
out_grad
,
int
dim
,
DenseTensor
*
x_grad
,
DenseTensor
*
add_value_grad
)
{
auto
*
output_grad_data
=
out_grad
.
data
<
T
>
();
auto
*
in_grad_data
=
ctx
.
template
Alloc
<
T
>(
x_grad
);
auto
*
add_value_grad_data
=
ctx
.
template
Alloc
<
T
>(
add_value_grad
);
auto
input_dim
=
x_grad
->
dims
();
auto
output_dim
=
out_grad
.
dims
();
auto
add_value_dim
=
add_value_grad
->
dims
();
dim
=
dim
>=
0
?
dim
:
dim
+
input_dim
.
size
();
auto
stride_dim
=
phi
::
stride
(
input_dim
);
int64_t
stride
=
stride_dim
[
dim
];
int64_t
size
=
add_value_dim
[
dim
];
int64_t
delta
=
input_dim
[
dim
]
-
size
;
const
auto
&
index_type
=
index
.
dtype
();
bool
index_type_match
=
index_type
==
phi
::
DataType
::
INT64
||
index_type
==
phi
::
DataType
::
INT32
;
PADDLE_ENFORCE_EQ
(
index_type_match
,
true
,
phi
::
errors
::
InvalidArgument
(
"Input(Index) holds the wrong type, it holds %s, but "
"desires to be %s or %s"
,
index_type
,
phi
::
DataType
::
INT32
,
phi
::
DataType
::
INT64
));
int64_t
numel
=
add_value_grad
->
numel
();
if
(
numel
==
0
)
{
return
;
}
auto
stream
=
ctx
.
stream
();
// get x_grad: copy out_grad to x_grad.
phi
::
Copy
(
ctx
,
out_grad
,
ctx
.
GetPlace
(),
false
,
x_grad
);
// get add_value_grad: index_select(out_grad, index, axis)
unsigned
int
block_dim
=
PADDLE_CUDA_NUM_THREADS
;
dim3
grid_dim
=
dim3
((
numel
+
block_dim
-
1
)
/
block_dim
);
paddle
::
platform
::
LimitGridDim
(
ctx
,
&
grid_dim
);
if
(
index_type
==
phi
::
DataType
::
INT64
)
{
const
int64_t
*
index_data
=
index
.
data
<
int64_t
>
();
index_select_cuda_kernel
<
T
,
int64_t
>
<<<
grid_dim
,
block_dim
,
0
,
stream
>>>
(
output_grad_data
,
add_value_grad_data
,
index_data
,
numel
,
stride
,
size
,
delta
);
}
else
{
const
int
*
index_data
=
index
.
data
<
int
>
();
index_select_cuda_kernel
<
T
,
int
>
<<<
grid_dim
,
block_dim
,
0
,
stream
>>>
(
output_grad_data
,
add_value_grad_data
,
index_data
,
numel
,
stride
,
size
,
delta
);
}
}
}
// namespace phi
PD_REGISTER_KERNEL
(
index_add_grad
,
GPU
,
ALL_LAYOUT
,
phi
::
IndexAddGradKernel
,
float
,
double
,
int
,
int64_t
)
{}
paddle/phi/kernels/gpu/index_add_kernel.cu
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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/phi/kernels/index_add_kernel.h"
#include "paddle/fluid/platform/device/gpu/gpu_launch_config.h"
#include "paddle/fluid/platform/device/gpu/gpu_primitives.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
namespace
phi
{
using
paddle
::
platform
::
PADDLE_CUDA_NUM_THREADS
;
template
<
typename
T
,
typename
IndexT
>
__global__
void
index_add_cuda_kernel
(
const
T
*
input
,
const
IndexT
*
index
,
const
T
*
add_value
,
int64_t
N
,
int64_t
stride
,
int64_t
size
,
int64_t
delta
,
T
*
output
)
{
CUDA_KERNEL_LOOP_TYPE
(
idx
,
N
,
int64_t
)
{
int64_t
pre_idx
=
idx
/
(
stride
*
size
);
int64_t
dim_idx
=
idx
%
(
stride
*
size
)
/
stride
;
IndexT
src_dim_idx
=
index
[
dim_idx
];
int64_t
input_idx
=
idx
+
(
delta
*
pre_idx
+
src_dim_idx
-
dim_idx
)
*
stride
;
paddle
::
platform
::
CudaAtomicAdd
(
&
output
[
input_idx
],
add_value
[
idx
]);
}
}
template
<
typename
T
,
typename
Context
>
void
IndexAddKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
x
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
int
axis
,
DenseTensor
*
output
)
{
int
dim
=
axis
;
auto
input_dim
=
x
.
dims
();
auto
output_dim
=
output
->
dims
();
auto
add_value_dim
=
add_value
.
dims
();
dim
=
dim
>=
0
?
dim
:
dim
+
input_dim
.
size
();
auto
stride_dim
=
phi
::
stride
(
input_dim
);
int64_t
stride
=
stride_dim
[
dim
];
int64_t
size
=
add_value_dim
[
dim
];
int64_t
delta
=
input_dim
[
dim
]
-
size
;
const
auto
&
index_type
=
index
.
dtype
();
bool
index_type_match
=
index_type
==
phi
::
DataType
::
INT64
||
index_type
==
phi
::
DataType
::
INT32
;
PADDLE_ENFORCE_EQ
(
index_type_match
,
true
,
phi
::
errors
::
InvalidArgument
(
"Input(Index) holds the wrong type, it holds %s, but "
"desires to be %s or %s"
,
index_type
,
phi
::
DataType
::
INT32
,
phi
::
DataType
::
INT64
));
auto
*
in_data
=
x
.
data
<
T
>
();
T
*
out_data
=
ctx
.
template
Alloc
<
T
>(
output
);
auto
*
add_value_data
=
add_value
.
data
<
T
>
();
int64_t
numel
=
add_value
.
numel
();
if
(
numel
==
0
)
{
return
;
}
auto
stream
=
ctx
.
stream
();
unsigned
int
block_dim
=
PADDLE_CUDA_NUM_THREADS
;
dim3
grid_dim
=
dim3
((
numel
+
block_dim
-
1
)
/
block_dim
);
paddle
::
platform
::
LimitGridDim
(
ctx
,
&
grid_dim
);
// copy input to output.
// todo(@limin29): inplace do not need copy.
phi
::
Copy
(
ctx
,
x
,
ctx
.
GetPlace
(),
false
,
output
);
if
(
index_type
==
phi
::
DataType
::
INT64
)
{
const
int64_t
*
index_data
=
index
.
data
<
int64_t
>
();
index_add_cuda_kernel
<
T
,
int64_t
>
<<<
grid_dim
,
block_dim
,
0
,
stream
>>>
(
in_data
,
index_data
,
add_value_data
,
numel
,
stride
,
size
,
delta
,
out_data
);
}
else
{
const
int
*
index_data
=
index
.
data
<
int
>
();
index_add_cuda_kernel
<
T
,
int
>
<<<
grid_dim
,
block_dim
,
0
,
stream
>>>
(
in_data
,
index_data
,
add_value_data
,
numel
,
stride
,
size
,
delta
,
out_data
);
}
}
}
// namespace phi
PD_REGISTER_KERNEL
(
index_add
,
GPU
,
ALL_LAYOUT
,
phi
::
IndexAddKernel
,
float
,
double
,
phi
::
dtype
::
float16
,
int
,
int64_t
)
{}
paddle/phi/kernels/gpu/index_select_impl.h
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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.
#pragma once
#include "paddle/fluid/platform/device/gpu/gpu_launch_config.h"
#include "paddle/fluid/platform/device/gpu/gpu_primitives.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
namespace
phi
{
using
paddle
::
platform
::
PADDLE_CUDA_NUM_THREADS
;
template
<
typename
T
,
typename
IndexT
>
__global__
void
index_select_cuda_kernel
(
const
T
*
input
,
T
*
output
,
const
IndexT
*
index
,
int64_t
N
,
int64_t
stride
,
int64_t
size
,
int64_t
delta
)
{
CUDA_KERNEL_LOOP_TYPE
(
idx
,
N
,
int64_t
)
{
int64_t
pre_idx
=
idx
/
(
stride
*
size
);
int64_t
dim_idx
=
idx
%
(
stride
*
size
)
/
stride
;
IndexT
src_dim_idx
=
index
[
dim_idx
];
int64_t
input_idx
=
idx
+
(
delta
*
pre_idx
+
src_dim_idx
-
dim_idx
)
*
stride
;
output
[
idx
]
=
input
[
input_idx
];
}
}
}
// namespace phi
paddle/phi/kernels/gpu/index_select_kernel.cu
浏览文件 @
45171911
...
...
@@ -19,29 +19,12 @@
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/utils/data_type.h"
#include "paddle/phi/kernels/gpu/index_select_impl.h"
namespace
phi
{
using
paddle
::
platform
::
PADDLE_CUDA_NUM_THREADS
;
template
<
typename
T
,
typename
IndexT
>
__global__
void
index_select_cuda_kernel
(
const
T
*
input
,
T
*
output
,
const
IndexT
*
index
,
int64_t
N
,
int64_t
stride
,
int64_t
size
,
int64_t
delta
)
{
CUDA_KERNEL_LOOP_TYPE
(
idx
,
N
,
int64_t
)
{
int64_t
pre_idx
=
idx
/
(
stride
*
size
);
int64_t
dim_idx
=
idx
%
(
stride
*
size
)
/
stride
;
IndexT
src_dim_idx
=
index
[
dim_idx
];
int64_t
input_idx
=
idx
+
(
delta
*
pre_idx
+
src_dim_idx
-
dim_idx
)
*
stride
;
output
[
idx
]
=
input
[
input_idx
];
}
}
template
<
typename
T
,
typename
Context
>
void
IndexSelectKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
x
,
...
...
paddle/phi/kernels/index_add_grad_kernel.h
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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.
#pragma once
#include "paddle/phi/core/dense_tensor.h"
namespace
phi
{
template
<
typename
T
,
typename
Context
>
void
IndexAddGradKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
const
DenseTensor
&
out_grad
,
int
axis
,
DenseTensor
*
x_grad
,
DenseTensor
*
add_value_grad
);
}
// namespace phi
paddle/phi/kernels/index_add_kernel.h
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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.
#pragma once
#include "paddle/phi/core/dense_tensor.h"
namespace
phi
{
template
<
typename
T
,
typename
Context
>
void
IndexAddKernel
(
const
Context
&
ctx
,
const
DenseTensor
&
x
,
const
DenseTensor
&
index
,
const
DenseTensor
&
add_value
,
int
axis
,
DenseTensor
*
output
);
}
// namespace phi
paddle/phi/ops/compat/index_add_sig.cc
0 → 100644
浏览文件 @
45171911
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// 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/phi/core/compat/op_utils.h"
namespace
phi
{
KernelSignature
IndexAddOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
return
KernelSignature
(
"index_add"
,
{
"X"
,
"Index"
,
"AddValue"
},
{
"axis"
},
{
"Out"
});
}
KernelSignature
IndexAddGradOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
return
KernelSignature
(
"index_add_grad"
,
{
"Index"
,
"AddValue"
,
"Out@GRAD"
},
{
"axis"
},
{
"X@GRAD"
,
"AddValue@GRAD"
});
}
}
// namespace phi
PD_REGISTER_ARG_MAPPING_FN
(
index_add
,
phi
::
IndexAddOpArgumentMapping
);
PD_REGISTER_ARG_MAPPING_FN
(
index_add_grad
,
phi
::
IndexAddGradOpArgumentMapping
);
python/paddle/__init__.py
浏览文件 @
45171911
...
...
@@ -186,6 +186,8 @@ from .tensor.manipulation import as_complex # noqa: F401
from
.tensor.manipulation
import
as_real
# noqa: F401
from
.tensor.manipulation
import
moveaxis
# noqa: F401
from
.tensor.manipulation
import
repeat_interleave
# noqa: F401
from
.tensor.manipulation
import
index_add
# noqa: F401
from
.tensor.manipulation
import
index_add_
# noqa: F401
from
.tensor.math
import
abs
# noqa: F401
from
.tensor.math
import
acos
# noqa: F401
from
.tensor.math
import
asin
# noqa: F401
...
...
@@ -655,6 +657,8 @@ __all__ = [ # noqa
'put_along_axis'
,
'heaviside'
,
'tril_indices'
,
'index_add'
,
"index_add_"
,
'sgn'
,
'triu_indices'
,
'take'
,
...
...
python/paddle/fluid/tests/unittests/CMakeLists.txt
浏览文件 @
45171911
...
...
@@ -1149,6 +1149,7 @@ endif()
set_tests_properties
(
test_imperative_selected_rows_to_lod_tensor
PROPERTIES TIMEOUT 200
)
set_tests_properties
(
test_index_select_op PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_index_add_op PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_parallel_ssa_graph_inference_feed_partial_data
PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_parallel_executor_crf PROPERTIES TIMEOUT 120
)
...
...
python/paddle/fluid/tests/unittests/test_index_add_op.py
0 → 100644
浏览文件 @
45171911
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
from
__future__
import
print_function
import
unittest
import
paddle
import
numpy
as
np
import
paddle.fluid.core
as
core
from
op_test
import
OpTest
import
paddle.fluid
as
fluid
from
paddle.fluid
import
Program
,
program_guard
def
compute_index_add_ref
(
axis
,
x_shape
,
x_np
,
add_value_shape
,
add_value_np
,
index_size
,
index_np
):
if
axis
<
0
:
axis
=
axis
+
len
(
x_shape
)
if
axis
!=
0
:
outer_loop
=
np
.
prod
(
x_shape
[:
axis
]).
astype
(
int
)
x_reshape
=
[
outer_loop
]
+
list
(
x_shape
[
axis
:])
x_np_reshape
=
np
.
reshape
(
x_np
,
tuple
(
x_reshape
))
add_value_reshape
=
[
np
.
prod
(
add_value_shape
[:
axis
]).
astype
(
int
)
]
+
list
(
add_value_shape
[
axis
:])
add_value_np_reshape
=
np
.
reshape
(
add_value_np
,
tuple
(
add_value_reshape
))
else
:
x_np_reshape
=
x_np
add_value_np_reshape
=
add_value_np
out_np
=
x_np_reshape
.
copy
()
if
axis
!=
0
:
for
i
in
range
(
outer_loop
):
for
j
in
range
(
index_size
):
out_np
[
i
,
index_np
[
j
]]
+=
add_value_np_reshape
[
i
,
j
]
else
:
for
j
in
range
(
index_size
):
out_np
[
index_np
[
j
]]
+=
add_value_np_reshape
[
j
]
ref_out
=
np
.
reshape
(
out_np
,
x_shape
)
return
ref_out
def
raw_index_add
(
x
,
index
,
value
,
axis
):
return
paddle
.
index_add
(
x
,
index
,
axis
,
value
)
class
TestIndexAddOp
(
OpTest
):
def
setUp
(
self
):
self
.
python_api
=
raw_index_add
self
.
op_type
=
"index_add"
self
.
init_dtype_type
()
index_np
=
np
.
random
.
randint
(
low
=
0
,
high
=
self
.
x_shape
[
self
.
axis
],
size
=
self
.
index_size
)
x_np
=
np
.
random
.
random
(
self
.
x_shape
).
astype
(
self
.
x_type
)
add_value_np
=
np
.
random
.
random
(
self
.
add_value_shape
).
astype
(
self
.
x_type
)
self
.
inputs
=
{
'X'
:
x_np
,
'Index'
:
index_np
,
'AddValue'
:
add_value_np
}
self
.
attrs
=
{
'axis'
:
self
.
axis
}
out
=
compute_index_add_ref
(
self
.
axis
,
self
.
x_shape
,
x_np
,
self
.
add_value_shape
,
add_value_np
,
self
.
index_size
,
index_np
)
self
.
outputs
=
{
'Out'
:
out
}
def
init_dtype_type
(
self
):
self
.
axis
=
0
self
.
x_type
=
np
.
float64
self
.
index_type
=
np
.
int64
self
.
x_shape
=
(
101
,
3
)
self
.
index_size
=
3
self
.
add_value_shape
=
(
3
,
3
)
def
test_check_output
(
self
):
self
.
check_output
(
check_eager
=
True
,
atol
=
1e-2
)
def
test_check_grad_normal
(
self
):
self
.
check_grad
([
'X'
,
'AddValue'
],
'Out'
,
check_eager
=
True
)
class
TestIndexAddAPI
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
setType
()
self
.
setPlace
()
self
.
config
()
self
.
check_backward
=
True
self
.
generate_input_data
()
self
.
index_shape
=
tuple
([
self
.
index_size
])
self
.
rtol
=
1e-5
self
.
atol
=
1e-2
if
self
.
x_type
is
np
.
float16
:
self
.
atol
=
1e-1
def
setType
(
self
):
self
.
x_type
=
np
.
float32
self
.
index_type
=
np
.
int32
def
setPlace
(
self
):
self
.
place
=
[
'cpu'
]
if
paddle
.
is_compiled_with_cuda
():
self
.
place
.
append
(
'gpu'
)
def
config
(
self
):
self
.
axis
=
0
self
.
x_shape
=
(
100
,
5
)
self
.
index_size
=
20
self
.
add_value_shape
=
(
20
,
5
)
def
generate_input_data
(
self
):
axis
=
self
.
axis
if
self
.
axis
<
0
:
axis
=
self
.
axis
+
len
(
self
.
x_shape
)
self
.
x_np
=
np
.
random
.
random
(
self
.
x_shape
).
astype
(
self
.
x_type
)
self
.
add_value_np
=
np
.
random
.
random
(
self
.
add_value_shape
).
astype
(
self
.
x_type
)
self
.
index_np
=
np
.
random
.
randint
(
low
=
0
,
high
=
self
.
x_shape
[
axis
],
size
=
self
.
index_size
).
astype
(
self
.
index_type
)
if
self
.
check_backward
:
self
.
dout_np
=
np
.
random
.
random
(
self
.
x_shape
).
astype
(
self
.
x_type
)
def
compute_index_add_backward_ref
(
self
):
axis
=
self
.
axis
if
self
.
axis
<
0
:
axis
=
self
.
axis
+
len
(
self
.
x_shape
)
x_grad
=
self
.
dout_np
dout_tensor
=
paddle
.
to_tensor
(
self
.
dout_np
)
index
=
paddle
.
to_tensor
(
self
.
index_np
)
add_value_grad
=
paddle
.
index_select
(
dout_tensor
,
index
,
axis
)
return
x_grad
,
add_value_grad
.
numpy
()
def
run_imperative
(
self
,
device
):
paddle
.
device
.
set_device
(
device
)
input_tensor
=
paddle
.
to_tensor
(
self
.
x_np
,
stop_gradient
=
False
)
index
=
paddle
.
to_tensor
(
self
.
index_np
)
add_value
=
paddle
.
to_tensor
(
self
.
add_value_np
,
stop_gradient
=
False
)
out
=
paddle
.
index_add
(
input_tensor
,
index
,
self
.
axis
,
add_value
)
ref_out
=
compute_index_add_ref
(
self
.
axis
,
self
.
x_shape
,
self
.
x_np
,
self
.
add_value_shape
,
self
.
add_value_np
,
self
.
index_size
,
self
.
index_np
)
np
.
testing
.
assert_allclose
(
ref_out
,
out
.
numpy
(),
rtol
=
self
.
rtol
,
atol
=
self
.
atol
)
if
self
.
check_backward
:
dout_tensor
=
paddle
.
to_tensor
(
self
.
dout_np
)
paddle
.
autograd
.
backward
([
out
],
[
dout_tensor
],
retain_graph
=
True
)
ref_x_grad
,
ref_add_value_grad
=
self
.
compute_index_add_backward_ref
(
)
np
.
testing
.
assert_allclose
(
ref_x_grad
,
input_tensor
.
grad
.
numpy
(),
rtol
=
self
.
rtol
,
atol
=
self
.
atol
)
np
.
testing
.
assert_allclose
(
ref_add_value_grad
,
add_value
.
grad
.
numpy
(),
rtol
=
self
.
rtol
,
atol
=
self
.
atol
)
def
run_static
(
self
,
device
):
x
=
paddle
.
static
.
data
(
name
=
'X'
,
shape
=
self
.
x_shape
,
dtype
=
self
.
x_type
)
index
=
paddle
.
static
.
data
(
name
=
'Index'
,
shape
=
self
.
index_shape
,
dtype
=
self
.
index_type
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue'
,
shape
=
self
.
add_value_shape
,
dtype
=
self
.
x_type
)
out
=
paddle
.
index_add
(
x
,
index
,
self
.
axis
,
add_value
)
if
device
==
"cpu"
:
place
=
paddle
.
CPUPlace
()
elif
device
==
"gpu"
:
place
=
paddle
.
CUDAPlace
(
0
)
else
:
raise
TypeError
(
"paddle.index_add api only support cpu and gpu device now."
)
exe
=
paddle
.
static
.
Executor
(
place
)
exe
.
run
(
paddle
.
static
.
default_startup_program
())
res
=
exe
.
run
(
paddle
.
static
.
default_main_program
(),
feed
=
{
"X"
:
self
.
x_np
,
"Index"
:
self
.
index_np
,
"AddValue"
:
self
.
add_value_np
,
},
fetch_list
=
[
out
.
name
],
return_numpy
=
False
)
return
res
def
test_static
(
self
):
paddle
.
enable_static
()
for
device
in
self
.
place
:
with
paddle
.
static
.
program_guard
(
Program
()):
out
=
self
.
run_static
(
device
)
ref_out
=
compute_index_add_ref
(
self
.
axis
,
self
.
x_shape
,
self
.
x_np
,
self
.
add_value_shape
,
self
.
add_value_np
,
self
.
index_size
,
self
.
index_np
)
np
.
testing
.
assert_allclose
(
ref_out
,
np
.
array
(
out
[
0
]),
rtol
=
self
.
rtol
,
atol
=
self
.
atol
)
def
test_dynamic
(
self
):
paddle
.
disable_static
()
for
device
in
self
.
place
:
self
.
run_imperative
(
device
)
class
TestIndexAddAPIMoreType
(
TestIndexAddAPI
):
def
setType
(
self
):
self
.
x_type
=
np
.
float64
self
.
index_type
=
np
.
int64
class
TestIndexAddAPICase2
(
TestIndexAddAPI
):
def
config
(
self
):
self
.
axis
=
1
self
.
x_shape
=
(
100
,
100
,
5
)
self
.
index_size
=
20
self
.
add_value_shape
=
(
100
,
20
,
5
)
class
TestIndexAddAPICase3
(
TestIndexAddAPI
):
def
config
(
self
):
self
.
axis
=
2
self
.
x_shape
=
(
100
,
100
,
25
)
self
.
index_size
=
20
self
.
add_value_shape
=
(
100
,
100
,
20
)
class
TestIndexAddAPICase4
(
TestIndexAddAPI
):
def
config
(
self
):
self
.
axis
=
0
self
.
x_shape
=
(
10
,
)
self
.
index_size
=
4
self
.
add_value_shape
=
(
4
,
)
class
TestIndexAddAPICase5
(
TestIndexAddAPI
):
def
config
(
self
):
self
.
axis
=
-
1
self
.
x_shape
=
(
10
,
10
)
self
.
index_size
=
4
self
.
add_value_shape
=
(
10
,
4
)
class
TestIndexAddAPIError
(
unittest
.
TestCase
):
def
test_errors
(
self
):
paddle
.
enable_static
()
with
paddle
.
static
.
program_guard
(
paddle
.
static
.
Program
(),
paddle
.
static
.
Program
()):
def
test_add_value_shape
():
axis
=
0
x
=
paddle
.
static
.
data
(
name
=
'X'
,
shape
=
[
10
,
10
],
dtype
=
"float64"
)
index
=
paddle
.
static
.
data
(
name
=
'Index'
,
shape
=
[
4
],
dtype
=
"int32"
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue'
,
shape
=
[
4
,
3
],
dtype
=
"float64"
)
out
=
paddle
.
index_add
(
x
,
index
,
axis
,
add_value
)
self
.
assertRaises
(
ValueError
,
test_add_value_shape
)
def
test_index_dtype
():
axis
=
0
x
=
paddle
.
static
.
data
(
name
=
'X1'
,
shape
=
[
10
,
10
],
dtype
=
"float64"
)
index
=
paddle
.
static
.
data
(
name
=
'Index1'
,
shape
=
[
4
],
dtype
=
"float32"
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue1'
,
shape
=
[
4
,
10
],
dtype
=
"float64"
)
out
=
paddle
.
index_add
(
x
,
index
,
axis
,
add_value
)
self
.
assertRaises
(
TypeError
,
test_index_dtype
)
def
test_index_shape
():
axis
=
0
x
=
paddle
.
static
.
data
(
name
=
'X2'
,
shape
=
[
10
,
10
],
dtype
=
"float64"
)
index
=
paddle
.
static
.
data
(
name
=
'Index2'
,
shape
=
[
4
,
3
],
dtype
=
"int32"
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue2'
,
shape
=
[
4
,
10
],
dtype
=
"float64"
)
out
=
paddle
.
index_add
(
x
,
index
,
axis
,
add_value
)
self
.
assertRaises
(
ValueError
,
test_index_shape
)
def
test_axis_value
():
axis
=
3
x
=
paddle
.
static
.
data
(
name
=
'X3'
,
shape
=
[
10
,
10
],
dtype
=
"float64"
)
index
=
paddle
.
static
.
data
(
name
=
'Index3'
,
shape
=
[
4
],
dtype
=
"int32"
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue3'
,
shape
=
[
4
,
10
],
dtype
=
"float64"
)
out
=
paddle
.
index_add
(
x
,
index
,
axis
,
add_value
)
self
.
assertRaises
(
ValueError
,
test_axis_value
)
def
test_add_value_broadcast
():
axis
=
0
x
=
paddle
.
static
.
data
(
name
=
'X4'
,
shape
=
[
10
,
10
],
dtype
=
"float64"
)
index
=
paddle
.
static
.
data
(
name
=
'Index4'
,
shape
=
[
4
],
dtype
=
"int32"
)
add_value
=
paddle
.
static
.
data
(
name
=
'AddValue4'
,
shape
=
[
4
],
dtype
=
"float64"
)
out
=
paddle
.
index_add
(
x
,
index
,
axis
,
add_value
)
self
.
assertRaises
(
ValueError
,
test_add_value_broadcast
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/white_list/check_shape_white_list.py
浏览文件 @
45171911
...
...
@@ -13,20 +13,8 @@
# limitations under the License.
NEED_TO_FIX_OP_LIST
=
[
'fused_elemwise_activation'
,
'bilinear_tensor_product'
,
'conv2d_transpose'
,
'depthwise_conv2d_transpose'
,
'grid_sampler'
,
'lstmp'
,
'margin_rank_loss'
,
'matmul'
,
'scatter'
,
'soft_relu'
,
'squared_l2_distance'
,
'tree_conv'
,
'cvm'
,
'cudnn_lstm'
,
'rnn'
,
'multi_dot'
,
'fused_elemwise_activation'
,
'bilinear_tensor_product'
,
'conv2d_transpose'
,
'depthwise_conv2d_transpose'
,
'grid_sampler'
,
'lstmp'
,
'margin_rank_loss'
,
'matmul'
,
'scatter'
,
'soft_relu'
,
'squared_l2_distance'
,
'tree_conv'
,
'cvm'
,
'cudnn_lstm'
,
'rnn'
,
'multi_dot'
,
'index_add'
]
python/paddle/tensor/__init__.py
浏览文件 @
45171911
...
...
@@ -128,6 +128,8 @@ from .manipulation import put_along_axis_ # noqa: F401
from
.manipulation
import
as_real
# noqa: F401
from
.manipulation
import
moveaxis
# noqa: F401
from
.manipulation
import
repeat_interleave
# noqa: F401
from
.manipulation
import
index_add
# noqa: F401
from
.manipulation
import
index_add_
# noqa: F401
from
.math
import
abs
# noqa: F401
from
.math
import
acos
# noqa: F401
from
.math
import
asin
# noqa: F401
...
...
@@ -506,6 +508,8 @@ tensor_method_func = [ # noqa
'put_along_axis_'
,
'exponential_'
,
'heaviside'
,
'index_add'
,
"index_add_"
,
'take'
,
'bucketize'
,
'sgn'
,
...
...
python/paddle/tensor/manipulation.py
浏览文件 @
45171911
...
...
@@ -4386,6 +4386,120 @@ def put_along_axis_(arr, indices, values, axis, reduce='assign'):
"Reduce"
,
reduce
)
def
_index_add_params_check
(
x
,
index
,
input_axis
,
add_value
):
dims
=
len
(
x
.
shape
)
add_value_dims
=
len
(
add_value
.
shape
)
if
input_axis
>=
0
:
axis
=
input_axis
else
:
axis
=
input_axis
+
dims
check_axis
=
axis
if
check_axis
>=
dims
or
check_axis
<
-
dims
:
raise
ValueError
(
"Axis should be in range [-rank(x), rank(x))."
)
if
isinstance
(
index
,
Variable
):
if
index
.
dtype
not
in
[
paddle
.
int64
,
paddle
.
int32
]:
raise
TypeError
(
"The index dtype should be int32 or int64."
)
if
len
(
index
.
shape
)
!=
1
:
raise
ValueError
(
"The index should be a 1-D Tensor."
)
if
dims
!=
add_value_dims
:
raise
ValueError
(
"The add_value does not support broadcast now. It must have the same dimension as x."
)
for
i
in
range
(
dims
):
if
i
!=
axis
and
x
.
shape
[
i
]
!=
add_value
.
shape
[
i
]:
raise
ValueError
(
"The add_value.shape[i] should be equal to x.shape[i] when i != axis."
)
def
index_add
(
x
,
index
,
axis
,
value
,
name
=
None
):
"""
Adds the elements of the input tensor with value tensor by selecting the indices in the order given in index.
Args:
x (Tensor) : The Destination Tensor. Supported data types are int32, int64, float16, float32, float64.
index (Tensor): The 1-D Tensor containing the indices to index.
The data type of ``index`` must be int32 or int64.
axis (int): The dimension in which we index.
value (Tensor): The tensor used to add the elements along the target axis.
name(str, optional): For details, please refer to :ref:`api_guide_Name`. Generally, no setting is required. Default: None.
Returns:
Tensor: same dimention and dtype with x.
Examples:
.. code-block:: python
# required: gpu
import paddle
input_tensor = paddle.to_tensor(paddle.ones((3, 3)), dtype="float32")
index = paddle.to_tensor([0, 2], dtype="int32")
value = paddle.to_tensor([[1, 1, 1], [1, 1, 1]], dtype="float32")
outplace_res = paddle.index_add(input_tensor, index, 0, value)
print(outplace_res.numpy())
# [[2 2 2]
# [1 1 1]
# [2 2 2]]
"""
_index_add_params_check
(
x
,
index
,
axis
,
value
)
if
in_dygraph_mode
():
return
_C_ops
.
index_add
(
x
,
index
,
value
,
axis
)
helper
=
LayerHelper
(
"index_add"
,
**
locals
())
check_variable_and_dtype
(
x
,
'x'
,
[
'float16'
,
'float32'
,
'float64'
,
'int32'
,
'int64'
],
'paddle.tensor.manipulation.index_add'
)
check_variable_and_dtype
(
index
,
'index'
,
[
'int32'
,
'int64'
],
'paddle.tensor.manipulation.index_add'
)
check_variable_and_dtype
(
value
,
'add_value'
,
[
'float16'
,
'float32'
,
'float64'
,
'int32'
,
'int64'
],
'paddle.tensor.manipulation.index_add'
)
out
=
helper
.
create_variable_for_type_inference
(
x
.
dtype
)
helper
.
append_op
(
type
=
'index_add'
,
inputs
=
{
'X'
:
x
,
'Index'
:
index
,
'AddValue'
:
value
,
},
outputs
=
{
'Out'
:
out
},
attrs
=
{
'axis'
:
axis
})
return
out
@
inplace_apis_in_dygraph_only
def
index_add_
(
x
,
index
,
axis
,
value
,
name
=
None
):
"""
Inplace version of ``index_add`` API, the output Tensor will be inplaced with input ``x``.
Please refer to :ref:`api_paddle_tensor_index_add`.
Examples:
.. code-block:: python
# required: gpu
import paddle
input_tensor = paddle.to_tensor(paddle.ones((3, 3)), dtype="float32")
index = paddle.to_tensor([0, 2], dtype="int32")
value = paddle.to_tensor([[1, 1], [1, 1], [1, 1]], dtype="float32")
inplace_res = paddle.index_add_(input_tensor, index, 1, value)
print(inplace_res.numpy())
# [[2, 1, 2]
# [2, 1, 2]
# [2, 1, 2]]
"""
_index_add_params_check
(
x
,
index
,
axis
,
value
)
return
_C_ops
.
index_add_
(
x
,
index
,
value
,
axis
)
# TODO(dev): We need avoid implementing it by this way.
__METHODS
=
{
'fill_'
:
fill_
,
...
...
tools/parallel_UT_rule.py
浏览文件 @
45171911
...
...
@@ -845,7 +845,7 @@ FOURTH_HIGH_PARALLEL_JOB_NEW = [
'test_normalization_wrapper'
,
'test_flip'
,
'test_cosine_similarity_api'
,
'test_cumsum_op'
,
'test_range'
,
'test_log_loss_op'
,
'test_where_index'
,
'test_tril_triu_op'
,
'test_lod_reset_op'
,
'test_lod_tensor'
,
'test_addmm_op'
,
'test_index_select_op'
,
'test_nvprof'
,
'test_addmm_op'
,
'test_index_select_op'
,
'test_
index_add_op'
,
'test_
nvprof'
,
'test_index_sample_op'
,
'test_unstack_op'
,
'test_increment'
,
'strided_memcpy_test'
,
'test_target_assign_op'
,
'test_trt_dynamic_shape_transformer_prune'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录