Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
587120ec
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
587120ec
编写于
2月 27, 2023
作者:
A
Ainavo
提交者:
GitHub
2月 27, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[fp16] fix fp16 support for nn.PairwiseDistance (#50849)
上级
ebea0885
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
96 addition
and
5 deletion
+96
-5
python/paddle/fluid/tests/unittests/test_pairwise_distance.py
...on/paddle/fluid/tests/unittests/test_pairwise_distance.py
+91
-0
python/paddle/nn/functional/distance.py
python/paddle/nn/functional/distance.py
+4
-4
python/paddle/nn/layer/distance.py
python/paddle/nn/layer/distance.py
+1
-1
未找到文件。
python/paddle/fluid/tests/unittests/test_pairwise_distance.py
浏览文件 @
587120ec
...
@@ -286,6 +286,97 @@ class TestPairwiseDistance(unittest.TestCase):
...
@@ -286,6 +286,97 @@ class TestPairwiseDistance(unittest.TestCase):
dygraph_functional_ret
,
excepted_value
,
rtol
=
1e-05
dygraph_functional_ret
,
excepted_value
,
rtol
=
1e-05
)
)
def
test_pairwise_distance_fp16
(
self
):
epsilon
=
1e-6
all_shape
=
[[
5
],
[
100
,
100
]]
dtypes
=
[
'float16'
]
p_list
=
[
-
1
,
0
,
1
,
2
,
np
.
inf
,
-
np
.
inf
]
places
=
[
paddle
.
CPUPlace
()]
if
paddle
.
device
.
is_compiled_with_cuda
():
places
.
append
(
paddle
.
CUDAPlace
(
0
))
keeps
=
[
False
,
True
]
for
place
in
places
:
for
shape
in
all_shape
:
for
dtype
in
dtypes
:
for
p
in
p_list
:
for
keepdim
in
keeps
:
x_np
=
np
.
random
.
random
(
shape
).
astype
(
dtype
)
y_np
=
np
.
random
.
random
(
shape
).
astype
(
dtype
)
# Currently, the CPU does not support float16
if
dtype
==
"float16"
and
isinstance
(
place
,
paddle
.
CPUPlace
):
continue
static_ret
=
test_static
(
place
,
x_np
,
y_np
,
p
,
epsilon
=
epsilon
,
keepdim
=
keepdim
,
)
dygraph_ret
=
test_dygraph
(
place
,
x_np
,
y_np
,
p
,
epsilon
=
epsilon
,
keepdim
=
keepdim
,
)
excepted_value
=
np_pairwise_distance
(
x_np
,
y_np
,
p
,
epsilon
=
epsilon
,
keepdim
=
keepdim
)
self
.
assertEqual
(
static_ret
.
shape
,
excepted_value
.
shape
)
self
.
assertEqual
(
dygraph_ret
.
shape
,
excepted_value
.
shape
)
np
.
testing
.
assert_allclose
(
static_ret
,
excepted_value
,
atol
=
1e-03
)
np
.
testing
.
assert_allclose
(
dygraph_ret
,
excepted_value
,
atol
=
1e-03
)
static_functional_ret
=
test_static
(
place
,
x_np
,
y_np
,
p
,
epsilon
=
epsilon
,
keepdim
=
keepdim
,
)
dygraph_functional_ret
=
test_dygraph
(
place
,
x_np
,
y_np
,
p
,
epsilon
=
epsilon
,
keepdim
=
keepdim
,
)
self
.
assertEqual
(
static_functional_ret
.
shape
,
excepted_value
.
shape
,
)
self
.
assertEqual
(
dygraph_functional_ret
.
shape
,
excepted_value
.
shape
,
)
np
.
testing
.
assert_allclose
(
static_functional_ret
,
excepted_value
,
atol
=
1e-03
,
)
np
.
testing
.
assert_allclose
(
dygraph_functional_ret
,
excepted_value
,
atol
=
1e-03
,
)
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
unittest
.
main
()
unittest
.
main
()
python/paddle/nn/functional/distance.py
浏览文件 @
587120ec
...
@@ -35,10 +35,10 @@ def pairwise_distance(x, y, p=2.0, epsilon=1e-6, keepdim=False, name=None):
...
@@ -35,10 +35,10 @@ def pairwise_distance(x, y, p=2.0, epsilon=1e-6, keepdim=False, name=None):
Parameters:
Parameters:
x (Tensor): Tensor, shape is :math:`[N, D]` or :math:`[D]`, where :math:`N`
x (Tensor): Tensor, shape is :math:`[N, D]` or :math:`[D]`, where :math:`N`
is batch size, :math:`D` is the dimension of vector. Available dtype is
is batch size, :math:`D` is the dimension of vector. Available dtype is
float32, float64.
float
16, float
32, float64.
y (Tensor): Tensor, shape is :math:`[N, D]` or :math:`[D]`, where :math:`N`
y (Tensor): Tensor, shape is :math:`[N, D]` or :math:`[D]`, where :math:`N`
is batch size, :math:`D` is the dimension of vector. Available dtype is
is batch size, :math:`D` is the dimension of vector. Available dtype is
float32, float64.
float
16, float
32, float64.
p (float, optional): The order of norm. Default: :math:`2.0`.
p (float, optional): The order of norm. Default: :math:`2.0`.
epsilon (float, optional): Add small value to avoid division by zero.
epsilon (float, optional): Add small value to avoid division by zero.
Default: :math:`1e-6`.
Default: :math:`1e-6`.
...
@@ -84,10 +84,10 @@ def pairwise_distance(x, y, p=2.0, epsilon=1e-6, keepdim=False, name=None):
...
@@ -84,10 +84,10 @@ def pairwise_distance(x, y, p=2.0, epsilon=1e-6, keepdim=False, name=None):
check_type
(
keepdim
,
'keepdim'
,
(
bool
),
'PairwiseDistance'
)
check_type
(
keepdim
,
'keepdim'
,
(
bool
),
'PairwiseDistance'
)
check_variable_and_dtype
(
check_variable_and_dtype
(
x
,
'x'
,
[
'float32'
,
'float64'
],
'PairwiseDistance'
x
,
'x'
,
[
'float
16'
,
'float
32'
,
'float64'
],
'PairwiseDistance'
)
)
check_variable_and_dtype
(
check_variable_and_dtype
(
y
,
'y'
,
[
'float32'
,
'float64'
],
'PairwiseDistance'
y
,
'y'
,
[
'float
16'
,
'float
32'
,
'float64'
],
'PairwiseDistance'
)
)
sub
=
paddle
.
subtract
(
x
,
y
)
sub
=
paddle
.
subtract
(
x
,
y
)
if
epsilon
!=
0.0
:
if
epsilon
!=
0.0
:
...
...
python/paddle/nn/layer/distance.py
浏览文件 @
587120ec
...
@@ -40,7 +40,7 @@ class PairwiseDistance(Layer):
...
@@ -40,7 +40,7 @@ class PairwiseDistance(Layer):
Shape:
Shape:
- x: :math:`[N, D]` or :math:`[D]`, where :math:`N` is batch size, :math:`D`
- x: :math:`[N, D]` or :math:`[D]`, where :math:`N` is batch size, :math:`D`
is the dimension of the data. Available data type is float32, float64.
is the dimension of the data. Available data type is float
16, float
32, float64.
- y: :math:`[N, D]` or :math:`[D]`, y have the same dtype as x.
- y: :math:`[N, D]` or :math:`[D]`, y have the same dtype as x.
- output: The same dtype as input tensor.
- output: The same dtype as input tensor.
- If :attr:`keepdim` is True, the output shape is :math:`[N, 1]` or :math:`[1]`,
- If :attr:`keepdim` is True, the output shape is :math:`[N, 1]` or :math:`[1]`,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录