Browse Source

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

This reverts commit 95a0997372

GitOrigin-RevId: 12ab59b8aa
release-1.4
Megvii Engine Team 4 years ago
parent
commit
aab6b37019
2 changed files with 3 additions and 6 deletions
  1. +2
    -5
      src/opr/impl/tensor_manip.cpp
  2. +1
    -1
      src/opr/include/megbrain/opr/tensor_manip.h

+ 2
- 5
src/opr/impl/tensor_manip.cpp View File

@@ -1410,11 +1410,8 @@ SymbolVar ParamPackConcat::make(const SmallVector<SymbolVar>& inp,
void ParamPackConcat::scn_do_execute() {
mgb_assert(m_opr.comp_node() == comp_node());
auto&& inputs = input();
if (!m_inp_ptr) {
void** raw_inp_ptr = (void**)comp_node().alloc_host(sizeof(void*)*inputs.size());
m_inp_ptr = {raw_inp_ptr, [comp_node=comp_node()](void** ptr){comp_node.free_host(ptr);}};
}
auto ptr = m_inp_ptr.get();
m_inp_ptr.resize(inputs.size() - 1);
auto ptr = m_inp_ptr.data();
for (size_t i = 0; i < inputs.size() - 1; i++) {
ptr[i] = inputs[i]->dev_tensor().as_megdnn().raw_ptr;
}


+ 1
- 1
src/opr/include/megbrain/opr/tensor_manip.h View File

@@ -544,7 +544,7 @@ MGB_DEFINE_OPR_CLASS(Concat, cg::SingleCNOutshapePureByInshapeOprBase) // {
*/
MGB_DEFINE_OPR_CLASS(ParamPackConcat, cg::SingleCNOperatorNodeBase) // {
//! input pointer buffer
std::shared_ptr<void*> m_inp_ptr;
SmallVector<void*> m_inp_ptr;
std::vector<dt_int32> m_offsets;
intl::UniqPtrWithCN<megdnn::ParamPackConcat> m_opr;



Loading…
Cancel
Save