Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
6b393e45
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看板
未验证
提交
6b393e45
编写于
3月 06, 2023
作者:
S
Sławomir Siwek
提交者:
GitHub
3月 06, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
convert todos to internal tasks (#51174)
上级
cf1a1c4b
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
18 addition
and
50 deletion
+18
-50
paddle/fluid/framework/ir/embedding_fc_lstm_fuse_pass.cc
paddle/fluid/framework/ir/embedding_fc_lstm_fuse_pass.cc
+4
-12
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
+1
-1
paddle/fluid/framework/ir/graph_pattern_detector.h
paddle/fluid/framework/ir/graph_pattern_detector.h
+0
-1
paddle/fluid/framework/ir/mkldnn/cpu_quantize_pass.cc
paddle/fluid/framework/ir/mkldnn/cpu_quantize_pass.cc
+0
-1
paddle/fluid/framework/ir/mkldnn/cpu_quantize_squash_pass.cc
paddle/fluid/framework/ir/mkldnn/cpu_quantize_squash_pass.cc
+1
-2
paddle/fluid/inference/tests/api/CMakeLists.txt
paddle/fluid/inference/tests/api/CMakeLists.txt
+0
-3
paddle/fluid/operators/controlflow/conditional_block_op.cc
paddle/fluid/operators/controlflow/conditional_block_op.cc
+2
-2
paddle/fluid/operators/controlflow/while_op.cc
paddle/fluid/operators/controlflow/while_op.cc
+2
-2
paddle/fluid/operators/conv_op.cc
paddle/fluid/operators/conv_op.cc
+0
-1
paddle/fluid/operators/elementwise/elementwise_op.h
paddle/fluid/operators/elementwise/elementwise_op.h
+1
-1
paddle/fluid/operators/fused/mkldnn/fusion_rnn_mkldnn.h
paddle/fluid/operators/fused/mkldnn/fusion_rnn_mkldnn.h
+1
-3
paddle/fluid/operators/fused/mkldnn/multi_gru_mkldnn_op.cc
paddle/fluid/operators/fused/mkldnn/multi_gru_mkldnn_op.cc
+1
-1
paddle/fluid/operators/matmul_op.cc
paddle/fluid/operators/matmul_op.cc
+2
-2
paddle/fluid/operators/mkldnn/layer_norm_mkldnn_op.cc
paddle/fluid/operators/mkldnn/layer_norm_mkldnn_op.cc
+0
-1
paddle/fluid/operators/pool_op.cc
paddle/fluid/operators/pool_op.cc
+1
-1
paddle/fluid/operators/sequence_ops/sequence_pool_op.h
paddle/fluid/operators/sequence_ops/sequence_pool_op.h
+1
-2
paddle/phi/backends/onednn/axpy_handler.h
paddle/phi/backends/onednn/axpy_handler.h
+1
-2
python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_div_mkldnn_op.py
.../tests/unittests/mkldnn/test_elementwise_div_mkldnn_op.py
+0
-2
python/paddle/fluid/tests/unittests/mkldnn/test_split_bf16_mkldnn_op.py
...fluid/tests/unittests/mkldnn/test_split_bf16_mkldnn_op.py
+0
-10
未找到文件。
paddle/fluid/framework/ir/embedding_fc_lstm_fuse_pass.cc
浏览文件 @
6b393e45
...
...
@@ -36,9 +36,8 @@ static int BuildFusion(Graph* graph,
->
assert_is_op_input
(
"lookup_table_v2"
)
->
assert_var_not_persistable
();
patterns
::
Embedding
embedding_pattern
(
pattern
,
name_scope
);
// TODO(jczaja): Intermediate can only be for val that are not used anywhere
// but lookup table output may go into other LSTM (for reverse
// direction)
// Intermediate can only be for val that are not used anywhere but
// lookup table output may go into other LSTM (for reverse direction)
auto
*
embedding_out
=
embedding_pattern
(
x
);
patterns
::
FC
fc_pattern
(
pattern
,
name_scope
);
...
...
@@ -227,13 +226,13 @@ static int BuildFusion(Graph* graph,
GET_IR_NODE_FROM_SUBGRAPH
(
w
,
w
,
fc_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
mul
,
mul
,
fc_pattern
);
// TODO(jczaja): Add support for is_sparse / is_distributed
auto
is_sparse
=
PADDLE_GET_CONST
(
bool
,
lookup_table
->
Op
()
->
GetAttr
(
"is_sparse"
));
auto
is_distributed
=
PADDLE_GET_CONST
(
bool
,
lookup_table
->
Op
()
->
GetAttr
(
"is_distributed"
));
if
(
is_sparse
==
true
||
is_distributed
==
true
)
{
if
(
is_sparse
||
is_distributed
)
{
VLOG
(
4
)
<<
"Only dense embedding is supported in oneDNN"
;
return
;
}
...
...
@@ -252,10 +251,7 @@ static int BuildFusion(Graph* graph,
Cell
,
fc_out
,
fc_bias
);
// Remove unneeded nodes.
// TODO(jczaja): Proper removing of lookup table
std
::
unordered_set
<
const
Node
*>
marked_nodes
(
// {lookup_table, mul, lstm, elementwise_add, fc_bias, W});
{
mul
,
lstm
,
elementwise_add
,
fc_bias
});
GraphSafeRemoveNodes
(
graph
,
marked_nodes
);
}
else
{
...
...
@@ -271,10 +267,6 @@ static int BuildFusion(Graph* graph,
Cell
,
fc_out
,
nullptr
);
// Remove unneeded nodes.
// TODO(jczaja): Proper removing of lookup table
// std::unordered_set<const Node*> marked_nodes({lookup_table, W, mul,
// lstm});
std
::
unordered_set
<
const
Node
*>
marked_nodes
({
mul
,
lstm
});
GraphSafeRemoveNodes
(
graph
,
marked_nodes
);
}
...
...
paddle/fluid/framework/ir/fc_gru_fuse_pass.cc
浏览文件 @
6b393e45
...
...
@@ -196,7 +196,7 @@ int FCGRUFusePass::BuildFusion(Graph* graph,
SET_IN
(
WeightH
,
weight_h
);
SET_IN
(
Bias
,
bias
);
#undef SET_IN
//
TODO(grygielski): Add H0 to the pass
//
H0 is required for oneDNN and optional in PaddlePaddle
op_desc
.
SetInput
(
"H0"
,
{});
op_desc
.
SetOutput
(
"Hidden"
,
{
hidden
->
Name
()});
op_desc
.
SetAttr
(
"is_reverse"
,
gru
->
Op
()
->
GetAttr
(
"is_reverse"
));
...
...
paddle/fluid/framework/ir/graph_pattern_detector.h
浏览文件 @
6b393e45
...
...
@@ -1925,7 +1925,6 @@ struct FusionGru : public PatternBase {
struct
FusionLSTM
:
public
PatternBase
{
FusionLSTM
(
PDPattern
*
pattern
,
const
std
::
string
&
name_scope
)
:
PatternBase
(
pattern
,
name_scope
,
"fusion_lstm"
)
{}
// TODO(lidanqing): Is it enough to detect fusion_lstm with these things
PDNode
*
operator
()();
// declare op
...
...
paddle/fluid/framework/ir/mkldnn/cpu_quantize_pass.cc
浏览文件 @
6b393e45
...
...
@@ -1033,7 +1033,6 @@ void CPUQuantizePass::QuantizeElementwise(
auto
input_x_scale
=
GetScaleValueForNode
(
elementwise_x
,
&
is_x_unsigned
);
auto
input_y_scale
=
GetScaleValueForNode
(
elementwise_y
,
&
is_y_unsigned
);
// TODO(sfraczek): add support for different signness
if
(
is_x_unsigned
!=
is_y_unsigned
)
{
MarkAndLogCannotQuantizeOp
(
elementwise_op
,
"Elementwise inputs must be of the same type."
);
...
...
paddle/fluid/framework/ir/mkldnn/cpu_quantize_squash_pass.cc
浏览文件 @
6b393e45
...
...
@@ -141,8 +141,7 @@ bool CPUQuantizeSquashPass::IsDequantizeQuantizeIncompatible(
bool
is_input_signed
=
dequant_op
->
Op
()
->
GetAttrIfExists
<
bool
>
(
"is_negative_input"
);
/* TODO(sfraczek): remove elementwise from this condition when BinaryMKLDNN
kernel will support two different input data types */
// BinaryOneDNN doesn't support two different input data types
bool
is_next_op_concat_or_elementwise
=
next_op
->
Op
()
->
Type
()
==
"concat"
||
next_op
->
Op
()
->
Type
().
find
(
"elementwise"
)
==
0
;
...
...
paddle/fluid/inference/tests/api/CMakeLists.txt
浏览文件 @
6b393e45
...
...
@@ -645,21 +645,18 @@ if(WITH_MKLDNN)
${
INT8_MOBILENETV2_MODEL_DIR
}
${
IMAGENET_DATA_PATH
}
)
# resnet101 int8
# TODO(grygielski) Enable after MKL-DNN 1.0 merge
set
(
INT8_RESNET101_MODEL_DIR
"
${
INT8_DATA_DIR
}
/resnet101"
)
download_int8_data_without_verify
(
${
INT8_RESNET101_MODEL_DIR
}
"Res101_int8_model.tar.gz"
)
# inference_analysis_api_int8_test_run(test_analyzer_int8_resnet101 ${INT8_IMG_CLASS_TEST_APP} ${INT8_RESNET101_MODEL_DIR} ${IMAGENET_DATA_PATH})
# vgg16 int8
# TODO(grygielski) Enable after MKL-DNN 1.0 merge
set
(
INT8_VGG16_MODEL_DIR
"
${
INT8_DATA_DIR
}
/vgg16"
)
download_int8_data_without_verify
(
${
INT8_VGG16_MODEL_DIR
}
"VGG16_int8_model.tar.gz"
)
# inference_analysis_api_int8_test_run(test_analyzer_int8_vgg16 ${INT8_IMG_CLASS_TEST_APP} ${INT8_VGG16_MODEL_DIR} ${IMAGENET_DATA_PATH})
# vgg19 int8
# TODO(grygielski) Enable after MKL-DNN 1.0 merge
set
(
INT8_VGG19_MODEL_DIR
"
${
INT8_DATA_DIR
}
/vgg19"
)
download_int8_data_without_verify
(
${
INT8_VGG19_MODEL_DIR
}
"VGG19_int8_model.tar.gz"
)
...
...
paddle/fluid/operators/controlflow/conditional_block_op.cc
浏览文件 @
6b393e45
...
...
@@ -83,8 +83,8 @@ class ConditionalBlockOp : public ConditionalOp {
auto
&
cur_scope
=
*
scopes
->
front
();
#ifdef PADDLE_WITH_MKLDNN
//
(jczaja) Executor on being destroyed clears oneDNN cache and
// re
set re
gistered model data layout. This is unwanted for nested
//
Executor on being destroyed clears oneDNN cache and resets
// registered model data layout. This is unwanted for nested
// Executors (executors declared inside control ops)
platform
::
DontClearMKLDNNCache
(
dev_place
);
#endif
...
...
paddle/fluid/operators/controlflow/while_op.cc
浏览文件 @
6b393e45
...
...
@@ -109,8 +109,8 @@ class WhileOp : public framework::OperatorBase {
".
\n
"
));
#ifdef PADDLE_WITH_MKLDNN
//
(jczaja) Executor on being destroyed clears oneDNN cache and
// re
sets re
gistered model data layout. This is unwanted for nested
//
Executor on being destroyed clears oneDNN cache and resets
// registered model data layout. This is unwanted for nested
// Executors (executors declared inside control ops)
platform
::
DontClearMKLDNNCache
(
dev_place
);
#endif
...
...
paddle/fluid/operators/conv_op.cc
浏览文件 @
6b393e45
...
...
@@ -436,7 +436,6 @@ void ConvOpGrad::InferShape(framework::InferShapeContext* ctx) const {
phi
::
KernelKey
ConvOpGrad
::
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
// TODO(pzelazko-intel): enable MKLDNN layout when it's ready
auto
data_type
=
OperatorWithKernel
::
IndicateVarDataType
(
ctx
,
"Input"
);
return
phi
::
KernelKey
(
data_type
,
ctx
.
GetPlace
());
}
...
...
paddle/fluid/operators/elementwise/elementwise_op.h
浏览文件 @
6b393e45
...
...
@@ -109,7 +109,7 @@ class ElementwiseOp : public framework::OperatorWithKernel {
std
::
vector
<
int
>
y_dims_array
(
max_dim
);
std
::
vector
<
int
>
out_dims_array
(
max_dim
);
#ifdef PADDLE_WITH_MKLDNN
//
(jczaja):
Broadcasting of dims has to be done on Paddle shapes (NHWC)
// Broadcasting of dims has to be done on Paddle shapes (NHWC)
// if model is using NHWC and any of shapes in at least 3D
bool
should_rotate
=
ctx
->
IsRunMKLDNNKernel
()
&&
...
...
paddle/fluid/operators/fused/mkldnn/fusion_rnn_mkldnn.h
浏览文件 @
6b393e45
...
...
@@ -191,9 +191,7 @@ class RNNMKLDNNHandler : public phi::funcs::OneDNNHandlerT<T, T_alg> {
return
memory_p
;
}
// TODO(grygielski) H0 is for now persistable
// TODO(jczaja) H0 should be updated each iter and of T type (Fusion pass does
// not support in yet)
// H0 is for now persistable
template
<
typename
U
>
std
::
shared_ptr
<
dnnl
::
memory
>
AcquireH0Memory
(
const
phi
::
DenseTensor
*
h0
)
{
const
std
::
string
h0_key
=
memory_key_
+
"@h0"
;
...
...
paddle/fluid/operators/fused/mkldnn/multi_gru_mkldnn_op.cc
浏览文件 @
6b393e45
...
...
@@ -328,7 +328,7 @@ class MultiGRUHandler {
return
out_mem
;
}
//
TODO(grygielski)
H0 is for now persistable
// H0 is for now persistable
std
::
shared_ptr
<
dnnl
::
memory
>
AcquireH0Memory
(
int
layer
,
Direction
dir
)
{
auto
key
=
memory_key_
;
key
.
append
(
"@h0"
).
append
(
dir2str
(
dir
)).
append
(
std
::
to_string
(
layer
));
...
...
paddle/fluid/operators/matmul_op.cc
浏览文件 @
6b393e45
...
...
@@ -583,8 +583,8 @@ class MatMulOp : public framework::OperatorWithKernel {
auto
dim_y
=
GetDimForInput
(
*
context
,
"Y"
);
#ifdef PADDLE_WITH_MKLDNN
//
(jczaja): For NHWC execution output shape needs
//
to be
computed like instead x*y we are to do y*x
//
For NHWC execution output shape needs to be
// computed like instead x*y we are to do y*x
bool
channelwise_onednn
=
context
->
IsRunMKLDNNKernel
()
&&
(
phi
::
OneDNNContext
::
tls
().
get_cur_paddle_data_layout
()
==
...
...
paddle/fluid/operators/mkldnn/layer_norm_mkldnn_op.cc
浏览文件 @
6b393e45
...
...
@@ -156,7 +156,6 @@ class LayerNormMKLDNNOpKernel : public paddle::framework::OpKernel<T> {
}
// namespace operators
}
// namespace paddle
// TODO(jczaja): Enable FP32 when performance is good
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_KERNEL
(
layer_norm
,
MKLDNN
,
...
...
paddle/fluid/operators/pool_op.cc
浏览文件 @
6b393e45
...
...
@@ -31,7 +31,7 @@ namespace operators {
bool
CanMKLDNNSupportPool
(
const
framework
::
ExecutionContext
&
ctx
)
{
if
(
ctx
.
Attr
<
bool
>
(
"adaptive"
)
==
false
)
return
true
;
//
(jczaja):
oneDNN is supporting only unchangable in size pool window
// oneDNN is supporting only unchangable in size pool window
auto
src_tz
=
phi
::
vectorize
(
ctx
.
Input
<
phi
::
DenseTensor
>
(
"X"
)
->
dims
());
if
(
!
ctx
.
HasAttr
(
"ksize"
))
{
return
false
;
...
...
paddle/fluid/operators/sequence_ops/sequence_pool_op.h
浏览文件 @
6b393e45
...
...
@@ -73,8 +73,7 @@ class SequencePoolKernel : public framework::OpKernel<T> {
bool
is_test
=
context
.
HasAttr
(
"is_test"
)
?
context
.
Attr
<
bool
>
(
"is_test"
)
:
false
;
// Do not create index buffer for inference (is_test) mode
// TODO(jczaja): Skip index buffer creation for other devices eg. GPU
// Do not create index buffer for inference mode
if
(
pooltype
==
"MAX"
&&
(
is_test
==
false
||
platform
::
is_cpu_place
(
context
.
GetPlace
())
==
false
))
{
...
...
paddle/phi/backends/onednn/axpy_handler.h
浏览文件 @
6b393e45
...
...
@@ -50,8 +50,7 @@ class OneDNNAXPYHandler {
private:
OneDNNAXPYHandler
()
=
delete
;
// (arogowie-intel) Private implementation idiom to hide dependency
// on OneDNN headers.
// Private implementation idiom to hide dependency on oneDNN headers.
class
Impl
;
// We need custom deleter, since the compiler is unable to parameterize
// an allocator's default deleter due to incomple type.
...
...
python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_div_mkldnn_op.py
浏览文件 @
6b393e45
...
...
@@ -91,7 +91,6 @@ class TestMKLDNNElementwiseDivOp4(TestMKLDNNElementwiseDivOp):
self
.
y
=
np
.
random
.
uniform
(
1
,
2
,
[
4
,
32
]).
astype
(
self
.
dtype
)
self
.
out
=
np
.
divide
(
self
.
x
,
self
.
y
)
# TODO(piotrekobiIntel): Enable when grad is ready
def
test_check_grad_normal
(
self
):
pass
...
...
@@ -105,7 +104,6 @@ class TestMKLDNNElementwiseDivOp5(TestMKLDNNElementwiseDivOp):
self
.
y
=
np
.
random
.
uniform
(
1
,
2
,
[
100
]).
astype
(
self
.
dtype
)
self
.
out
=
np
.
divide
(
self
.
x
,
self
.
y
)
# TODO(piotrekobiIntel): Enable when grad is ready
def
test_check_grad_normal
(
self
):
pass
...
...
python/paddle/fluid/tests/unittests/mkldnn/test_split_bf16_mkldnn_op.py
浏览文件 @
6b393e45
...
...
@@ -67,16 +67,6 @@ class TestSplitSectionsBF16OneDNNOp(OpTest):
self
.
check_output_with_place
(
core
.
CPUPlace
())
# TODO jakpiase enable grad check(concat op)
# def test_check_grad(self):
# self.check_grad_with_place(
# core.CPUPlace(), ["X"],
# "Out",
# chck_dgrph=
# user_defined_grads=[self.inputs['X']],
# user_defined_grad_outputs=self.out[0])
class
TestSplitNumBF16OneDNNOp
(
TestSplitSectionsBF16OneDNNOp
):
def
init_data
(
self
):
self
.
x
=
np
.
random
.
random
((
4
,
8
,
5
,
3
)).
astype
(
"uint16"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录