MNN/tools/converter/source/optimizer/TemplateMerge.cpp

49 lines
1.5 KiB
C++
Raw Normal View History

- build: - unify schema building in core and converter; - add more build script for android; - add linux build script for python; - ops impl: - add floor mod support in binary; - use eltwise impl in add/max/sub/mul binary for optimization; - remove fake double support in cast; - fix 5d support for concat; - add adjX and adjY support for batch matmul; - optimize conv2d back prop filter; - add pad mode support for conv3d; - fix bug in conv2d & conv depthwise with very small feature map; - optimize binary without broacast; - add data types support for gather; - add gather ND support; - use uint8 data type in gather v2; - add transpose support for matmul; - add matrix band part; - add dim != 4 support for padding, reshape & tensor convert; - add pad type support for pool3d; - make ops based on TensorFlow Lite quantization optional; - add all & any support for reduction; - use type in parameter as output type in reduction; - add int support for unary; - add variable weight support for conv2d; - fix conv2d depthwise weights initialization; - fix type support for transpose; - fix grad outputs count for reduce grad and reshape grad; - fix priorbox & detection output; - fix metal softmax error; - python: - add runSessionWithCallBackInfo interface; - add max nodes limit (1400) for visualization tool; - fix save error in python3; - align default dim; - convert: - add extra design for optimization; - add more post converting optimizers; - add caffe v1 weights blob support; - add cast, unary, conv transpose support for onnx model; - optimize batchnorm, conv with variable weights, prelu, reshape, slice, upsample for onnx model; - add cos/sin/atan/tan support for unary for tensorflow model; - add any/all support for reduction for tensorflow model; - add elu, conv3d, pool3d support for tensorflow model; - optimize argmax, batchnorm, concat, batch to space, conv with variable weights, prelu, slice for tensorflow model; - others: - fix size computer lock; - fix thread pool deadlock; - add express & parameters in express; - rewrite blitter chooser without static map; - add tests for expr;
2019-10-29 13:37:26 +08:00
//
// TemplateMerge.cpp
// MNNConverter
//
// Created by MNN on 2019/09/16.
// Copyright © 2018, Alibaba Group Holding Limited
//
#include "TemplateMerge.hpp"
#include <set>
namespace MNN {
namespace Express {
bool TemplateMerge::onExecute(const std::vector<VARP>& outputs, std::shared_ptr<Parameters> parameters) {
bool hasChange = false;
do {
hasChange = false;
for (auto& iter : mTemplates) {
std::set<VARP> invalidVARP;
auto execute = Variable::getExecuteOrder(outputs);
for (auto var : execute) {
if (invalidVARP.find(var) != invalidVARP.end()) {
continue;
}
if (iter.second.first(var)) {
hasChange = hasChange || iter.second.second(var);
} else {
invalidVARP.insert(var);
}
}
}
} while (hasChange);
return true;
}
TemplateMerge& TemplateMerge::getInstance(const std::string& pass) {
static std::map<std::string, TemplateMerge> gMerge;
if (gMerge.find(pass) == gMerge.end()) {
gMerge.insert(std::make_pair(pass, TemplateMerge()));
}
auto iter = gMerge.find(pass);
return iter->second;
}
void TemplateMerge::insertTemplate(std::string key, std::function<bool(VARP)> compare,
std::function<bool(VARP)> transform) {
mTemplates.insert(std::make_pair(key, std::make_pair(compare, transform)));
}
} // namespace Express
} // namespace MNN