未验证 提交 42e312a1 编写于 作者: H Hui Zhang 提交者: GitHub

Construct exec and ctx only once in cond op to speed up (#47009)

* cond infer apply exec seprate

* fix bugs
上级 1cc482b0
...@@ -14,6 +14,11 @@ limitations under the License. */ ...@@ -14,6 +14,11 @@ limitations under the License. */
#include "paddle/fluid/operators/controlflow/conditional_block_op.h" #include "paddle/fluid/operators/controlflow/conditional_block_op.h"
#ifdef PADDLE_WITH_MKLDNN
#include "paddle/fluid/platform/mkldnn_helper.h"
#endif
DECLARE_bool(use_mkldnn);
namespace paddle { namespace paddle {
namespace framework { namespace framework {
class OpDesc; class OpDesc;
...@@ -73,14 +78,29 @@ class ConditionalBlockInferOp : public ConditionalOp { ...@@ -73,14 +78,29 @@ class ConditionalBlockInferOp : public ConditionalOp {
scopes->front() = &scope.NewScope(); scopes->front() = &scope.NewScope();
auto &cur_scope = *scopes->front(); auto &cur_scope = *scopes->front();
framework::Executor exec(dev_place);
auto *block = Attr<framework::BlockDesc *>("sub_block"); auto *block = Attr<framework::BlockDesc *>("sub_block");
VLOG(3) << "Conditional block.idx = " << block->ID() VLOG(3) << "Conditional block.idx = " << block->ID()
<< ", scope = " << &cur_scope; << ", scope = " << &cur_scope;
exec.Run(*block->Program(), &cur_scope, block->ID(), false);
if (!exec || !platform::is_same_place(exec->GetPlace(), dev_place)) {
auto &pdesc = *block->Program();
exec.reset(new framework::Executor(dev_place));
if (FLAGS_use_mkldnn) exec->EnableMKLDNN(pdesc);
ctx = exec->Prepare(
pdesc, block->ID(), std::vector<std::string>(), false);
#ifdef PADDLE_WITH_MKLDNN
platform::AttachPointerHashToMKLDNNKey(exec.get(), dev_place);
platform::RegisterModelLayout(ctx->ops_, dev_place);
#endif
}
exec->RunPreparedContext(ctx.get(), &cur_scope, false, true, false);
scope.DeleteScope(scopes->front()); scope.DeleteScope(scopes->front());
} }
} }
private:
mutable std::shared_ptr<framework::Executor> exec{nullptr};
mutable std::unique_ptr<framework::ExecutorPrepareContext> ctx{nullptr};
}; };
} // namespace operators } // namespace operators
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册