2019-04-17 10:49:11 +08:00
|
|
|
//
|
|
|
|
// ConvolutionTiledExecutor.hpp
|
|
|
|
// MNN
|
|
|
|
//
|
|
|
|
// Created by MNN on 2018/07/16.
|
|
|
|
// Copyright © 2018, Alibaba Group Holding Limited
|
|
|
|
//
|
|
|
|
|
|
|
|
#ifndef ConvolutionTiledExecutor_hpp
|
|
|
|
#define ConvolutionTiledExecutor_hpp
|
|
|
|
|
|
|
|
#include <functional>
|
2019-12-27 22:16:57 +08:00
|
|
|
#include "backend/cpu/CPUConvolution.hpp"
|
- 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
|
|
|
// Tiled Slide Window or Im2Col + GEMM
|
2019-04-17 10:49:11 +08:00
|
|
|
namespace MNN {
|
2019-06-17 20:10:35 +08:00
|
|
|
class ConvolutionTiledExecutorBasic : public CPUConvolution {
|
|
|
|
public:
|
|
|
|
ConvolutionTiledExecutorBasic(const Convolution2DCommon *common, Backend *b) : CPUConvolution(common, b) {
|
2021-01-06 16:29:37 +08:00
|
|
|
// Do nothing
|
2019-06-17 20:10:35 +08:00
|
|
|
}
|
|
|
|
virtual ~ConvolutionTiledExecutorBasic() = default;
|
|
|
|
virtual ErrorCode onExecute(const std::vector<Tensor *> &inputs, const std::vector<Tensor *> &outputs) override;
|
|
|
|
virtual ErrorCode onResize(const std::vector<Tensor *> &inputs, const std::vector<Tensor *> &outputs) override;
|
|
|
|
|
|
|
|
protected:
|
2020-07-04 01:21:30 +08:00
|
|
|
Tensor mTempBufferTranspose;
|
2020-07-23 10:35:12 +08:00
|
|
|
std::pair<int, std::function<void(int)>> mFunction;
|
2019-06-17 20:10:35 +08:00
|
|
|
};
|
|
|
|
class ConvolutionTiledExecutor : public Execution {
|
2019-04-17 10:49:11 +08:00
|
|
|
public:
|
|
|
|
ConvolutionTiledExecutor(const Convolution2DCommon *common, Backend *b, const float *originWeight,
|
|
|
|
size_t originWeightSize, const float *bias, size_t biasSize);
|
2021-01-06 16:29:37 +08:00
|
|
|
ConvolutionTiledExecutor(std::shared_ptr<CPUConvolution::Resource> res, const Convolution2DCommon *common, Backend* b);
|
2019-04-17 10:49:11 +08:00
|
|
|
virtual ~ConvolutionTiledExecutor();
|
2020-12-15 18:14:15 +08:00
|
|
|
|
2019-06-17 20:10:35 +08:00
|
|
|
virtual ErrorCode onExecute(const std::vector<Tensor *> &inputs, const std::vector<Tensor *> &outputs) override {
|
|
|
|
return mProxy->onExecute(inputs, outputs);
|
|
|
|
}
|
|
|
|
virtual ErrorCode onResize(const std::vector<Tensor *> &inputs, const std::vector<Tensor *> &outputs) override {
|
2021-01-06 16:29:37 +08:00
|
|
|
mInputs = {inputs[0], mResource->mWeight.get(), mResource->mBias.get()};
|
2019-06-17 20:10:35 +08:00
|
|
|
return mProxy->onResize(mInputs, outputs);
|
|
|
|
}
|
2021-01-06 16:29:37 +08:00
|
|
|
virtual bool onClone(Backend* bn, const Op* op, Execution** dst) override;
|
2020-12-15 18:14:15 +08:00
|
|
|
|
2019-04-17 10:49:11 +08:00
|
|
|
protected:
|
2019-06-17 20:10:35 +08:00
|
|
|
std::shared_ptr<ConvolutionTiledExecutorBasic> mProxy;
|
|
|
|
std::vector<Tensor *> mInputs;
|
2021-01-06 16:29:37 +08:00
|
|
|
std::shared_ptr<CPUConvolution::Resource> mResource;
|
2019-04-17 10:49:11 +08:00
|
|
|
};
|
|
|
|
} // namespace MNN
|
|
|
|
|
|
|
|
#endif /* ConvolutionTiledExecutor_hpp */
|