From d652064df9170458dc6c4b44fbdf26aaf3feef5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ivan=20Vagin/AI=20Tools=20Lab=20/SRR/Engineer/=EC=82=BC?= =?utf8?q?=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 14 Dec 2018 22:25:40 +0300 Subject: [PATCH] [nnc] Fixed caffe2 importer MIR operator names (#2683) * Don't name any MIR operators, except for i/o * Fixed default pooling stride size Signed-off-by: Ivan Vagin --- contrib/nnc/include/passes/caffe2_frontend/caffe2_importer.h | 5 ----- contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp | 7 +------ contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/contrib/nnc/include/passes/caffe2_frontend/caffe2_importer.h b/contrib/nnc/include/passes/caffe2_frontend/caffe2_importer.h index bcee736..7e8db0d 100644 --- a/contrib/nnc/include/passes/caffe2_frontend/caffe2_importer.h +++ b/contrib/nnc/include/passes/caffe2_frontend/caffe2_importer.h @@ -114,11 +114,6 @@ private: * @brief Mark output MIR nodes */ void setGraphOutputs(); - - /** - * @brief Set MIR node names - */ - void setIrNodeNames(); }; } // namespace nnc diff --git a/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp b/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp index 6f91b8b..537f7dd 100644 --- a/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp +++ b/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp @@ -83,7 +83,6 @@ mir::Graph* Caffe2Importer::createIR() { for (auto& op : _net->op()) createMIRNodesFromOp(op); - setIrNodeNames(); setGraphOutputs(); return _graph; @@ -278,14 +277,10 @@ void Caffe2Importer::setGraphOutputs() { // For now, we assume that: // - there is exactly one output; // - the output is from the last layer. + _lastMIROp->setName("out"); _graph->markOutput(_lastMIROp); } -void Caffe2Importer::setIrNodeNames() { - for (auto& item : _blobNameToIODescriptor) - item.second.op->setName(item.first); -} - const std::map Caffe2Importer::_operatorTypes = { {"Add", SupportedCaffe2OpType::add}, {"AveragePool", SupportedCaffe2OpType::averagePool}, diff --git a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp index c6ab0c1..f77c76a 100644 --- a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp +++ b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp @@ -216,7 +216,7 @@ Caffe2OpCreator::convertAveragePool(const std::vector& inputs, const OperatorDef& op) { Shape window_shape = getWindowShape(op, inputs); - int stride = getSingleArgument(op, "stride", 0); + int stride = getSingleArgument(op, "stride", 1); Shape strides = Shape({stride, stride}); ops::PoolOp::PoolingType pool_type = ops::PoolOp::PoolingType::AVG; @@ -307,7 +307,7 @@ std::vector Caffe2OpCreator::convertMaxPool(const std::vector