提交 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,
b2i_output);
};
// Warm-up
net.Setup(D);
for (int i = 0; i < 5; ++i) {
transform_func();
}
......
......@@ -188,15 +188,17 @@ bool OpsTestNet::Setup(mace::DeviceType device) {
}
}
}
auto op_def = op_defs_.back();
for (int i = 0; i < op_def.output_size(); ++i) {
ws_.RemoveTensor(op_def.output(i));
auto output_info = net_def.add_output_info();
output_info->set_name(op_def.output(i));
if (op_def.output_type_size() == op_def.output_size()) {
output_info->set_data_type(op_def.output_type(i));
} else {
output_info->set_data_type(DataType::DT_FLOAT);
if (!op_defs_.empty()) {
auto op_def = op_defs_.back();
for (int i = 0; i < op_def.output_size(); ++i) {
ws_.RemoveTensor(op_def.output(i));
auto output_info = net_def.add_output_info();
output_info->set_name(op_def.output(i));
if (op_def.output_type_size() == op_def.output_size()) {
output_info->set_data_type(op_def.output_type(i));
} else {
output_info->set_data_type(DataType::DT_FLOAT);
}
}
}
MemoryOptimizer mem_optimizer;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册