Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
94e8fc78
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看板
未验证
提交
94e8fc78
编写于
4月 21, 2023
作者:
zhouweiwei2014
提交者:
GitHub
4月 21, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[frl_train_eval] add bfloat16 dtype support of to_tensor,due to numpy not support bfloat16 (#53153)
上级
c47853f6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
63 addition
and
8 deletion
+63
-8
paddle/phi/kernels/cpu/compare_kernel.cc
paddle/phi/kernels/cpu/compare_kernel.cc
+12
-6
python/paddle/fluid/data_feeder.py
python/paddle/fluid/data_feeder.py
+25
-1
python/paddle/fluid/tests/unittests/test_var_base.py
python/paddle/fluid/tests/unittests/test_var_base.py
+20
-0
python/paddle/tensor/creation.py
python/paddle/tensor/creation.py
+6
-1
未找到文件。
paddle/phi/kernels/cpu/compare_kernel.cc
浏览文件 @
94e8fc78
...
...
@@ -81,7 +81,8 @@ PD_REGISTER_KERNEL(less_than,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
less_equal
,
CPU
,
ALL_LAYOUT
,
...
...
@@ -92,7 +93,8 @@ PD_REGISTER_KERNEL(less_equal,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
greater_than
,
CPU
,
ALL_LAYOUT
,
...
...
@@ -103,7 +105,8 @@ PD_REGISTER_KERNEL(greater_than,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
greater_equal
,
CPU
,
ALL_LAYOUT
,
...
...
@@ -114,7 +117,8 @@ PD_REGISTER_KERNEL(greater_equal,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
equal
,
CPU
,
ALL_LAYOUT
,
...
...
@@ -125,7 +129,8 @@ PD_REGISTER_KERNEL(equal,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
not_equal
,
CPU
,
ALL_LAYOUT
,
...
...
@@ -136,7 +141,8 @@ PD_REGISTER_KERNEL(not_equal,
int64_t
,
float
,
double
,
phi
::
dtype
::
float16
)
{}
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
)
{}
PD_REGISTER_KERNEL
(
equal_all
,
CPU
,
...
...
python/paddle/fluid/data_feeder.py
浏览文件 @
94e8fc78
...
...
@@ -21,6 +21,7 @@ import six
from
six.moves
import
zip
,
range
,
xrange
import
multiprocessing
import
warnings
import
struct
from
.framework
import
Variable
,
default_main_program
,
_current_expected_place
,
_non_static_mode
,
_in_eager_without_dygraph_check
from
.framework
import
_cpu_num
,
_cuda_ids
...
...
@@ -43,6 +44,27 @@ _PADDLE_DTYPE_2_NUMPY_DTYPE = {
}
def
copy_bits_from_float_to_uint16
(
f
):
return
struct
.
unpack
(
'<I'
,
struct
.
pack
(
'<f'
,
f
))[
0
]
>>
16
def
convert_float_to_uint16
(
data
,
data_format
=
"NCHW"
):
if
data
.
size
==
0
:
return
data
.
view
(
np
.
uint16
)
if
data_format
==
"NHWC"
:
data
=
np
.
transpose
(
data
,
[
0
,
3
,
1
,
2
])
new_data
=
[]
for
x
in
np
.
nditer
(
data
):
new_data
.
append
(
np
.
uint16
(
copy_bits_from_float_to_uint16
(
x
)))
new_data
=
np
.
reshape
(
new_data
,
data
.
shape
).
view
(
np
.
uint16
)
if
data_format
==
"NHWC"
:
new_data
=
np
.
transpose
(
new_output
,
[
0
,
2
,
3
,
1
])
return
new_data
def
convert_dtype
(
dtype
):
if
isinstance
(
dtype
,
core
.
VarDesc
.
VarType
):
if
dtype
in
_PADDLE_DTYPE_2_NUMPY_DTYPE
:
...
...
@@ -68,7 +90,9 @@ def convert_dtype(dtype):
# however, jointly supporting python2 and python3, (as well as python4 maybe)
# may still be a long-lasting problem.
return
str
(
dtype
)
# NOTE(zhangbo): Now numpy does not support bfloat, and paddle use uint16 to represent bfloat16, and there binaries are consistent.
# NOTE(zhangbo): Now numpy does not support bfloat, so use numpy.uint16 to represent paddle.bfloat16, there binaries are consistent.
# If cast ndarray to uint16 and trans to tensor, should not ndarray.astype('uint16') directly
# should use function 'convert_float_to_uint16' above, otherwise bits is wrong
if
dtype
in
[
'bfloat16'
]:
return
'uint16'
...
...
python/paddle/fluid/tests/unittests/test_var_base.py
浏览文件 @
94e8fc78
...
...
@@ -244,6 +244,26 @@ class TestVarBase(unittest.TestCase):
np
.
testing
.
assert_array_equal
(
x
.
numpy
(),
numpy_array
)
self
.
assertEqual
(
x
.
type
,
core
.
VarDesc
.
VarType
.
LOD_TENSOR
)
# test dtype bfloat16
x
=
paddle
.
to_tensor
(
-
1e6
,
dtype
=
paddle
.
bfloat16
)
self
.
assertEqual
(
x
.
dtype
,
core
.
VarDesc
.
VarType
.
BF16
)
self
.
assertTrue
(
x
==
-
999424.0
)
x
=
paddle
.
to_tensor
([
-
1e6
,
-
1e6
,
-
1e6
],
dtype
=
'bfloat16'
)
self
.
assertEqual
(
x
.
dtype
,
core
.
VarDesc
.
VarType
.
BF16
)
self
.
assertTrue
(
x
[
0
]
==
-
999424.0
)
self
.
assertTrue
(
x
[
1
]
==
-
999424.0
)
self
.
assertTrue
(
x
[
2
]
==
-
999424.0
)
x
=
paddle
.
to_tensor
(
-
1e6
,
dtype
=
paddle
.
bfloat16
,
stop_gradient
=
False
)
self
.
assertEqual
(
x
.
dtype
,
core
.
VarDesc
.
VarType
.
BF16
)
self
.
assertTrue
(
x
==
-
999424.0
)
y
=
x
*
x
y
.
backward
()
self
.
assertTrue
(
x
.
grad
==
-
999424.0
*
2
)
with
self
.
assertRaises
(
ValueError
):
paddle
.
randn
([
3
,
2
,
2
]).
item
()
with
self
.
assertRaises
(
ValueError
):
...
...
python/paddle/tensor/creation.py
浏览文件 @
94e8fc78
...
...
@@ -29,6 +29,7 @@ from ..fluid.data_feeder import (
check_type
,
check_dtype
,
convert_dtype
,
convert_float_to_uint16
,
)
from
..framework
import
(
convert_np_dtype_to_dtype_
,
...
...
@@ -399,7 +400,11 @@ def _to_tensor_non_static(data, dtype=None, place=None, stop_gradient=True):
data
=
data
.
astype
(
default_type
)
if
dtype
and
convert_dtype
(
dtype
)
!=
data
.
dtype
:
data
=
data
.
astype
(
convert_dtype
(
dtype
))
if
convert_dtype
(
dtype
)
in
[
'uint16'
]:
# should not ndarray.astype('uint16') directly, data bits is wrong
data
=
convert_float_to_uint16
(
data
.
astype
(
'float32'
))
else
:
data
=
data
.
astype
(
convert_dtype
(
dtype
))
if
_in_eager_without_dygraph_check
()
and
isinstance
(
data
,
np
.
ndarray
):
return
core
.
eager
.
Tensor
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录