Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
29d75c14
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
29d75c14
编写于
11月 23, 2022
作者:
L
limingshu
提交者:
GitHub
11月 23, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add bfloat16 type support for abs op (#48205)
* first commit * 2nd commit
上级
edf46919
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
105 addition
and
50 deletion
+105
-50
paddle/phi/kernels/funcs/complex_functors.h
paddle/phi/kernels/funcs/complex_functors.h
+22
-47
paddle/phi/kernels/gpu/abs_grad_kernel.cu
paddle/phi/kernels/gpu/abs_grad_kernel.cu
+1
-0
paddle/phi/kernels/gpu/abs_kernel.cu
paddle/phi/kernels/gpu/abs_kernel.cu
+14
-2
paddle/phi/kernels/impl/abs_grad_kernel_impl.h
paddle/phi/kernels/impl/abs_grad_kernel_impl.h
+67
-1
python/paddle/fluid/tests/unittests/test_activation_op.py
python/paddle/fluid/tests/unittests/test_activation_op.py
+1
-0
未找到文件。
paddle/phi/kernels/funcs/complex_functors.h
浏览文件 @
29d75c14
...
...
@@ -110,53 +110,6 @@ struct AbsFunctor<T, NoComplex<T, dtype::Real<T>>> {
int64_t
numel_
;
};
template
<
typename
T
>
struct
AbsGradCUDAFunctor
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
T
operator
()(
const
T
x
,
const
T
dout
)
const
{
T
output
;
if
(
x
==
T
(
0
))
{
output
=
T
(
0
);
}
else
{
output
=
T
(
dout
)
*
(
x
/
T
(
std
::
abs
(
x
)));
}
return
output
;
}
};
template
<
>
struct
AbsGradCUDAFunctor
<
phi
::
dtype
::
complex
<
float
>>
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
phi
::
dtype
::
complex
<
float
>
operator
()(
const
phi
::
dtype
::
complex
<
float
>
x
,
const
float
dout
)
const
{
phi
::
dtype
::
complex
<
float
>
output
;
if
(
x
==
phi
::
dtype
::
complex
<
float
>
(
0
))
{
output
=
phi
::
dtype
::
complex
<
float
>
(
0
);
}
else
{
output
=
phi
::
dtype
::
complex
<
float
>
(
dout
)
*
(
x
/
phi
::
dtype
::
complex
<
float
>
(
abs
(
x
)));
}
return
output
;
}
};
template
<
>
struct
AbsGradCUDAFunctor
<
phi
::
dtype
::
complex
<
double
>>
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
phi
::
dtype
::
complex
<
double
>
operator
()(
const
phi
::
dtype
::
complex
<
double
>
x
,
const
double
dout
)
const
{
phi
::
dtype
::
complex
<
double
>
output
;
if
(
x
==
phi
::
dtype
::
complex
<
double
>
(
0
))
{
output
=
phi
::
dtype
::
complex
<
double
>
(
0
);
}
else
{
output
=
phi
::
dtype
::
complex
<
double
>
(
dout
)
*
(
x
/
phi
::
dtype
::
complex
<
double
>
(
abs
(
x
)));
}
return
output
;
}
};
template
<
typename
T
>
struct
AbsGradFunctor
{
AbsGradFunctor
(
const
dtype
::
Real
<
T
>*
dout
,
...
...
@@ -179,6 +132,28 @@ struct AbsGradFunctor {
int64_t
numel_
;
};
template
<
>
struct
AbsGradFunctor
<
phi
::
dtype
::
bfloat16
>
{
AbsGradFunctor
(
const
dtype
::
Real
<
phi
::
dtype
::
bfloat16
>*
dout
,
const
phi
::
dtype
::
bfloat16
*
x
,
phi
::
dtype
::
bfloat16
*
output
,
int64_t
numel
)
:
dout_
(
dout
),
x_
(
x
),
output_
(
output
),
numel_
(
numel
)
{}
HOSTDEVICE
void
operator
()(
int64_t
idx
)
const
{
if
(
x_
[
idx
]
==
static_cast
<
phi
::
dtype
::
bfloat16
>
(
0
))
{
output_
[
idx
]
=
static_cast
<
phi
::
dtype
::
bfloat16
>
(
0
);
}
else
{
output_
[
idx
]
=
dout_
[
idx
]
*
(
x_
[
idx
]
/
(
abs
(
x_
[
idx
])));
}
}
const
dtype
::
Real
<
phi
::
dtype
::
bfloat16
>*
dout_
;
const
phi
::
dtype
::
bfloat16
*
x_
;
phi
::
dtype
::
bfloat16
*
output_
;
int64_t
numel_
;
};
template
<
>
struct
AbsGradFunctor
<
phi
::
dtype
::
complex
<
float
>>
{
AbsGradFunctor
(
const
float
*
dout
,
...
...
paddle/phi/kernels/gpu/abs_grad_kernel.cu
浏览文件 @
29d75c14
...
...
@@ -31,6 +31,7 @@ PD_REGISTER_KERNEL(abs_grad,
int
,
int64_t
,
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
,
complex
<
float
>
,
complex
<
double
>
)
{
kernel
->
InputAt
(
1
).
SetDataType
(
phi
::
dtype
::
ToReal
(
kernel_key
.
dtype
()));
...
...
paddle/phi/kernels/gpu/abs_kernel.cu
浏览文件 @
29d75c14
...
...
@@ -16,8 +16,8 @@
#include <algorithm>
#include <vector>
#include "paddle/phi/backends/gpu/gpu_context.h"
#include "paddle/phi/common/bfloat16.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/complex_functors.h"
...
...
@@ -36,7 +36,18 @@ struct CudaAbsFunctor<T, phi::funcs::Complex<T, phi::dtype::Real<T>>> {
};
template
<
typename
T
>
struct
CudaAbsFunctor
<
T
,
phi
::
funcs
::
NoComplex
<
T
,
phi
::
dtype
::
Real
<
T
>>>
{
struct
CudaAbsFunctor
<
T
,
std
::
enable_if_t
<
std
::
is_same
<
T
,
phi
::
dtype
::
Real
<
T
>>::
value
&&
std
::
is_same
<
T
,
phi
::
dtype
::
bfloat16
>::
value
>>
{
__device__
__forceinline__
T
operator
()(
const
T
x
)
const
{
return
abs
(
x
);
}
};
template
<
typename
T
>
struct
CudaAbsFunctor
<
T
,
std
::
enable_if_t
<
std
::
is_same
<
T
,
phi
::
dtype
::
Real
<
T
>>::
value
&&
!
std
::
is_same
<
T
,
phi
::
dtype
::
bfloat16
>::
value
>>
{
__device__
__forceinline__
T
operator
()(
const
T
x
)
const
{
return
std
::
abs
(
x
);
}
...
...
@@ -63,5 +74,6 @@ PD_REGISTER_KERNEL(abs,
int
,
int64_t
,
phi
::
dtype
::
float16
,
phi
::
dtype
::
bfloat16
,
phi
::
dtype
::
complex
<
float
>
,
phi
::
dtype
::
complex
<
double
>
)
{}
paddle/phi/kernels/impl/abs_grad_kernel_impl.h
浏览文件 @
29d75c14
...
...
@@ -14,6 +14,7 @@
#pragma once
#include "paddle/phi/common/bfloat16.h"
#include "paddle/phi/kernels/abs_grad_kernel.h"
#include "paddle/phi/kernels/funcs/complex_functors.h"
#include "paddle/phi/kernels/funcs/elementwise_base.h"
...
...
@@ -22,6 +23,70 @@
namespace
phi
{
#if defined(__NVCC__)
template
<
typename
T
>
struct
AbsGradCUDAFunctor
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
T
operator
()(
const
T
x
,
const
T
dout
)
const
{
T
output
;
if
(
x
==
T
(
0
))
{
output
=
T
(
0
);
}
else
{
output
=
T
(
dout
)
*
(
x
/
T
(
std
::
abs
(
x
)));
}
return
output
;
}
};
template
<
>
struct
AbsGradCUDAFunctor
<
phi
::
dtype
::
bfloat16
>
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
phi
::
dtype
::
bfloat16
operator
()(
const
phi
::
dtype
::
bfloat16
x
,
const
phi
::
dtype
::
bfloat16
dout
)
const
{
phi
::
dtype
::
bfloat16
output
;
if
(
x
==
phi
::
dtype
::
bfloat16
(
0
))
{
output
=
static_cast
<
phi
::
dtype
::
bfloat16
>
(
0
);
}
else
{
output
=
(
dout
)
*
(
x
/
abs
(
x
));
}
return
output
;
}
};
template
<
>
struct
AbsGradCUDAFunctor
<
phi
::
dtype
::
complex
<
float
>>
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
phi
::
dtype
::
complex
<
float
>
operator
()(
const
phi
::
dtype
::
complex
<
float
>
x
,
const
float
dout
)
const
{
phi
::
dtype
::
complex
<
float
>
output
;
if
(
x
==
phi
::
dtype
::
complex
<
float
>
(
0
))
{
output
=
phi
::
dtype
::
complex
<
float
>
(
0
);
}
else
{
output
=
phi
::
dtype
::
complex
<
float
>
(
dout
)
*
(
x
/
phi
::
dtype
::
complex
<
float
>
(
abs
(
x
)));
}
return
output
;
}
};
template
<
>
struct
AbsGradCUDAFunctor
<
phi
::
dtype
::
complex
<
double
>>
{
HOSTDEVICE
inline
AbsGradCUDAFunctor
()
{}
HOSTDEVICE
inline
phi
::
dtype
::
complex
<
double
>
operator
()(
const
phi
::
dtype
::
complex
<
double
>
x
,
const
double
dout
)
const
{
phi
::
dtype
::
complex
<
double
>
output
;
if
(
x
==
phi
::
dtype
::
complex
<
double
>
(
0
))
{
output
=
phi
::
dtype
::
complex
<
double
>
(
0
);
}
else
{
output
=
phi
::
dtype
::
complex
<
double
>
(
dout
)
*
(
x
/
phi
::
dtype
::
complex
<
double
>
(
abs
(
x
)));
}
return
output
;
}
};
template
<
typename
T
>
void
AbsGradKernelImpl
(
const
GPUContext
&
dev_ctx
,
const
DenseTensor
&
x
,
...
...
@@ -30,9 +95,10 @@ void AbsGradKernelImpl(const GPUContext& dev_ctx,
std
::
vector
<
const
DenseTensor
*>
ins
=
{
&
x
,
&
dout
};
std
::
vector
<
DenseTensor
*>
outs
=
{
dx
};
dev_ctx
.
Alloc
<
T
>
(
dx
);
phi
::
funcs
::
AbsGradCUDAFunctor
<
T
>
abs_grad_cuda_functor
;
AbsGradCUDAFunctor
<
T
>
abs_grad_cuda_functor
;
phi
::
funcs
::
ElementwiseKernel
<
T
>
(
dev_ctx
,
ins
,
&
outs
,
abs_grad_cuda_functor
);
}
template
<
typename
T
,
typename
Context
>
void
AbsGradKernel
(
const
Context
&
dev_ctx
,
const
DenseTensor
&
x
,
...
...
python/paddle/fluid/tests/unittests/test_activation_op.py
浏览文件 @
29d75c14
...
...
@@ -3699,6 +3699,7 @@ def create_test_act_bf16_class(
create_test_act_bf16_class
(
TestRelu
)
create_test_act_bf16_class
(
TestAbs
)
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录