Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
388c69f2
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看板
未验证
提交
388c69f2
编写于
3月 08, 2021
作者:
R
Reventon_L
提交者:
GitHub
3月 08, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[NPU] squeeze and unsqueeze op for ascend (#31452)
Co-authored-by:
N
root
<
xiayanming@baidu.com
>
上级
c956c035
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
273 addition
and
0 deletion
+273
-0
paddle/fluid/operators/squeeze_op_npu.cc
paddle/fluid/operators/squeeze_op_npu.cc
+45
-0
paddle/fluid/operators/squeeze_op_npu_test.cc
paddle/fluid/operators/squeeze_op_npu_test.cc
+92
-0
paddle/fluid/operators/unsqueeze_op_npu.cc
paddle/fluid/operators/unsqueeze_op_npu.cc
+44
-0
paddle/fluid/operators/unsqueeze_op_npu_test.cc
paddle/fluid/operators/unsqueeze_op_npu_test.cc
+92
-0
未找到文件。
paddle/fluid/operators/squeeze_op_npu.cc
0 → 100644
浏览文件 @
388c69f2
/* Copyright (c) 2021 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. */
#ifdef PADDLE_WITH_ASCEND_CL
#include <memory>
#include <string>
#include "paddle/fluid/operators/squeeze_op.h"
#include "paddle/fluid/operators/npu_op_runner.h"
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_NPU_KERNEL
(
squeeze
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
float
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
double
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
plat
::
float16
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
bool
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
uint8_t
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int8_t
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int64_t
>
);
REGISTER_OP_NPU_KERNEL
(
squeeze2
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
float
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
double
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
plat
::
float16
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
bool
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
uint8_t
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int8_t
>
,
ops
::
SqueezeKernel
<
plat
::
NPUDeviceContext
,
int64_t
>
);
#endif
paddle/fluid/operators/squeeze_op_npu_test.cc
0 → 100644
浏览文件 @
388c69f2
/* Copyright (c) 2021 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. */
#ifndef _WIN32
#include <unistd.h>
#endif
#include <string>
#include <thread> // NOLINT
#include <vector>
#include "gtest/gtest.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/operators/dropout_op.h"
#include "paddle/fluid/operators/math/math_function.h"
#include "paddle/fluid/string/printf.h"
namespace
f
=
paddle
::
framework
;
namespace
p
=
paddle
::
platform
;
namespace
m
=
paddle
::
operators
::
math
;
USE_OP
(
squeeze
);
USE_OP_DEVICE_KERNEL
(
squeeze
,
NPU
);
template
<
typename
T
>
void
Compare
(
f
::
Scope
*
scope
,
const
p
::
DeviceContext
&
ctx
)
{
// init
auto
x
=
scope
->
Var
(
"X"
);
auto
tensor_x
=
x
->
GetMutable
<
f
::
LoDTensor
>
();
int
dim0
=
1
;
int
dim1
=
10
;
int
dim2
=
1
;
std
::
vector
<
T
>
init
;
for
(
int64_t
i
=
0
;
i
<
dim0
*
dim1
*
dim2
;
++
i
)
{
init
.
push_back
(
static_cast
<
T
>
(
0.1
));
}
TensorFromVector
(
init
,
ctx
,
tensor_x
);
tensor_x
->
Resize
({
dim0
,
dim1
,
dim2
});
ctx
.
Wait
();
// run
auto
place
=
ctx
.
GetPlace
();
auto
out
=
scope
->
Var
(
"Out"
);
auto
tensor_out
=
out
->
GetMutable
<
f
::
LoDTensor
>
();
std
::
vector
<
int
>
axis
;
axis
.
push_back
(
2
);
f
::
AttributeMap
attrs
=
{{
"axes"
,
axis
}};
auto
op
=
f
::
OpRegistry
::
CreateOp
(
"squeeze"
,
{{
"X"
,
{
"X"
}}},
{{
"Out"
,
{
"Out"
}}},
attrs
);
op
->
Run
(
*
scope
,
place
);
ctx
.
Wait
();
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
().
size
(),
uint32_t
(
2
));
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
()[
0
],
uint32_t
(
dim0
));
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
()[
1
],
uint32_t
(
dim1
));
std
::
vector
<
T
>
out_vec
;
TensorToVector
(
*
tensor_out
,
ctx
,
&
out_vec
);
for
(
uint32_t
i
=
0
;
i
<
out_vec
.
size
();
i
++
)
{
EXPECT_EQ
(
out_vec
[
i
],
static_cast
<
T
>
(
0.1
));
}
ctx
.
Wait
();
}
TEST
(
squeeze
,
NPU_fp32
)
{
f
::
Scope
scope
;
p
::
NPUDeviceContext
ctx
(
p
::
NPUPlace
(
0
));
Compare
<
float
>
(
&
scope
,
ctx
);
}
paddle/fluid/operators/unsqueeze_op_npu.cc
0 → 100644
浏览文件 @
388c69f2
/* Copyright (c) 2021 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. */
#ifdef PADDLE_WITH_ASCEND_CL
#include <memory>
#include <string>
#include "paddle/fluid/operators/unsqueeze_op.h"
#include "paddle/fluid/operators/npu_op_runner.h"
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_NPU_KERNEL
(
unsqueeze
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
float
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
double
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
plat
::
float16
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
bool
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int8_t
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int64_t
>
);
REGISTER_OP_NPU_KERNEL
(
unsqueeze2
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
float
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
double
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
plat
::
float16
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
bool
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int8_t
>
,
ops
::
UnsqueezeKernel
<
plat
::
NPUDeviceContext
,
int64_t
>
);
#endif
paddle/fluid/operators/unsqueeze_op_npu_test.cc
0 → 100644
浏览文件 @
388c69f2
/* Copyright (c) 2021 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. */
#ifndef _WIN32
#include <unistd.h>
#endif
#include <string>
#include <thread> // NOLINT
#include <vector>
#include "gtest/gtest.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/operators/dropout_op.h"
#include "paddle/fluid/operators/math/math_function.h"
#include "paddle/fluid/string/printf.h"
namespace
f
=
paddle
::
framework
;
namespace
p
=
paddle
::
platform
;
namespace
m
=
paddle
::
operators
::
math
;
USE_OP
(
unsqueeze
);
USE_OP_DEVICE_KERNEL
(
unsqueeze
,
NPU
);
template
<
typename
T
>
void
Compare
(
f
::
Scope
*
scope
,
const
p
::
DeviceContext
&
ctx
)
{
// init
auto
x
=
scope
->
Var
(
"X"
);
auto
tensor_x
=
x
->
GetMutable
<
f
::
LoDTensor
>
();
int
dim0
=
5
;
int
dim1
=
10
;
std
::
vector
<
T
>
init
;
for
(
int64_t
i
=
0
;
i
<
dim0
*
dim1
;
++
i
)
{
init
.
push_back
(
static_cast
<
T
>
(
0.1
));
}
TensorFromVector
(
init
,
ctx
,
tensor_x
);
tensor_x
->
Resize
({
dim0
,
dim1
});
ctx
.
Wait
();
// run
auto
place
=
ctx
.
GetPlace
();
auto
out
=
scope
->
Var
(
"Out"
);
auto
tensor_out
=
out
->
GetMutable
<
f
::
LoDTensor
>
();
std
::
vector
<
int
>
axis
;
axis
.
push_back
(
1
);
f
::
AttributeMap
attrs
=
{{
"axes"
,
axis
}};
auto
op
=
f
::
OpRegistry
::
CreateOp
(
"unsqueeze"
,
{{
"X"
,
{
"X"
}}},
{{
"Out"
,
{
"Out"
}}},
attrs
);
op
->
Run
(
*
scope
,
place
);
ctx
.
Wait
();
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
().
size
(),
uint32_t
(
3
));
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
()[
0
],
uint32_t
(
5
));
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
()[
1
],
uint32_t
(
1
));
EXPECT_EQ
((
uint32_t
)
tensor_out
->
dims
()[
2
],
uint32_t
(
10
));
std
::
vector
<
T
>
out_vec
;
TensorToVector
(
*
tensor_out
,
ctx
,
&
out_vec
);
for
(
uint32_t
i
=
0
;
i
<
out_vec
.
size
();
i
++
)
{
EXPECT_EQ
(
out_vec
[
i
],
static_cast
<
T
>
(
0.1
));
}
ctx
.
Wait
();
}
TEST
(
unsqueeze
,
NPU_fp32
)
{
f
::
Scope
scope
;
p
::
NPUDeviceContext
ctx
(
p
::
NPUPlace
(
0
));
Compare
<
float
>
(
&
scope
,
ctx
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录