提交 00b48dfe 编写于 作者: M Megvii Engine Team

Revert "perf(opr): use pin mem for param_pack_concat"

This reverts commit 95a0997372ff49d77642615bfa42c9be20ada185

GitOrigin-RevId: 12ab59b8aa9707cd0badb50844f51aa848bbc521
上级 e18afa0b
...@@ -1410,11 +1410,8 @@ SymbolVar ParamPackConcat::make(const SmallVector<SymbolVar>& inp, ...@@ -1410,11 +1410,8 @@ SymbolVar ParamPackConcat::make(const SmallVector<SymbolVar>& inp,
void ParamPackConcat::scn_do_execute() { void ParamPackConcat::scn_do_execute() {
mgb_assert(m_opr.comp_node() == comp_node()); mgb_assert(m_opr.comp_node() == comp_node());
auto&& inputs = input(); auto&& inputs = input();
if (!m_inp_ptr) { m_inp_ptr.resize(inputs.size() - 1);
void** raw_inp_ptr = (void**)comp_node().alloc_host(sizeof(void*)*inputs.size()); auto ptr = m_inp_ptr.data();
m_inp_ptr = {raw_inp_ptr, [comp_node=comp_node()](void** ptr){comp_node.free_host(ptr);}};
}
auto ptr = m_inp_ptr.get();
for (size_t i = 0; i < inputs.size() - 1; i++) { for (size_t i = 0; i < inputs.size() - 1; i++) {
ptr[i] = inputs[i]->dev_tensor().as_megdnn().raw_ptr; ptr[i] = inputs[i]->dev_tensor().as_megdnn().raw_ptr;
} }
......
...@@ -544,7 +544,7 @@ MGB_DEFINE_OPR_CLASS(Concat, cg::SingleCNOutshapePureByInshapeOprBase) // { ...@@ -544,7 +544,7 @@ MGB_DEFINE_OPR_CLASS(Concat, cg::SingleCNOutshapePureByInshapeOprBase) // {
*/ */
MGB_DEFINE_OPR_CLASS(ParamPackConcat, cg::SingleCNOperatorNodeBase) // { MGB_DEFINE_OPR_CLASS(ParamPackConcat, cg::SingleCNOperatorNodeBase) // {
//! input pointer buffer //! input pointer buffer
std::shared_ptr<void*> m_inp_ptr; SmallVector<void*> m_inp_ptr;
std::vector<dt_int32> m_offsets; std::vector<dt_int32> m_offsets;
intl::UniqPtrWithCN<megdnn::ParamPackConcat> m_opr; intl::UniqPtrWithCN<megdnn::ParamPackConcat> m_opr;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册