Browse Source

fix(mgb/atlas): use dyn output alloc if enable dynamic batchsize

GitOrigin-RevId: 45a6c6ad51
tags/v1.0.0-rc1
Megvii Engine Team 4 years ago
parent
commit
2afceb4187
4 changed files with 19 additions and 6 deletions
  1. +2
    -2
      src/core/impl/graph/var_node.cpp
  2. +7
    -2
      src/core/impl/graph/var_node_mem_mgr.cpp
  3. +7
    -1
      src/core/impl/graph/var_node_mem_mgr.h
  4. +3
    -1
      src/core/include/megbrain/graph/var_node.h

+ 2
- 2
src/core/impl/graph/var_node.cpp View File

@@ -307,7 +307,7 @@ VarNode& VarNode::shape(const TensorShape &shape) {
return *this;
}

VarNode& VarNode::shape_alloc(const TensorShape &shape) {
VarNode& VarNode::shape_alloc(const TensorShape &shape, size_t size_req) {
mgb_assert(shape.ndim, "got empty shape in shape_alloc: "
"var=%s owner_opr=%s{%s}", cname(), owner_opr()->cname(),
owner_opr()->dyn_typeinfo()->name);
@@ -316,7 +316,7 @@ VarNode& VarNode::shape_alloc(const TensorShape &shape) {
" NO_SYS_MEM_ALLOC flag; actual var: %s",
cg::dump_var_info({this}).c_str());
ComputingGraphImpl::downcast(owner_graph())
->var_node_mem_manager().var_alloc_with_shape(this, shape);
->var_node_mem_manager().var_alloc_with_shape(this, shape, size_req);
return *this;
}



+ 7
- 2
src/core/impl/graph/var_node_mem_mgr.cpp View File

@@ -1239,13 +1239,18 @@ void VarNodeMemManager::make_dev_tensor_from_mem_plan_single(
}

void VarNodeMemManager::var_alloc_with_shape(VarNode* var,
const TensorShape& shape) {
const TensorShape& shape,
size_t size_req) {
mgb_assert(var->format().is_default(),
"dynamic shape is currently only supported for var with "
"default format; got %s",
var->format().to_string().c_str());
var->shape(shape);
auto size_req = var->dtype().size(shape.total_nr_elems());
if (size_req != 0) {
mgb_assert(var->dtype().size(shape.total_nr_elems()) <= size_req);
} else {
size_req = var->dtype().size(shape.total_nr_elems());
}

auto&& mplan = var->m_mem_plan;
if (!mplan.valid() || mplan.chunk().owner_var != var)


+ 7
- 1
src/core/impl/graph/var_node_mem_mgr.h View File

@@ -294,7 +294,13 @@ class VarNodeMemManager {
void add_layout_constraint_level(
VarNode *dest, LayoutConstraintLevel level);

void var_alloc_with_shape(VarNode *var, const TensorShape &shape);
/**
* \brief alloc var memory with shape.
*
* Alloc memory of size_seq if size_req != 0.
*/
void var_alloc_with_shape(VarNode* var, const TensorShape& shape,
size_t size_req = 0);

/*!
* \brief initialize mem plan for a single var


+ 3
- 1
src/core/include/megbrain/graph/var_node.h View File

@@ -462,8 +462,10 @@ class VarNode final: public GraphNodeBase {
* this var must have NO_SYS_MEM_ALLOC flag; if shape does not increase
* and original tensor storage is valid, it is guaranteed that old data
* would be retained.
*
* \warning Alloc size_req memory if size_req != 0.
*/
VarNode& shape_alloc(const TensorShape &shape);
VarNode& shape_alloc(const TensorShape &shape, size_t size_req = 0);

/*!
* \brief directly reset device tensor from another var


Loading…
Cancel
Save