提交 29316335 编写于 作者: Y yangfei

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/framework/program/program-optimize/node.cpp
#	src/operators/fusion_conv_add_add_prelu.cpp
#	src/operators/fusion_conv_add_add_prelu_op.h
#	src/operators/fusion_conv_add_prelu_op.cpp
#	src/operators/fusion_conv_add_prelu_op.h
#	src/operators/kernel/arm/conv_add_add_prelu_kernel.cpp
#	src/operators/kernel/arm/conv_add_prelu_kernel.cpp
#	src/operators/kernel/central-arm-func/conv_add_add_prelu_arm_func.h
#	src/operators/kernel/central-arm-func/conv_add_prelu_arm_func.h
#	src/operators/kernel/conv_add_add_prelu_kernel.h
#	src/operators/kernel/conv_add_prelu_kernel.h
#	src/operators/math/gemm.cpp
#	src/operators/math/gemm.h
#	src/operators/math/math_function.cpp
#	src/operators/op_param.h
#	tools/op.cmake
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册