提交 4866947b 编写于 作者: 李寅

Merge branch 'optest-bug' into 'master'

Fix op_test_util bug when there is no operation.

See merge request !1021
...@@ -50,8 +50,6 @@ void FilterBufferToImage(int iters, ...@@ -50,8 +50,6 @@ void FilterBufferToImage(int iters,
b2i_output); b2i_output);
}; };
// Warm-up
net.Setup(D);
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
transform_func(); transform_func();
} }
......
...@@ -188,6 +188,7 @@ bool OpsTestNet::Setup(mace::DeviceType device) { ...@@ -188,6 +188,7 @@ bool OpsTestNet::Setup(mace::DeviceType device) {
} }
} }
} }
if (!op_defs_.empty()) {
auto op_def = op_defs_.back(); auto op_def = op_defs_.back();
for (int i = 0; i < op_def.output_size(); ++i) { for (int i = 0; i < op_def.output_size(); ++i) {
ws_.RemoveTensor(op_def.output(i)); ws_.RemoveTensor(op_def.output(i));
...@@ -199,6 +200,7 @@ bool OpsTestNet::Setup(mace::DeviceType device) { ...@@ -199,6 +200,7 @@ bool OpsTestNet::Setup(mace::DeviceType device) {
output_info->set_data_type(DataType::DT_FLOAT); output_info->set_data_type(DataType::DT_FLOAT);
} }
} }
}
MemoryOptimizer mem_optimizer; MemoryOptimizer mem_optimizer;
net_ = make_unique<SerialNet>( net_ = make_unique<SerialNet>(
op_registry_.get(), op_registry_.get(),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册