Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
1e1a4b9b
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
1e1a4b9b
编写于
7月 20, 2022
作者:
F
fuyou765
提交者:
GitHub
7月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[MLU] set_value performance optimizing (#44390)
上级
41f11d29
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
69 addition
and
42 deletion
+69
-42
paddle/fluid/operators/set_value_op_mlu.cc
paddle/fluid/operators/set_value_op_mlu.cc
+55
-42
python/paddle/fluid/tests/unittests/mlu/test_set_value_op_mlu.py
...paddle/fluid/tests/unittests/mlu/test_set_value_op_mlu.py
+14
-0
未找到文件。
paddle/fluid/operators/set_value_op_mlu.cc
浏览文件 @
1e1a4b9b
...
...
@@ -12,6 +12,7 @@ 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 <numeric>
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/mlu/mlu_baseop.h"
#include "paddle/fluid/operators/set_value_op.h"
...
...
@@ -62,7 +63,6 @@ class SetValueMLUKernel : public framework::OpKernel<T> {
auto
slice_dims_for_assign
=
decrease_slice_dims
;
if
(
!
none_axes
.
empty
())
{
std
::
vector
<
int64_t
>
slice_dims_with_none
;
size_t
none_axes_cur
=
0
,
decrease_axes_cur
=
0
;
for
(
int
i
=
0
;
i
<
slice_dims
.
size
();
++
i
)
{
while
(
none_axes_cur
<
none_axes
.
size
()
&&
...
...
@@ -84,51 +84,22 @@ class SetValueMLUKernel : public framework::OpKernel<T> {
slice_dims_for_assign
=
phi
::
make_ddim
(
slice_dims_with_none
);
}
auto
starts_indices
=
std
::
vector
<
int64_t
>
(
in_dims
.
size
(),
0
)
;
auto
ends_indices
=
std
::
vector
<
int64_t
>
(
in_dims
.
size
(),
0
)
;
auto
strides_indices
=
std
::
vector
<
int64_t
>
(
in_dims
.
size
(),
0
)
;
int
in_size
=
in_dims
.
size
();
int
starts_indices
[
in_size
]
=
{
0
}
;
int
ends_indices
[
in_size
]
=
{
0
}
;
int
strides_indices
[
in_size
]
=
{
0
}
;
for
(
int
i
=
0
;
i
<
in_dims
.
size
();
++
i
)
{
starts_indices
[
i
]
=
0
;
ends_indices
[
i
]
=
s
lice_dims
[
i
]
;
ends_indices
[
i
]
=
s
tatic_cast
<
int
>
(
slice_dims
[
i
])
;
strides_indices
[
i
]
=
1
;
}
for
(
size_t
i
=
0
;
i
<
axes
.
size
();
i
++
)
{
int
axis_index
=
axes
[
i
];
starts_indices
[
axis_index
]
=
starts
[
i
];
ends_indices
[
axis_index
]
=
ends
[
i
];
strides_indices
[
axis_index
]
=
steps
[
i
];
}
int64_t
stride_step
=
phi
::
product
(
in_dims
);
std
::
vector
<
int64_t
>
index_indices
(
1
,
0
);
for
(
size_t
i
=
0
;
i
<
strides_indices
.
size
();
++
i
)
{
auto
index_size
=
index_indices
.
size
();
stride_step
/=
in_dims
[
i
];
for
(
size_t
j
=
0
;
j
<
index_size
;
++
j
)
{
auto
start_index
=
*
index_indices
.
begin
();
if
(
strides_indices
[
i
]
>
0
)
{
for
(
int64_t
k
=
starts_indices
[
i
];
k
<
ends_indices
[
i
];
k
+=
strides_indices
[
i
])
{
index_indices
.
push_back
(
start_index
+
k
*
stride_step
);
}
}
else
{
for
(
int64_t
k
=
starts_indices
[
i
];
k
>
ends_indices
[
i
];
k
+=
strides_indices
[
i
])
{
index_indices
.
push_back
(
start_index
+
k
*
stride_step
);
starts_indices
[
axis_index
]
=
static_cast
<
int
>
(
starts
[
i
]);
ends_indices
[
axis_index
]
=
static_cast
<
int
>
(
ends
[
i
]);
strides_indices
[
axis_index
]
=
static_cast
<
int
>
(
steps
[
i
]);
}
}
index_indices
.
erase
(
index_indices
.
begin
());
}
}
PADDLE_ENFORCE_EQ
(
static_cast
<
int64_t
>
(
index_indices
.
size
()),
phi
::
product
(
slice_dims_for_assign
),
platform
::
errors
::
InvalidArgument
(
"OP(set_value) error index indices and value update not match "
));
Tensor
value_t
(
in
->
type
());
if
(
value_tensor
!=
nullptr
)
{
value_t
.
ShareDataWith
(
*
value_tensor
);
...
...
@@ -160,29 +131,71 @@ class SetValueMLUKernel : public framework::OpKernel<T> {
int64_t
input_numel
=
phi
::
product
(
in_dims
);
int64_t
value_numel
=
phi
::
product
(
value_temp
.
dims
());
Tensor
in_temp
,
out_temp
,
val_temp
;
Tensor
in_temp
,
out_temp
,
val_temp
,
index_out
;
int64_t
stride_step
=
phi
::
product
(
in_dims
);
std
::
vector
<
int64_t
>
index_indices
(
stride_step
);
std
::
iota
(
index_indices
.
begin
(),
index_indices
.
end
(),
0
);
framework
::
Tensor
index_temp
;
in_temp
.
ShareDataWith
(
*
in
);
val_temp
.
ShareDataWith
(
value_temp
);
paddle
::
framework
::
TensorFromVector
(
index_indices
,
ctx
.
device_context
(),
&
index_temp
);
index_temp
.
Resize
(
in_dims
);
auto
index_dims
=
in_dims
;
for
(
int
i
=
0
;
i
<
in_dims
.
size
();
++
i
)
{
if
(
starts_indices
[
i
]
<
0
||
ends_indices
[
i
]
<
0
)
{
starts_indices
[
i
]
-=
in_dims
[
i
];
ends_indices
[
i
]
-=
in_dims
[
i
];
}
if
(
strides_indices
[
i
]
>
0
)
index_dims
[
i
]
=
static_cast
<
int
>
((
ends_indices
[
i
]
-
starts_indices
[
i
]
-
1
)
/
strides_indices
[
i
])
+
1
;
else
index_dims
[
i
]
=
static_cast
<
int
>
((
ends_indices
[
i
]
-
starts_indices
[
i
]
+
1
)
/
strides_indices
[
i
])
+
1
;
}
auto
new_in_dims
=
phi
::
make_ddim
({
input_numel
});
auto
new_val_dims
=
phi
::
make_ddim
({
value_numel
});
in_temp
.
Resize
(
new_in_dims
);
val_temp
.
Resize
(
new_val_dims
);
index_out
.
Resize
(
index_dims
);
index_out
.
mutable_data
<
int64_t
>
(
ctx
.
GetPlace
());
cnnlScatterRefMode_t
mode
=
CNNL_SCATTERREF_UPDATE
;
MLUCnnlTensorDesc
x_desc
(
in_temp
);
MLUCnnlTensorDesc
indices_desc
(
index_temp
);
MLUCnnlTensorDesc
indices_out_desc
(
index_out
);
MLUCnnlTensorDesc
updates_desc
(
val_temp
);
MLUCnnlTensorDesc
out_desc
(
*
out
);
MLUCnnl
::
StridedSlice
(
ctx
,
starts_indices
,
ends_indices
,
strides_indices
,
indices_desc
.
get
(),
GetBasePtr
(
&
index_temp
),
indices_out_desc
.
get
(),
GetBasePtr
(
&
index_out
));
PADDLE_ENFORCE_EQ
(
static_cast
<
int64_t
>
(
phi
::
product
(
index_out
.
dims
())),
phi
::
product
(
slice_dims_for_assign
),
platform
::
errors
::
InvalidArgument
(
"OP(set_value) error index indices and value update not match "
));
Tensor
index_final
;
index_final
.
ShareDataWith
(
index_out
);
int64_t
indices_numel
=
phi
::
product
(
index_dims
);
auto
new_index_dims
=
phi
::
make_ddim
({
indices_numel
});
index_final
.
Resize
(
new_index_dims
);
MLUCnnlTensorDesc
indices_final_desc
(
index_final
);
MLUCnnl
::
ScatterRefFunctor
(
ctx
,
x_desc
.
get
(),
GetBasePtr
(
&
in_temp
),
updates_desc
.
get
(),
GetBasePtr
(
&
val_temp
),
indices_desc
.
get
(),
GetBasePtr
(
&
index_
temp
),
indices_
final_
desc
.
get
(),
GetBasePtr
(
&
index_
final
),
mode
);
in_temp
.
Resize
(
in_dims
);
paddle
::
framework
::
TensorCopy
(
in_temp
,
ctx
.
GetPlace
(),
out
);
...
...
python/paddle/fluid/tests/unittests/mlu/test_set_value_op_mlu.py
浏览文件 @
1e1a4b9b
...
...
@@ -127,6 +127,18 @@ class TestSetValueItemSlice4(TestSetValueApi):
self
.
data
[
0
:,
1
:
2
,
:]
=
self
.
value
class
TestSetValueItemSlice5
(
TestSetValueApi
):
def
set_shape
(
self
):
self
.
shape
=
[
100
,
426
,
640
]
def
_call_setitem
(
self
,
x
):
x
[
0
:
-
1
]
=
self
.
value
def
_get_answer
(
self
):
self
.
data
[
0
:
-
1
]
=
self
.
value
#TODO: Fix this after MLU support while_loop
#class TestSetValueItemSliceInWhile(TestSetValueApi):
# def _call_setitem(self, x):
...
...
@@ -517,6 +529,7 @@ create_test_value_int32(TestSetValueItemSlice)
create_test_value_int32
(
TestSetValueItemSlice2
)
create_test_value_int32
(
TestSetValueItemSlice3
)
create_test_value_int32
(
TestSetValueItemSlice4
)
create_test_value_int32
(
TestSetValueItemSlice5
)
def
create_test_value_tensor_fp32
(
parent
):
...
...
@@ -543,6 +556,7 @@ create_test_value_tensor_fp32(TestSetValueItemSlice)
create_test_value_tensor_fp32
(
TestSetValueItemSlice2
)
create_test_value_tensor_fp32
(
TestSetValueItemSlice3
)
create_test_value_tensor_fp32
(
TestSetValueItemSlice4
)
create_test_value_tensor_fp32
(
TestSetValueItemSlice5
)
# 3. Test different shape of value
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录