!10787 [MSLITE] arithmetic optimize
From: @ling_qiao_min Reviewed-by: Signed-off-by:pull/10787/MERGE
mindspore-ci-bot
4 years ago
committed by
Gitee
commit
0aac2892d8
@ -1,102 +0,0 @@
|
||||
/**
|
||||
* Copyright 2020 Huawei Technologies Co., Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "nnacl/arithmetic_common.h"
|
||||
#include "nnacl/nnacl_utils.h"
|
||||
|
||||
void TileOneDimension(const float *inData, float *outData, int dim, size_t ndim, const int *inShape,
|
||||
const int *inStrides, const int *outStrides, const int *multiple) {
|
||||
int srcDimSize = inShape[dim];
|
||||
if (dim == ndim - 1) {
|
||||
for (int i = 0; i < multiple[dim]; i++) {
|
||||
memcpy(outData, inData, srcDimSize * sizeof(float));
|
||||
outData += srcDimSize;
|
||||
}
|
||||
return;
|
||||
}
|
||||
for (size_t i = 0; i < srcDimSize; i++) {
|
||||
for (size_t j = 0; j < multiple[dim]; j++) {
|
||||
TileOneDimension(inData + inStrides[dim] * i, outData + outStrides[dim] * (i + j * srcDimSize), dim + 1, ndim,
|
||||
inShape, inStrides, outStrides, multiple);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TileOneDimensionUint8(const uint8_t *inData, uint8_t *outData, int dim, size_t ndim, const int *inShape,
|
||||
const int *inStrides, const int *outStrides, const int *multiple) {
|
||||
int srcDimSize = inShape[dim];
|
||||
if (dim == ndim - 1) {
|
||||
for (int i = 0; i < multiple[dim]; i++) {
|
||||
memcpy(outData, inData, srcDimSize * sizeof(uint8_t));
|
||||
outData += srcDimSize;
|
||||
}
|
||||
return;
|
||||
}
|
||||
for (size_t i = 0; i < srcDimSize; i++) {
|
||||
for (size_t j = 0; j < multiple[dim]; j++) {
|
||||
TileOneDimensionUint8(inData + inStrides[dim] * i, outData + outStrides[dim] * (i + j * srcDimSize), dim + 1,
|
||||
ndim, inShape, inStrides, outStrides, multiple);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ComputeStrides(const int *shape, int *strides, const int ndim) {
|
||||
int stride = 1;
|
||||
for (int i = ndim - 1; i >= 0; i--) {
|
||||
strides[i] = stride;
|
||||
stride *= shape[i];
|
||||
}
|
||||
}
|
||||
|
||||
void CalcMultiplesAndStrides(ArithmeticParameter *param) {
|
||||
NNACL_ASSERT(param->in_shape0_[i] != 0);
|
||||
NNACL_ASSERT(param->in_shape1_[i] != 0);
|
||||
for (size_t i = 0; i < param->ndim_; i++) {
|
||||
param->multiples0_[i] = param->out_shape_[i] / param->in_shape0_[i];
|
||||
param->multiples1_[i] = param->out_shape_[i] / param->in_shape1_[i];
|
||||
}
|
||||
// cal strides
|
||||
ComputeStrides(param->in_shape0_, param->in_strides0_, param->ndim_);
|
||||
ComputeStrides(param->in_shape1_, param->in_strides1_, param->ndim_);
|
||||
ComputeStrides(param->out_shape_, param->out_strides_, param->ndim_);
|
||||
}
|
||||
|
||||
void TileDimensions(const float *data0, const float *data1, float *tile_data0, float *tile_data1,
|
||||
ArithmeticParameter *param) {
|
||||
CalcMultiplesAndStrides(param);
|
||||
TileOneDimension(data0, tile_data0, 0, param->ndim_, param->in_shape0_, param->in_strides0_, param->out_strides_,
|
||||
param->multiples0_);
|
||||
TileOneDimension(data1, tile_data1, 0, param->ndim_, param->in_shape1_, param->in_strides1_, param->out_strides_,
|
||||
param->multiples1_);
|
||||
}
|
||||
|
||||
void TileDimensionsUint8(const uint8_t *data0, const uint8_t *data1, uint8_t *tile_data0, uint8_t *tile_data1,
|
||||
ArithmeticParameter *param) {
|
||||
CalcMultiplesAndStrides(param);
|
||||
TileOneDimensionUint8(data0, tile_data0, 0, param->ndim_, param->in_shape0_, param->in_strides0_, param->out_strides_,
|
||||
param->multiples0_);
|
||||
TileOneDimensionUint8(data1, tile_data1, 0, param->ndim_, param->in_shape1_, param->in_strides1_, param->out_strides_,
|
||||
param->multiples1_);
|
||||
}
|
||||
|
||||
void TileDimensionsInt8(const int8_t *data0, const int8_t *data1, int8_t *tile_data0, int8_t *tile_data1,
|
||||
ArithmeticParameter *param) {
|
||||
CalcMultiplesAndStrides(param);
|
||||
TileOneDimensionUint8((uint8_t *)(data0), (uint8_t *)(tile_data0), 0, param->ndim_, param->in_shape0_,
|
||||
param->in_strides0_, param->out_strides_, param->multiples0_);
|
||||
TileOneDimensionUint8((uint8_t *)(data1), (uint8_t *)(tile_data1), 0, param->ndim_, param->in_shape1_,
|
||||
param->in_strides1_, param->out_strides_, param->multiples1_);
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
/**
|
||||
* Copyright 2020 Huawei Technologies Co., Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
#ifndef MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_
|
||||
#define MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_
|
||||
|
||||
#ifdef ENABLE_NEON
|
||||
#include <arm_neon.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
#include "nnacl/op_base.h"
|
||||
#include "nnacl/arithmetic_common.h"
|
||||
|
||||
typedef struct ArithmeticParameter {
|
||||
OpParameter op_parameter_;
|
||||
bool broadcasting_;
|
||||
size_t ndim_;
|
||||
int activation_type_;
|
||||
int in_shape0_[10];
|
||||
int in_elements_num0_;
|
||||
int in_shape1_[10];
|
||||
int in_elements_num1_;
|
||||
|
||||
int out_shape_[10];
|
||||
int out_elements_num_;
|
||||
|
||||
int in_strides0_[10];
|
||||
int in_strides1_[10];
|
||||
int out_strides_[10];
|
||||
|
||||
int multiples0_[10];
|
||||
int multiples1_[10];
|
||||
} ArithmeticParameter;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
void TileOneDimension(const float *inData, float *outData, int dim, size_t ndim, const int *inShape,
|
||||
const int *inStrides, const int *outStrides, const int *multiple);
|
||||
void ComputeStrides(const int *shape, int *strides, const int ndim);
|
||||
|
||||
void CalcMultiplesAndStrides(ArithmeticParameter *param);
|
||||
|
||||
void TileOneDimensionUint8(const uint8_t *inData, uint8_t *outData, int dim, size_t ndim, const int *inShape,
|
||||
const int *inStrides, const int *outStrides, const int *multiple);
|
||||
void TileDimensions(const float *data0, const float *data1, float *tile_data0, float *tile_data1,
|
||||
ArithmeticParameter *param);
|
||||
void TileDimensionsUint8(const uint8_t *data0, const uint8_t *data1, uint8_t *tile_data0, uint8_t *tile_data1,
|
||||
ArithmeticParameter *param);
|
||||
void TileDimensionsInt8(const int8_t *data0, const int8_t *data1, int8_t *tile_data0, int8_t *tile_data1,
|
||||
ArithmeticParameter *param);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_
|
||||
@ -1,22 +0,0 @@
|
||||
/**
|
||||
* Copyright 2020 Huawei Technologies Co., Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_
|
||||
#define MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_
|
||||
|
||||
#include "nnacl/op_attribute.h"
|
||||
|
||||
#endif // MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue