From 0318c95149ded321160a00f53cada4af0996505b Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Mon, 26 Nov 2018 16:21:43 +0800 Subject: [PATCH] rebase develop --- paddle/fluid/operators/activation_op.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddle/fluid/operators/activation_op.cc b/paddle/fluid/operators/activation_op.cc index cc5f90cd11e..832245371e0 100644 --- a/paddle/fluid/operators/activation_op.cc +++ b/paddle/fluid/operators/activation_op.cc @@ -66,7 +66,7 @@ framework::OpKernelType GetKernelType(const framework::ExecutionContext& ctx, const framework::OperatorWithKernel& oper, const std::string& name) { framework::LibraryType library{framework::LibraryType::kPlain}; - framework::DataLayout layout = framework::ddle/fluid/pybind/CMakeLists.txtDataLayout::kAnyLayout; + framework::DataLayout layout = framework::DataLayout::kAnyLayout; #ifdef PADDLE_WITH_MKLDNN auto it = oper.Attrs().find("use_mkldnn"); if (library == framework::LibraryType::kPlain && it != oper.Attrs().end() && -- GitLab