Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

REUPLOAD Added vanilla LSTM and LSTM with peepholes oneDNN fp32 kernel #30719

Merged
merged 26 commits into from
Jan 27, 2021
Merged

REUPLOAD Added vanilla LSTM and LSTM with peepholes oneDNN fp32 kernel #30719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1ecc4cf
added external reorder to profiler
Dec 2, 2020
92db4d2
resolving merge conflict
Dec 28, 2020
ac02826
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jan 11, 2021
cfc0a1d
resolved conflict
Jan 13, 2021
9f3bed6
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jan 13, 2021
7ce32b3
added enable_static
Jan 14, 2021
79a8e4e
initial version of lstm, not working yet
Jan 15, 2021
985067f
added lstm to operators.cmake
Jan 15, 2021
c3e0ccd
added vanilla lstm mkldnn op
Jan 19, 2021
7d61360
added peephole weights integration
Jan 20, 2021
2670631
minor changes
Jan 20, 2021
1f549fc
added formatting
Jan 20, 2021
24f2bd7
added fusion_lstm_mkldnn to static_whitelist
Jan 22, 2021
ac74650
added formatting
Jan 22, 2021
4ecf14c
removed comment
Jan 22, 2021
355c4e9
moved use_peepholes attribute inside is_cached block
Jan 22, 2021
05eaa27
reverted wrong changes
Jan 22, 2021
8df2930
minor formatting change
Jan 23, 2021
7a4932a
Merge branch 'develop' into lstm_float32
jakpiase Jan 25, 2021
c29d108
minor changes
jakpiase Jan 25, 2021
b26c6e8
changed stream handling
Jan 26, 2021
c05dccf
resolved conflict
Jan 26, 2021
740385e
Merge branch 'develop' into lstm_fp32
Jan 26, 2021
d66a171
minor change
Jan 26, 2021
6cf2f93
added datatype to GetExpectedKernelType()
Jan 26, 2021
6d2239e
added reading stream from TLS
Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/operators.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function(op_library TARGET)
"tensor_array_read_write_op" "tensorrt_engine_op" "conv_fusion_op"
"fusion_transpose_flatten_concat_op" "fusion_conv_inception_op"
"sync_batch_norm_op" "dgc_op" "fused_fc_elementwise_layernorm_op"
"skip_layernorm_op" "multihead_matmul_op" "fusion_group_op" "fused_bn_activation_op" "fused_embedding_eltwise_layernorm_op" "fusion_gru_op"
"skip_layernorm_op" "multihead_matmul_op" "fusion_group_op" "fused_bn_activation_op" "fused_embedding_eltwise_layernorm_op" "fusion_gru_op" "fusion_lstm_op"
"fused_bn_add_activation_op")
if ("${TARGET}" STREQUAL "${manual_pybind_op}")
set(pybind_flag 1)
Expand Down
4 changes: 4 additions & 0 deletions paddle/fluid/operators/fused/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ register_operators(EXCLUDES
fused_embedding_eltwise_layernorm_op
fusion_group_op
fusion_gru_op
fusion_lstm_op
fused_bn_add_activation_op)

# fusion_gru_op does not have CUDA kernel
op_library(fusion_gru_op)
op_library(fusion_lstm_op)
file(APPEND ${pybind_file} "USE_CPU_ONLY_OP(fusion_gru);\n")
file(APPEND ${pybind_file} "USE_CPU_ONLY_OP(fusion_lstm);\n")


if (WITH_GPU)
# fused_bn_activation_op needs cudnn 7.4.1 above
Expand Down
18 changes: 16 additions & 2 deletions paddle/fluid/operators/fused/fusion_lstm_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ limitations under the License. */
#include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/operators/math/fc.h"
#include "paddle/fluid/operators/math/sequence2batch.h"
#ifdef PADDLE_WITH_MKLDNN
#include "paddle/fluid/platform/mkldnn_helper.h"
#endif

namespace paddle {
namespace operators {
Expand Down Expand Up @@ -145,8 +148,16 @@ void FusionLSTMOp::InferShape(framework::InferShapeContext* ctx) const {

framework::OpKernelType FusionLSTMOp::GetExpectedKernelType(
const framework::ExecutionContext& ctx) const {
return framework::OpKernelType(
OperatorWithKernel::IndicateVarDataType(ctx, "X"), ctx.device_context());
framework::LibraryType library = framework::LibraryType::kPlain;
framework::DataLayout layout = framework::DataLayout::kAnyLayout;
auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "X");
#ifdef PADDLE_WITH_MKLDNN
if (this->CanMKLDNNBeUsed(ctx, data_type)) {
library = framework::LibraryType::kMKLDNN;
layout = framework::DataLayout::kMKLDNN;
}
#endif
return framework::OpKernelType(data_type, ctx.GetPlace(), layout, library);
}

void FusionLSTMOpMaker::Make() {
Expand Down Expand Up @@ -235,6 +246,9 @@ void FusionLSTMOpMaker::Make() {
"`tanh` by default.")
.SetDefault("tanh")
.InEnum({"sigmoid", "tanh", "relu", "identity"});
AddAttr<bool>("use_mkldnn",
"(bool, default false) Only used in mkldnn kernel")
.SetDefault(false);
AddComment(R"DOC(
Fusion Long-Short Term Memory (LSTM) Operator.
This operator fuse the X into LSTM, more details can refer to LSTM op.
Expand Down
Loading