Merge pull request #44446 from advaitjain:update-cmsis-path

PiperOrigin-RevId: 339777277
Change-Id: I6789ab410c3a017876c9593b756acd8ec34d4580
This commit is contained in:
TensorFlower Gardener 2020-10-29 17:21:06 -07:00
commit e0830e4df9
10 changed files with 18 additions and 15 deletions

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/add.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/kernels/internal/quantization_util.h"
#include "tensorflow/lite/kernels/internal/reference/integer_ops/add.h"

View File

@ -15,8 +15,8 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/conv.h"
#include "cmsis/CMSIS/NN/Include/arm_nn_types.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nn_types.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/c/common.h"
#include "tensorflow/lite/kernels/internal/common.h"

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/integer_ops/depthwise_conv.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/c/common.h"
#include "tensorflow/lite/kernels/internal/common.h"

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/fully_connected.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/c/common.h"
#include "tensorflow/lite/kernels/internal/common.h"

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/mul.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/kernels/internal/quantization_util.h"
#include "tensorflow/lite/kernels/internal/reference/integer_ops/mul.h"
#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h"

View File

@ -14,7 +14,7 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/lite/kernels/internal/reference/pooling.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "flatbuffers/base.h" // from @flatbuffers
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/kernels/internal/reference/integer_ops/pooling.h"

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/lite/kernels/internal/reference/softmax.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/kernels/internal/tensor_ctypes.h"
#include "tensorflow/lite/kernels/kernel_util.h"
#include "tensorflow/lite/micro/kernels/kernel_util.h"

View File

@ -16,8 +16,8 @@ limitations under the License.
#include <cmath>
#include <cstdint>
#include "cmsis/CMSIS/NN/Include/arm_nn_types.h"
#include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h"
#include "CMSIS/NN/Include/arm_nn_types.h"
#include "CMSIS/NN/Include/arm_nnfunctions.h"
#include "tensorflow/lite/c/builtin_op_data.h"
#include "tensorflow/lite/c/common.h"
#include "tensorflow/lite/kernels/internal/common.h"

View File

@ -51,7 +51,6 @@ ALL_TAGS := $(TAGS) $(TARGET)
# include directories from one source.
INCLUDES := \
-I. \
-I$(MAKEFILE_DIR)/downloads/ \
-I$(MAKEFILE_DIR)/downloads/gemmlowp \
-I$(MAKEFILE_DIR)/downloads/flatbuffers/include \
-I$(MAKEFILE_DIR)/downloads/ruy

View File

@ -118,11 +118,15 @@ ifneq ($(filter cmsis-nn,$(ALL_TAGS)),)
$(CMSIS_PATH)CMSIS/NN/Include/arm_nnfunctions.h \
$(CMSIS_PATH)CMSIS/NN/Include/arm_nnsupportfunctions.h
# Need to add the CMSIS Core includes path.
# All other CMSIS header files are included with their relative path
# in the CMSIS-NN micro kernel source files in
# tensorflow/lite/micro/kernels/cmsis-nn
# We add -I$(CMSIS_PATH) to enable the code in the TFLM repo (mostly in the
# tensorflow/lite/micro/kernels/cmsis-nn) to use include paths relative to
# the CMSIS code-base.
#
# The CMSIS code itself uses includes such as #include "arm_math.h" and so
# we add $(CMSIS_PATH)/CMSIS/Core/Include etc. to be able to build the CMSIS
# code without any modifications.
INCLUDES += \
-I$(CMSIS_PATH) \
-I$(CMSIS_PATH)/CMSIS/Core/Include \
-I$(CMSIS_PATH)/CMSIS/DSP/Include \
-I$(CMSIS_PATH)/CMSIS/NN/Include