m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!4099 move gllo under tools directory

Browse Source 
Merge pull request !4099 from zhaizhiqiang/master
pull/4099/MERGE
mindspore-ci-bot 5 years ago committed by Gitee
parent ec42bce995 35514d36b7
commit 0fe9f5e32a
553 changed files with 1341 additions and 1338 deletions
Show Stats Download Patch File Download Diff File

2
mindspore/lite/src/executor.cc
Unescape View File

@ -15,7 +15,7 @@
*/
#include "mindspore/lite/src/executor.h"
#include "src/runtime/kernel/arm/opclib/pack.h"
#include "src/runtime/kernel/arm/nnacl/pack.h"
#include "include/errorcode.h"
#include "src/common/ms_tensor_utils.h"

2
mindspore/lite/src/kernel_registry.cc
Unescape View File

@ -20,7 +20,7 @@
#include <asm/hwcap.h>
#include "common/utils.h"
#include "utils/log_adapter.h"
#include "src/runtime/kernel/arm/opclib/optimized_kernel.h"
#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h"
#endif
using mindspore::kernel::kCPU;

2
mindspore/lite/src/lite_kernel.h
Unescape View File

@ -21,7 +21,7 @@
#ifdef ENABLE_ARM
#include <arm_neon.h>
#endif
#include "src/runtime/kernel/arm/opclib/op_base.h"
#include "src/runtime/kernel/arm/nnacl/op_base.h"
#include "include/context.h"
#include "src/ir/tensor.h"
#include "src/ops/ops.h"

2
mindspore/lite/src/ops/resize.cc
Unescape View File

@ -18,7 +18,7 @@
#include "include/errorcode.h"
#include "utils/log_adapter.h"
#include "src/ir/tensor.h"
#include "src/runtime/kernel/arm/opclib/op_base.h"
#include "src/runtime/kernel/arm/nnacl/op_base.h"
namespace mindspore::lite {
namespace {

2
mindspore/lite/src/ops/strided_slice.cc
Unescape View File

@ -17,7 +17,7 @@
#include <vector>
#include "include/errorcode.h"
#include "src/ops/ops.h"
#include "src/runtime/kernel/arm/opclib/op_base.h"
#include "src/runtime/kernel/arm/nnacl/op_base.h"
#include "utils/log_adapter.h"
#include "src/ir/tensor.h"

96
mindspore/lite/src/populate_parameter.cc
Unescape View File

@ -19,56 +19,56 @@
#include "src/ops/ops.h"
#include "utils/log_adapter.h"
#include "schema/ops_generated.h"
#include "src/runtime/kernel/arm/opclib/op_base.h"
#include "src/runtime/kernel/arm/opclib/fp32/arg_min_max.h"
#include "src/runtime/kernel/arm/opclib/fp32/cast.h"
#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
#include "src/runtime/kernel/arm/opclib/fp32/slice.h"
#include "src/runtime/kernel/arm/opclib/fp32/broadcast_to.h"
#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
#include "src/runtime/kernel/arm/opclib/fp32/stack.h"
#include "src/runtime/kernel/arm/opclib/unstack.h"
#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
#include "src/runtime/kernel/arm/opclib/conv_parameter.h"
#include "src/runtime/kernel/arm/opclib/fp32/pooling.h"
#include "src/runtime/kernel/arm/opclib/matmul.h"
#include "src/runtime/kernel/arm/opclib/softmax_parameter.h"
#include "src/runtime/kernel/arm/opclib/tile.h"
#include "src/runtime/kernel/arm/opclib/fp32/topk.h"
#include "src/runtime/kernel/arm/opclib/fp32/reduce.h"
#include "src/runtime/kernel/arm/opclib/fp32/activation.h"
#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
#include "src/runtime/kernel/arm/opclib/fused_batchnorm.h"
#include "src/runtime/kernel/arm/opclib/fp32/batchnorm.h"
#include "src/runtime/kernel/arm/opclib/power.h"
#include "src/runtime/kernel/arm/opclib/fp32/range.h"
#include "src/runtime/kernel/arm/opclib/fp32/local_response_norm.h"
#include "src/runtime/kernel/arm/opclib/fp32/expandDims.h"
#include "src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h"
#include "src/runtime/kernel/arm/opclib/pad_parameter.h"
#include "src/runtime/kernel/arm/opclib/fp32/fill.h"
#include "src/runtime/kernel/arm/opclib/transpose.h"
#include "src/runtime/kernel/arm/opclib/split_parameter.h"
#include "src/runtime/kernel/arm/opclib/squeeze.h"
#include "src/runtime/kernel/arm/opclib/fp32/gather.h"
#include "src/runtime/kernel/arm/opclib/fp32/reverse.h"
#include "src/runtime/kernel/arm/opclib/reverse_sequence.h"
#include "src/runtime/kernel/arm/opclib/unique.h"
#include "src/runtime/kernel/arm/opclib/scale.h"
#include "src/runtime/kernel/arm/opclib/fp32/gatherNd.h"
#include "src/runtime/kernel/arm/opclib/resize.h"
#include "src/runtime/kernel/arm/opclib/scatter_nd.h"
#include "src/runtime/kernel/arm/opclib/batch_to_space.h"
#include "src/runtime/kernel/arm/opclib/fp32/crop.h"
#include "src/runtime/kernel/arm/nnacl/op_base.h"
#include "src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h"
#include "src/runtime/kernel/arm/nnacl/fp32/cast.h"
#include "src/runtime/kernel/arm/nnacl/concat_parameter.h"
#include "src/runtime/kernel/arm/nnacl/fp32/slice.h"
#include "src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h"
#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h"
#include "src/runtime/kernel/arm/nnacl/fp32/stack.h"
#include "src/runtime/kernel/arm/nnacl/unstack.h"
#include "src/runtime/kernel/arm/nnacl/depth_to_space.h"
#include "src/runtime/kernel/arm/nnacl/conv_parameter.h"
#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h"
#include "src/runtime/kernel/arm/nnacl/matmul.h"
#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h"
#include "src/runtime/kernel/arm/nnacl/tile.h"
#include "src/runtime/kernel/arm/nnacl/fp32/topk.h"
#include "src/runtime/kernel/arm/nnacl/fp32/reduce.h"
#include "src/runtime/kernel/arm/nnacl/fp32/activation.h"
#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
#include "src/runtime/kernel/arm/nnacl/fused_batchnorm.h"
#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h"
#include "src/runtime/kernel/arm/nnacl/power.h"
#include "src/runtime/kernel/arm/nnacl/fp32/range.h"
#include "src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h"
#include "src/runtime/kernel/arm/nnacl/fp32/expandDims.h"
#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h"
#include "src/runtime/kernel/arm/nnacl/pad_parameter.h"
#include "src/runtime/kernel/arm/nnacl/fp32/fill.h"
#include "src/runtime/kernel/arm/nnacl/transpose.h"
#include "src/runtime/kernel/arm/nnacl/split_parameter.h"
#include "src/runtime/kernel/arm/nnacl/squeeze.h"
#include "src/runtime/kernel/arm/nnacl/fp32/gather.h"
#include "src/runtime/kernel/arm/nnacl/fp32/reverse.h"
#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h"
#include "src/runtime/kernel/arm/nnacl/unique.h"
#include "src/runtime/kernel/arm/nnacl/scale.h"
#include "src/runtime/kernel/arm/nnacl/fp32/gatherNd.h"
#include "src/runtime/kernel/arm/nnacl/resize.h"
#include "src/runtime/kernel/arm/nnacl/scatter_nd.h"
#include "src/runtime/kernel/arm/nnacl/batch_to_space.h"
#include "src/runtime/kernel/arm/nnacl/fp32/crop.h"
#include "src/runtime/kernel/arm/fp32/flatten.h"
#include "src/runtime/kernel/arm/opclib/fp32/unsqueeze.h"
#include "src/runtime/kernel/arm/opclib/fp32/one_hot.h"
#include "src/runtime/kernel/arm/opclib/strided_slice.h"
#include "src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h"
#include "src/runtime/kernel/arm/nnacl/fp32/one_hot.h"
#include "src/runtime/kernel/arm/nnacl/strided_slice.h"
#include "src/runtime/kernel/arm/base/prior_box.h"
#include "src/runtime/kernel/arm/opclib/fp32/space_to_depth.h"
#include "src/runtime/kernel/arm/opclib/fp32/space_to_batch.h"
#include "src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h"
#include "src/runtime/kernel/arm/opclib/fp32/lstm.h"
#include "src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h"
#include "src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h"
#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h"
#include "src/runtime/kernel/arm/nnacl/fp32/lstm.h"
namespace mindspore::kernel {
OpParameter *PopulateBatchNorm(const lite::Primitive *primitive) {

2
mindspore/lite/src/populate_parameter.h
Unescape View File

@ -19,7 +19,7 @@
#include "schema/model_generated.h"
#include "src/ops/ops.h"
#include "src/runtime/kernel/arm/opclib/op_base.h"
#include "src/runtime/kernel/arm/nnacl/op_base.h"
namespace mindspore::kernel {
typedef OpParameter *(*PopulateParameterFunc)(const lite::Primitive *);

18
mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt
Unescape View File

@ -1,29 +1,29 @@
file(GLOB KERNEL_SRC
${CMAKE_CURRENT_SOURCE_DIR}/base/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/opclib/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/opclib/fp32/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/opclib/int8/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/opclib/quantization/*.cc
nnacl/*.cc
nnacl/fp32/*.cc
nnacl/int8/*.cc
nnacl/quantization/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/fp32/*.cc
${CMAKE_CURRENT_SOURCE_DIR}/int8/*.cc
)
if (PLATFORM_ARM64)
# assembly
file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm64/*.s
${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm64/*.S)
file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s
nnacl/assembly/arm64/*.S)
set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})
endif()
if (PLATFORM_ARM32)
# assembly
file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm32/*.s
${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm32/*.S
file(GLOB ASSEMBLY_SRC nnacl/assembly/arm32/*.s
nnacl/assembly/arm32/*.S
)
set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})
endif()
add_library(cpu_kernel_mid_ OBJECT ${KERNEL_SRC})
add_subdirectory(opclib)
add_subdirectory(nnacl)

2
mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc
Unescape View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "src/runtime/kernel/arm/base/arg_min_max_base.h"
#include "src/runtime/kernel/arm/opclib/arg_min_max.h"
#include "src/runtime/kernel/arm/nnacl/arg_min_max.h"
#include "src/runtime/kernel/arm/fp32/argminmax.h"
#include "src/runtime/kernel/arm/int8/argminmax_int8.h"
#include "schema/model_generated.h"

2
mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.cc
Unescape View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "src/runtime/kernel/arm/base/batch_to_space_base.h"
#include "src/runtime/kernel/arm/opclib/batch_to_space.h"
#include "src/runtime/kernel/arm/nnacl/batch_to_space.h"
#include "src/runtime/kernel/arm/fp32/batch_to_space.h"
#include "src/runtime/kernel/arm/int8/batch_to_space_int8.h"
#include "schema/model_generated.h"

2
mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
#include "src/runtime/kernel/arm/nnacl/concat_parameter.h"
namespace mindspore::kernel {
class BatchToSpaceBaseCPUKernel : public LiteKernel {

2
mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc
Unescape View File

@ -17,7 +17,7 @@
#include <vector>
#include "src/runtime/kernel/arm/int8/concat_int8.h"
#include "src/runtime/kernel/arm/fp32/concat.h"
#include "src/runtime/kernel/arm/opclib/fp32/concat.h"
#include "src/runtime/kernel/arm/nnacl/fp32/concat.h"
#include "schema/model_generated.h"
#include "src/kernel_factory.h"
#include "include/errorcode.h"

2
mindspore/lite/src/runtime/kernel/arm/base/concat_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
#include "src/runtime/kernel/arm/nnacl/concat_parameter.h"
#include "src/runtime/kernel/arm/base/layout_transform.h"
using mindspore::lite::Context;

2
mindspore/lite/src/runtime/kernel/arm/base/crop_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/crop_parameter.h"
#include "src/runtime/kernel/arm/nnacl/crop_parameter.h"
using mindspore::lite::Context;

4
mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.cc
Unescape View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "src/runtime/kernel/arm/base/depth_to_space_base.h"
#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
#include "src/runtime/kernel/arm/nnacl/depth_to_space.h"
#include "src/runtime/kernel/arm/fp32/depth_to_space.h"
#include "src/runtime/kernel/arm/int8/depth_to_space_int8.h"
#include "src/runtime/kernel/arm/opclib/arithmetic_common.h"
#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h"
#include "schema/model_generated.h"
#include "src/kernel_factory.h"
#include "include/errorcode.h"

2
mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
#include "src/runtime/kernel/arm/nnacl/depth_to_space.h"
namespace mindspore::kernel {
class DepthToSpaceBaseCPUKernel : public LiteKernel {

2
mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h
Unescape View File

@ -20,7 +20,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "include/context.h"
#include "src/runtime/kernel/arm/opclib/matmul.h"
#include "src/runtime/kernel/arm/nnacl/matmul.h"
using mindspore::lite::Context;

2
mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h
Unescape View File

@ -20,7 +20,7 @@
#ifdef ENABLE_FP16
#include <arm_neon.h>
#endif
#include "src/runtime/kernel/arm/opclib/pack.h"
#include "src/runtime/kernel/arm/nnacl/pack.h"
#include "ir/dtype/type_id.h"
#include "schema/ops_generated.h"

2
mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h
Unescape View File

@ -20,7 +20,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "include/context.h"
#include "src/runtime/kernel/arm/opclib/matmul.h"
#include "src/runtime/kernel/arm/nnacl/matmul.h"
using mindspore::lite::Context;

2
mindspore/lite/src/runtime/kernel/arm/base/matrix.h
Unescape View File

@ -19,7 +19,7 @@
#include <stdlib.h>
#include <vector>
#include "src/runtime/kernel/arm/opclib/winograd_utils.h"
#include "src/runtime/kernel/arm/nnacl/winograd_utils.h"
namespace mindspore::kernel {
class Matrix {

2
mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/fp32/pooling.h"
#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h"
#include "include/errorcode.h"
using mindspore::lite::Context;

4
mindspore/lite/src/runtime/kernel/arm/base/prior_box.h
Unescape View File

@ -19,8 +19,8 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
#include "src/runtime/kernel/arm/opclib/prior_box.h"
#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h"
#include "src/runtime/kernel/arm/nnacl/prior_box.h"
using mindspore::lite::Context;

2
mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc
Unescape View File

@ -15,7 +15,7 @@
*/
#include "src/runtime/kernel/arm/base/quant_dtype_cast.h"
#include <vector>
#include "src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h"
#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h"
#include "src/runtime/runtime_api.h"
#include "src/kernel_registry.h"
#include "schema/model_generated.h"

2
mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h
Unescape View File

@ -19,7 +19,7 @@
#include <vector>
#include "src/lite_kernel.h"
#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h"
using mindspore::lite::Context;

2
mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc
Unescape View File

@ -18,7 +18,7 @@
#include <vector>
#include "src/runtime/kernel/arm/int8/softmax_int8.h"
#include "src/runtime/kernel/arm/fp32/softmax.h"
#include "src/runtime/kernel/arm/opclib/fp32/softmax.h"
#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h"
#include "schema/model_generated.h"
#include "src/kernel_factory.h"
#include "include/errorcode.h"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save