2019-04-17 10:49:11 +08:00
|
|
|
//
|
|
|
|
|
// ShapeQuantizedReshape.cpp
|
|
|
|
|
// MNN
|
|
|
|
|
//
|
|
|
|
|
// Created by MNN on 2019/01/10.
|
|
|
|
|
// Copyright © 2018, Alibaba Group Holding Limited
|
|
|
|
|
//
|
- 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
|
|
|
#ifdef MNN_SUPPORT_TFLITE_QUAN
|
2019-12-27 22:16:57 +08:00
|
|
|
#include "core/Macro.h"
|
|
|
|
|
#include "core/SizeComputer.hpp"
|
2019-04-17 10:49:11 +08:00
|
|
|
|
|
|
|
|
namespace MNN {
|
|
|
|
|
class QuantizedReshapeComputer : public SizeComputer {
|
|
|
|
|
public:
|
|
|
|
|
virtual bool onComputeSize(const MNN::Op* op, const std::vector<Tensor*>& inputs,
|
|
|
|
|
const std::vector<Tensor*>& outputs) const override {
|
|
|
|
|
auto layer_param = op->main_as_QuantizedReshape();
|
|
|
|
|
|
|
|
|
|
auto input = inputs[0];
|
|
|
|
|
auto output = outputs[0];
|
|
|
|
|
|
|
|
|
|
const int32_t* dim_data = nullptr;
|
|
|
|
|
int32_t dimSize = 0;
|
|
|
|
|
bool istflite = (layer_param->modelFormat() == ModeFormat_TFLITE);
|
|
|
|
|
if (true == istflite) {
|
|
|
|
|
dimSize = layer_param->dims()->size();
|
|
|
|
|
dim_data = layer_param->dims()->data();
|
|
|
|
|
} else {
|
|
|
|
|
MNN_ASSERT(1 == inputs[1]->buffer().dimensions);
|
|
|
|
|
auto shape = inputs[1];
|
|
|
|
|
dimSize = shape->buffer().dim[0].extent;
|
|
|
|
|
dim_data = shape->host<int32_t>();
|
|
|
|
|
auto output_min = outputs[1]->buffer();
|
|
|
|
|
auto output_max = outputs[2]->buffer();
|
|
|
|
|
|
|
|
|
|
output_min.dim[0].extent = output_min.dim[1].extent = output_min.dim[2].extent = output_min.dim[3].extent =
|
|
|
|
|
1;
|
|
|
|
|
output_min.dimensions = 0;
|
|
|
|
|
output_max.dim[0].extent = output_max.dim[1].extent = output_max.dim[2].extent = output_max.dim[3].extent =
|
|
|
|
|
1;
|
|
|
|
|
output_max.dimensions = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int num_element = 1;
|
|
|
|
|
for (int i = 0; i < input->buffer().dimensions; i++) {
|
|
|
|
|
num_element *= input->buffer().dim[i].extent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
output->buffer().dimensions = dimSize;
|
|
|
|
|
|
|
|
|
|
int count_non_minus1 = 1;
|
|
|
|
|
for (int i = 0; i < dimSize; i++) {
|
|
|
|
|
if (dim_data[i] != -1) {
|
|
|
|
|
count_non_minus1 *= dim_data[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MNN_ASSERT((num_element % count_non_minus1) == 0)
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < dimSize; i++) {
|
|
|
|
|
int shape_dim = dim_data[i];
|
|
|
|
|
if (shape_dim == -1) {
|
|
|
|
|
shape_dim = num_element / count_non_minus1;
|
|
|
|
|
}
|
|
|
|
|
output->buffer().dim[i].extent = shape_dim;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
output->setType(DataType_DT_UINT8);
|
2019-08-22 20:13:46 +08:00
|
|
|
TensorUtils::getDescribe(outputs[0])->dimensionFormat = TensorUtils::getDescribe(inputs[0])->dimensionFormat;
|
2019-04-17 10:49:11 +08:00
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
REGISTER_SHAPE(QuantizedReshapeComputer, OpType_QuantizedReshape);
|
|
|
|
|
} // namespace MNN
|
- 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
|
|
|
#endif
|