root
/
MNN
mirror of https://github.com/alibaba/MNN.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix compile bug for c++ < 14

This commit is contained in:
xiaying 2021-06-16 15:09:21 +08:00
parent 02741a55ff
commit 8d9f86bc4a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/backend/cpu/compute/ConvInt8Winograd.cpp
View File

@ -566,7 +566,8 @@ bool ConvInt8Winograd::bestWinogradUnit(const Convolution2D *convOp, const Tenso
}
return partition;
};
auto partitionFunc = [=](const Vec& yAttrs, const Vec& xAttrs) -> std::tuple<bool, float, std::vector<UnitAttr>> {
typedef std::tuple<bool, float, std::vector<UnitAttr>> RES;
std::function<RES(const Vec&, const Vec&)> partitionFunc = [=](const Vec& yAttrs, const Vec& xAttrs) {
auto core = static_cast<CPUBackend*>(bn)->int8Functions();
bool support = true;
float optMAC = 0;
@ -596,7 +597,7 @@ bool ConvInt8Winograd::bestWinogradUnit(const Convolution2D *convOp, const Tenso
break;
}
}
return {support, optMAC, unitAttrs};
return std::make_tuple(support, optMAC, unitAttrs);
};
unitAttrs.clear();
float bestMAC = 1.0f * oc * ic * kernelY * kernelX * oh * ow;

16
source/backend/cpu/compute/WinogradInt8Helper.cpp
View File

@ -198,10 +198,10 @@ static void _sourceTransUnit4x4Pack16x16(const int8_t* srcStart, int8_t* dstStar
WinogradInt8Helper::SrcTransFunc WinogradInt8Helper::chooseSourceTransform(int alpha, int inPack, int outPack) {
std::map<std::tuple<int, int, int>, WinogradInt8Helper::SrcTransFunc> func_table = {
{{4, 4, 16}, _sourceTransUnit4x4Pack4x16},
{{4, 16, 4}, _sourceTransUnit4x4Pack16x4},
{{4, 4, 4}, _sourceTransUnit4x4Pack4x4},
{{4, 16, 16}, _sourceTransUnit4x4Pack16x16}
{std::make_tuple(4, 4, 16), _sourceTransUnit4x4Pack4x16},
{std::make_tuple(4, 16, 4), _sourceTransUnit4x4Pack16x4},
{std::make_tuple(4, 4, 4), _sourceTransUnit4x4Pack4x4},
{std::make_tuple(4, 16, 16), _sourceTransUnit4x4Pack16x16}
};
auto func_iter = func_table.find(std::make_tuple(alpha, inPack, outPack));
if (func_iter == func_table.end()) {
@ -251,8 +251,8 @@ static void _destTransformUnit4x3(const float* srcStart, float* dstStart, size_t
WinogradInt8Helper::DstTransFunc WinogradInt8Helper::chooseDestTransform(int alpha, int unit) {
std::map<std::tuple<int, int>, WinogradInt8Helper::DstTransFunc> func_table = {
{{4, 2}, _destTransformUnit4x2},
{{4, 3}, _destTransformUnit4x3},
{std::make_tuple(4, 2), _destTransformUnit4x2},
{std::make_tuple(4, 3), _destTransformUnit4x3},
};
auto func_iter = func_table.find(std::make_tuple(alpha, unit));
if (func_iter == func_table.end()) {
@ -299,8 +299,8 @@ static bool _weightTransUnit2x4(const int8_t* srcStart, int8_t* dstStart, size_t
static WeightTransFunc _chooseWeightTransform(int alpha, int kernel) {
std::map<std::tuple<int, int>, WeightTransFunc> func_table = {
{{4, 3}, _weightTransUnit3x4},
{{4, 2}, _weightTransUnit2x4},
{std::make_tuple(4, 3), _weightTransUnit3x4},
{std::make_tuple(4, 2), _weightTransUnit2x4},
};
auto func_iter = func_table.find(std::make_tuple(alpha, kernel));
if (func_iter == func_table.end()) {