Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
ac2e2e6b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
未验证
提交
ac2e2e6b
编写于
2月 03, 2021
作者:
C
cucuzg
提交者:
GitHub
2月 03, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add clip_by_norm on kunlun, *test=kunlun (#30862)
上级
30242717
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
152 addition
and
1 deletion
+152
-1
cmake/external/xpu.cmake
cmake/external/xpu.cmake
+1
-1
paddle/fluid/operators/clip_by_norm_op_xpu.cc
paddle/fluid/operators/clip_by_norm_op_xpu.cc
+74
-0
python/paddle/fluid/tests/unittests/xpu/test_clip_by_norm_op_xpu.py
...dle/fluid/tests/unittests/xpu/test_clip_by_norm_op_xpu.py
+77
-0
未找到文件。
cmake/external/xpu.cmake
浏览文件 @
ac2e2e6b
...
...
@@ -11,7 +11,7 @@ if(NOT XPU_SDK_ROOT)
elseif
(
WITH_SUNWAY
)
SET
(
XPU_URL
"https://baidu-kunlun-public.su.bcebos.com/paddle_depence/sunway/xpu_2021_01_13.tar.gz"
CACHE STRING
""
FORCE
)
else
()
SET
(
XPU_URL
"https://baidu-kunlun-public.su.bcebos.com/paddle_depence/xpu_2021_0
1_1
3.tar.gz"
CACHE STRING
""
FORCE
)
SET
(
XPU_URL
"https://baidu-kunlun-public.su.bcebos.com/paddle_depence/xpu_2021_0
2_0
3.tar.gz"
CACHE STRING
""
FORCE
)
endif
()
SET
(
XPU_SOURCE_DIR
"
${
THIRD_PARTY_PATH
}
/xpu"
)
...
...
paddle/fluid/operators/clip_by_norm_op_xpu.cc
0 → 100644
浏览文件 @
ac2e2e6b
/* Copyright (c) 2016 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_XPU
#include "paddle/fluid/operators/clip_by_norm_op.h"
#include <vector>
namespace
paddle
{
namespace
operators
{
template
<
typename
DeviceContext
,
typename
T
>
class
XPUClipByNormKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
max_norm
=
context
.
Attr
<
T
>
(
"max_norm"
);
auto
in_var
=
context
.
InputVar
(
"X"
);
Tensor
*
output
=
nullptr
;
const
Tensor
*
input
=
nullptr
;
if
(
in_var
->
IsType
<
framework
::
LoDTensor
>
())
{
input
=
context
.
Input
<
Tensor
>
(
"X"
);
output
=
context
.
Output
<
Tensor
>
(
"Out"
);
output
->
mutable_data
<
T
>
(
context
.
GetPlace
());
}
else
{
PADDLE_THROW
(
platform
::
errors
::
InvalidArgument
(
"Invalid input variable type, only support LodTensor"
"type, but got type is %s."
,
framework
::
ToTypeName
(
in_var
->
Type
())));
}
PADDLE_ENFORCE_NOT_NULL
(
input
,
platform
::
errors
::
InvalidArgument
(
"Input(X) of ClipByNormOp should not be null. "
"Please check if it is created correctly."
));
auto
&
dev_ctx
=
context
.
template
device_context
<
DeviceContext
>();
const
auto
&
x_dims
=
input
->
dims
();
std
::
vector
<
int
>
xshape
(
x_dims
.
size
());
std
::
vector
<
int
>
rdims
(
x_dims
.
size
());
for
(
int
i
=
0
;
i
<
x_dims
.
size
();
i
++
)
{
xshape
[
i
]
=
x_dims
[
i
];
rdims
[
i
]
=
i
;
}
int
r
=
xpu
::
clip_by_norm
<
T
>
(
dev_ctx
.
x_context
(),
input
->
data
<
T
>
(),
output
->
data
<
T
>
(),
max_norm
,
xshape
,
rdims
);
PADDLE_ENFORCE_EQ
(
r
,
XPU_SUCCESS
,
platform
::
errors
::
External
(
"XPU API(clip_by_norm) return "
"wrong value[%d], please check whether "
"Baidu Kunlun Card is properly installed."
,
r
));
}
};
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_XPU_KERNEL
(
clip_by_norm
,
ops
::
XPUClipByNormKernel
<
paddle
::
platform
::
XPUDeviceContext
,
float
>
);
#endif // PADDLE_WITH_XPU
python/paddle/fluid/tests/unittests/xpu/test_clip_by_norm_op_xpu.py
0 → 100644
浏览文件 @
ac2e2e6b
# Copyright (c) 2020 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
sys
sys
.
path
.
append
(
".."
)
import
unittest
import
numpy
as
np
import
paddle.fluid.core
as
core
import
paddle.fluid
as
fluid
from
op_test_xpu
import
OpTest
,
XPUOpTest
import
paddle
from
paddle.fluid
import
Program
,
program_guard
class
TestXPUClipByNormOp
(
XPUOpTest
):
def
setUp
(
self
):
self
.
op_type
=
"clip_by_norm"
self
.
dtype
=
np
.
float32
self
.
use_xpu
=
True
self
.
max_relative_error
=
0.006
self
.
initTestCase
()
input
=
np
.
random
.
random
(
self
.
shape
).
astype
(
"float32"
)
input
[
np
.
abs
(
input
)
<
self
.
max_relative_error
]
=
0.5
self
.
inputs
=
{
'X'
:
input
,
}
self
.
attrs
=
{}
self
.
attrs
[
'max_norm'
]
=
self
.
max_norm
norm
=
np
.
sqrt
(
np
.
sum
(
np
.
square
(
input
)))
if
norm
>
self
.
max_norm
:
output
=
self
.
max_norm
*
input
/
norm
else
:
output
=
input
self
.
outputs
=
{
'Out'
:
output
}
def
test_check_output
(
self
):
if
paddle
.
is_compiled_with_xpu
():
paddle
.
enable_static
()
place
=
paddle
.
XPUPlace
(
0
)
self
.
check_output_with_place
(
place
)
def
initTestCase
(
self
):
self
.
shape
=
(
100
,
)
self
.
max_norm
=
1.0
class
TestCase1
(
TestXPUClipByNormOp
):
def
initTestCase
(
self
):
self
.
shape
=
(
100
,
)
self
.
max_norm
=
1e20
class
TestCase2
(
TestXPUClipByNormOp
):
def
initTestCase
(
self
):
self
.
shape
=
(
16
,
16
)
self
.
max_norm
=
0.1
class
TestCase3
(
TestXPUClipByNormOp
):
def
initTestCase
(
self
):
self
.
shape
=
(
4
,
8
,
16
)
self
.
max_norm
=
1.0
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录