From 7336b306019d08e5ab282cb4635bf9ef2b9d066a Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Thu, 3 Sep 2020 12:43:50 +0800 Subject: [PATCH] fix(mge/imperative): fix OutputCallback hang GitOrigin-RevId: 49c10c79d6f600270c1e215e285e686b829221de --- imperative/python/src/graph_rt.h | 9 +-------- imperative/src/impl/opr_utility.cpp | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/imperative/python/src/graph_rt.h b/imperative/python/src/graph_rt.h index 85d84bd4..b9116211 100644 --- a/imperative/python/src/graph_rt.h +++ b/imperative/python/src/graph_rt.h @@ -44,15 +44,8 @@ class Rendezvous { public: Rendezvous() = default; Rendezvous(const Rendezvous& rhs) = delete; - Rendezvous(Rendezvous&& rhs) = default; + Rendezvous(Rendezvous&& rhs) = delete; Rendezvous& operator=(const Rendezvous& rhs) = delete; - Rendezvous& operator=(Rendezvous&& rhs) { - MGB_LOCK_GUARD(m_lock); - m_drop_next = rhs.m_drop_next; - m_read_ahead = rhs.m_read_ahead; - m_promise = std::move(rhs.m_promise); - return *this; - } R get() { std::future f; diff --git a/imperative/src/impl/opr_utility.cpp b/imperative/src/impl/opr_utility.cpp index d5f9a1c0..5a983f0d 100644 --- a/imperative/src/impl/opr_utility.cpp +++ b/imperative/src/impl/opr_utility.cpp @@ -123,6 +123,7 @@ OutputCallback::OutputCallback(Param param, const VarNodeArray& inputs, ->add_flag(VarNode::Flag::ALLOW_EMPTY_SHAPE) .add_flag(VarNode::Flag::NO_SYS_MEM_ALLOC) .dtype(DType::from_enum(DTypeEnum::Byte)); + add_equivalence_component>(this); } SymbolVar OutputCallback::make(Param param, const SymbolVarArray& inputs) { -- GitLab