CMSIS-NN: Clean-up of include files
1. The wider arm_math.h is replaced by specific arm_math_types.h
or arm_math_memory.h(one usage) files.
2. Only the necessary includes are added for all files. For most
parts this has meant removing arm_nnsupportfunctions.h or
arm_nnfunctions.h where it is not necessary. arm_math*.h is
only a part of the include files and is removed from the source
files.
The unit tests are not modified and have references to arm_math.h
Change-Id: Iaa44cf485009213632b507a0872de440964389cf
diff --git a/CMSIS/NN/Include/arm_nn_tables.h b/CMSIS/NN/Include/arm_nn_tables.h
index 36be5a8..f4bd7f9 100644
--- a/CMSIS/NN/Include/arm_nn_tables.h
+++ b/CMSIS/NN/Include/arm_nn_tables.h
@@ -3,8 +3,8 @@
* Title: arm_nn_tables.h
* Description: Extern declaration for NN tables
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
@@ -29,7 +29,7 @@
#ifndef _ARM_NN_TABLES_H
#define _ARM_NN_TABLES_H
-#include "arm_math.h"
+#include "arm_math_types.h"
/**
* @brief tables for various activation functions
diff --git a/CMSIS/NN/Include/arm_nn_types.h b/CMSIS/NN/Include/arm_nn_types.h
index 4e825c5..e90b400 100644
--- a/CMSIS/NN/Include/arm_nn_types.h
+++ b/CMSIS/NN/Include/arm_nn_types.h
@@ -22,8 +22,8 @@
* Description: Public header file to contain the CMSIS-NN structs for the
* TensorFlowLite micro compliant functions
*
- * $Date: April 23, 2020
- * $Revision: V.0.5.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.0
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
@@ -32,6 +32,8 @@
#ifndef _ARM_NN_TYPES_H
#define _ARM_NN_TYPES_H
+#include <stdint.h>
+
/** CMSIS-NN object to contain the width and height of a tile */
typedef struct
{
diff --git a/CMSIS/NN/Include/arm_nnfunctions.h b/CMSIS/NN/Include/arm_nnfunctions.h
index 45ee891..7680c9d 100644
--- a/CMSIS/NN/Include/arm_nnfunctions.h
+++ b/CMSIS/NN/Include/arm_nnfunctions.h
@@ -21,8 +21,8 @@
* Title: arm_nnfunctions.h
* Description: Public header file for CMSIS NN Library
*
- * $Date: August 21, 2020
- * $Revision: V.6.5.2
+ * $Date: 09. October 2020
+ * $Revision: V.6.5.3
*
* Target Processor: Cortex-M CPUs
* -------------------------------------------------------------------- */
@@ -161,9 +161,8 @@
#ifndef _ARM_NNFUNCTIONS_H
#define _ARM_NNFUNCTIONS_H
-#include "arm_nnsupportfunctions.h"
-#include "arm_nn_tables.h"
#include "arm_nn_types.h"
+#include "arm_math_types.h"
#define USE_INTRINSIC
@@ -175,6 +174,19 @@
#endif
/**
+ * @brief Struct for specifying activation function types
+ *
+ */
+typedef enum
+{
+ ARM_SIGMOID = 0,
+ /**< Sigmoid activation function */
+ ARM_TANH = 1,
+ /**< Tanh activation function */
+} arm_nn_activation_type;
+
+
+/**
* @defgroup NNConv Convolution Functions
*
* Collection of convolution, depthwise convolution functions and their variants.
diff --git a/CMSIS/NN/Include/arm_nnsupportfunctions.h b/CMSIS/NN/Include/arm_nnsupportfunctions.h
index 2f9364c..44a677b 100644
--- a/CMSIS/NN/Include/arm_nnsupportfunctions.h
+++ b/CMSIS/NN/Include/arm_nnsupportfunctions.h
@@ -21,8 +21,8 @@
* Title: arm_nnsupportfunctions.h
* Description: Public header file of support functions for CMSIS NN Library
*
- * $Date: July 31, 2020
- * $Revision: V.4.5.4
+ * $Date: 09. October 2020
+ * $Revision: V.4.5.5
*
* Target Processor: Cortex-M CPUs
* -------------------------------------------------------------------- */
@@ -30,7 +30,7 @@
#ifndef _ARM_NNSUPPORTFUNCTIONS_H_
#define _ARM_NNSUPPORTFUNCTIONS_H_
-#include "arm_math.h"
+#include "arm_math_types.h"
#include "arm_common_tables.h"
#ifdef __cplusplus
@@ -77,18 +77,6 @@
};
/**
- * @brief Struct for specifying activation function types
- *
- */
-typedef enum
-{
- ARM_SIGMOID = 0,
- /**< Sigmoid activation function */
- ARM_TANH = 1,
- /**< Tanh activation function */
-} arm_nn_activation_type;
-
-/**
* @defgroup nndata_convert Neural Network Data Conversion Functions
*
* Perform data type conversion in-between neural network operations
diff --git a/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c b/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
index 7f46074..ffe7e04 100644
--- a/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
+++ b/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q15.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,16 +21,15 @@
* Title: arm_nn_activations_q15.c
* Description: Q15 neural network activation function using direct table look-up
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_common_tables.h"
#include "arm_nnfunctions.h"
+#include "arm_nn_tables.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c b/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
index 40ab678..7595a74 100644
--- a/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
+++ b/CMSIS/NN/Source/ActivationFunctions/arm_nn_activations_q7.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,16 +21,15 @@
* Title: arm_nn_activations_q7.c
* Description: Q7 neural network activation function using direct table look-up
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_common_tables.h"
#include "arm_nnfunctions.h"
+#include "arm_nn_tables.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ActivationFunctions/arm_relu6_s8.c b/CMSIS/NN/Source/ActivationFunctions/arm_relu6_s8.c
index 6114aa8..179f198 100644
--- a/CMSIS/NN/Source/ActivationFunctions/arm_relu6_s8.c
+++ b/CMSIS/NN/Source/ActivationFunctions/arm_relu6_s8.c
@@ -21,15 +21,15 @@
* Title: arm_relu6_s8.c
* Description: Basic s8 version of ReLU6
*
- * $Date: Spetember 2019
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c b/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
index 711518d..02776e6 100644
--- a/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
+++ b/CMSIS/NN/Source/ActivationFunctions/arm_relu_q15.c
@@ -21,15 +21,15 @@
* Title: arm_relu_q15.c
* Description: Q15 version of ReLU
*
- * $Date: February 27, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c b/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
index e007fd1..7d95adf 100644
--- a/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
+++ b/CMSIS/NN/Source/ActivationFunctions/arm_relu_q7.c
@@ -21,15 +21,15 @@
* Title: arm_relu_q7.c
* Description: Q7 version of ReLU
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.3
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_add_s8.c b/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_add_s8.c
index 6248c15..c781d82 100644
--- a/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_add_s8.c
+++ b/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_add_s8.c
@@ -21,14 +21,13 @@
* Title: arm_elementwise_add_s8
* Description: Element wise add
*
- * $Date: July 31, 2020
- * $Revision: V.2.5.1
+ * $Date: 09. October 2020
+ * $Revision: V.2.5.2
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
#if defined(ARM_MATH_MVEI)
diff --git a/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_mul_s8.c b/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_mul_s8.c
index 4923e9c..dc3e835 100644
--- a/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_mul_s8.c
+++ b/CMSIS/NN/Source/BasicMathFunctions/arm_elementwise_mul_s8.c
@@ -21,14 +21,13 @@
* Title: arm_elementwise_mul_s8
* Description: Element wise multiplication
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.3
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.4
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1_x_n_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1_x_n_s8.c
index bda1198..3510599 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1_x_n_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1_x_n_s8.c
@@ -21,14 +21,13 @@
* Title: arm_convolve_1_x_n_s8.c
* Description: s8 version of 1xN convolution using symmetric quantization.
*
- * $Date: July 27, 2020
- * $Revision: V.2.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.2
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nn_types.h"
+
#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
index 68f95f7..696fcac 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_HWC_q7_fast_nonsquare.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_1x1_HWC_q7_fast_nonsquare.c
* Description: Fast Q7 version of 1x1 convolution (non-square shape)
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_s8_fast.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_s8_fast.c
index 9474567..df6c20c 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_s8_fast.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_1x1_s8_fast.c
@@ -21,15 +21,15 @@
* Title: arm_convolve_1x1_s8_fast.c
* Description: Fast q7 version of 1x1 convolution (non-square shape)
*
- * $Date: July 27, 2020
- * $Revision: V.2.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.3
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
#include "arm_nnfunctions.h"
-#include "arm_nn_types.h"
+#include "arm_nnsupportfunctions.h"
#define DIM_KER_X (1U)
#define DIM_KER_Y (1U)
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
index f11c517..b000aad 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_basic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_HWC_q15_basic.c
* Description: Q15 version of convolution
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
index 9c4a657..d1d8c9e 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_HWC_q15_fast.c
* Description: Fast Q15 version of convolution
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
index 4889f49..9fd163f 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q15_fast_nonsquare.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_HWC_q15_fast.c
* Description: Fast Q15 version of convolution
*
- * $Date: 24. May 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
index 0a55d72..4438bf0 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_RGB.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,14 +21,15 @@
* Title: arm_convolve_HWC_q7_RGB.c
* Description: Q7 version of convolution for RGB image
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
index d416d0a..d8cc74b 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,14 +21,15 @@
* Title: arm_convolve_HWC_q7_basic.c
* Description: Q7 version of convolution
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
index c5d3ed5..bbddf74 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_basic_nonsquare.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,14 +21,15 @@
* Title: arm_convolve_HWC_q7_basic.c
* Description: Q7 version of convolution
*
- * $Date: 13. July 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
index e270640..c92128a 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_HWC_q7_fast.c
* Description: Fast Q7 version of convolution
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
index 2dc94ef..53f7192 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_HWC_q7_fast_nonsquare.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_convolve_HWC_q7_fast_nonsquare.c
* Description: Fast Q7 version of convolution (non-sqaure shape)
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_s8.c
index 56355b3..41a6d6e 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_s8.c
@@ -21,14 +21,13 @@
* Title: arm_convolve_s8.c
* Description: s8 version of convolution using symmetric quantization.
*
- * $Date: July 27, 2020
- * $Revision: V.2.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.3
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nn_types.h"
+
#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_wrapper_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_wrapper_s8.c
index c55688c..c73d2bb 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_wrapper_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_convolve_wrapper_s8.c
@@ -21,15 +21,14 @@
* Title: arm_convolve_wrapper_s8.c
* Description: s8 convolution layer wrapper function with the main purpose to call the optimal kernel available in cmsis-nn to perform the convolution.
*
- * $Date: May 18, 2020
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
#include "arm_nnfunctions.h"
-#include "arm_nn_types.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_3x3_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_3x3_s8.c
index fad8bda..0258f9c 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_3x3_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_3x3_s8.c
@@ -22,16 +22,16 @@
* Description: Optimized s8 depthwise convolution function for channel
* multiplier of 1 and 3x3 kernel size.
*
- * $Date: May 14, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnsupportfunctions.h"
+
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8.c
index 9f2ab11..a363b09 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8.c
@@ -21,13 +21,13 @@
* Title: arm_depthwise_conv_s8.c
* Description: s8 version of depthwise convolution.
*
- * $Date: May 14, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8_opt.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8_opt.c
index 2908b37..c3471b2 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8_opt.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_s8_opt.c
@@ -22,16 +22,15 @@
* Description: Optimized s8 depthwise separable convolution function for
* channel multiplier of 1.
*
- * $Date: May 29, 2020
- * $Revision: V.2.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.2
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnsupportfunctions.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_u8_basic_ver1.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_u8_basic_ver1.c
index 8f374aa..07f26a0 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_u8_basic_ver1.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_u8_basic_ver1.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2019 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_depthwise_conv_u8_basic_ver1.c
* Description: u8 depthwise convolution function
*
- * $Date: May 29, 2020
- * $Revision: V.1.1.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.1.1
*
* Target : Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_wrapper_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_wrapper_s8.c
index eed2036..002ec96 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_wrapper_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_conv_wrapper_s8.c
@@ -22,15 +22,14 @@
* Description: Wrapper API to select appropriate depthwise conv API based
* on dimensions.
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
-#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
index a7eaf93..7b7523f 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7.c
@@ -21,15 +21,15 @@
* Title: arm_depthwise_separable_conv_HWC_q7.c
* Description: Q7 depthwise separable convolution function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
@@ -43,7 +43,7 @@
/**
* @brief Q7 depthwise separable convolution function
* @param[in] Im_in pointer to input tensor
- * @param[in] dim_im_in input tensor dimention
+ * @param[in] dim_im_in input tensor dimension
* @param[in] ch_im_in number of input tensor channels
* @param[in] wt pointer to kernel weights
* @param[in] ch_im_out number of filters, i.e., output tensor channels
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
index 53143da..a95d313 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_depthwise_separable_conv_HWC_q7_nonsquare.c
@@ -21,15 +21,15 @@
* Title: arm_depthwise_separable_conv_HWC_q7_nonsquare.c
* Description: Q7 depthwise separable convolution function (non-square shape)
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
@@ -43,8 +43,8 @@
/**
* @brief Q7 depthwise separable convolution function (non-square shape)
* @param[in] Im_in pointer to input tensor
- * @param[in] dim_im_in_x input tensor dimention x
- * @param[in] dim_im_in_y input tensor dimention y
+ * @param[in] dim_im_in_x input tensor dimension x
+ * @param[in] dim_im_in_y input tensor dimension y
* @param[in] ch_im_in number of input tensor channels
* @param[in] wt pointer to kernel weights
* @param[in] ch_im_out number of filters, i.e., output tensor channels
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_depthwise_conv_s8_core.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_depthwise_conv_s8_core.c
index 97511ff..4cbd57f 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_depthwise_conv_s8_core.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_depthwise_conv_s8_core.c
@@ -21,14 +21,13 @@
* Title: arm_nn_depthwise_conv_s8_core.c
* Description: Depthwise convolution on im2col buffers.
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.3
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.4
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/*
* Depthwise conv on an im2col buffer where the input channel equals
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
index f03e5ff..87f82a1 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mat_mult_kernel_q7_q15.c
* Description: Matrix-multiplication function for convolution
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @brief Matrix-multiplication function for convolution.
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
index 31aa334..fe79ae8 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_q7_q15_reordered.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mat_mult_kernel_q7_q15_reordered.c
* Description: Matrix-multiplication function for convolution with reordered columns
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
#include "arm_nnfunctions.h"
-#include "arm_math.h"
+#include "arm_nnsupportfunctions.h"
/**
* @brief Matrix-multiplication function for convolution with re-ordered input.
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16.c
index ebdfaaa..123e7d0 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mat_mult_kernel_s8_s16.c
* Description: Matrix-multiplication function for convolution
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.3
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/*
* Matrix-multiplication function for convolution with per-channel requantization.
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16_reordered.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16_reordered.c
index a25b1ff..842a180 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16_reordered.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_kernel_s8_s16_reordered.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mat_mult_kernel_s8_s16_reordered.c
* Description: Matrix-multiplication function for convolution with reordered columns
*
- * $Date: February 27, 2020
- * $Revision: V.1.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.3
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
#include "arm_nnfunctions.h"
-#include "arm_math.h"
+#include "arm_nnsupportfunctions.h"
/*
* Matrix-multiplication with re-ordered input and bias inputs for convolution with per-channel
diff --git a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_s8.c b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_s8.c
index 6af509f..76f7ef1 100644
--- a/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_s8.c
+++ b/CMSIS/NN/Source/ConvolutionFunctions/arm_nn_mat_mult_s8.c
@@ -21,14 +21,13 @@
* Title: arm_nn_mat_mult_s8.c
* Description: General Matrix-multiplication function
*
- * $Date: July 27, 2020
- * $Revision: V.2.0.4
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.5
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/*
* s8 General matrix multiplication function with per-channel requantization for upto 4 column batches.
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
index ae2287c..2cdfacd 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_mat_q7_vec_q15.c
* Description: Mixed Q15-Q7 fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
index b01f9e3..31ce77d 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_mat_q7_vec_q15_opt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_mat_q7_vec_q15_opt.c
* Description: Mixed Q15-Q7 opt fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
index 9a69a96..a3c0f3f 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_q15.c
* Description: Q15 basic fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
index 72a39dd..d52fd1c 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q15_opt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_q15_opt.c
* Description: Q15 opt fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
index 8e499bc..771c718 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_q7.c
* Description: Q7 basic fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
index 5ddf7ca..c65b715 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_q7_opt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Arm Limited or its affiliates. All rights reserved.
+ * Copyright (C) 2010-2020 Arm Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_q7_opt.c
* Description: Q7 basic fully-connected layer function
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_s8.c b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_s8.c
index eace95f..ddaab85 100644
--- a/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_s8.c
+++ b/CMSIS/NN/Source/FullyConnectedFunctions/arm_fully_connected_s8.c
@@ -21,15 +21,15 @@
* Title: arm_fully_connected_s8
* Description: Fully connected function compatible with TF Lite.
*
- * $Date: May 2, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M and Cortex-A cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupNN
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_accumulate_q7_to_q15.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_accumulate_q7_to_q15.c
index c302bd7..fa4dede 100755
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_accumulate_q7_to_q15.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_accumulate_q7_to_q15.c
@@ -21,14 +21,16 @@
* Title: arm_nn_accumulate_q7_to_q15.c
* Description: Accumulate q7 vector into q15 one.
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* pSrc Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
+
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
+#include "arm_math_memory.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_add_q7.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_add_q7.c
index 331a2d7..0eebf78 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_add_q7.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_add_q7.c
@@ -21,14 +21,15 @@
* Title: arm_nn_add_q7.c
* Description: Non saturating addition of elements of a q7 vector.
*
- * $Date: July 2019
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+
+#include "arm_nnsupportfunctions.h"
+#include "arm_nn_tables.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_padded_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_padded_s8.c
index 3ecd8e5..21570e0 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_padded_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_padded_s8.c
@@ -21,14 +21,13 @@
* Title: arm_nn_depthwise_conv_nt_t_padded_s8.c
* Description: Depthwise convolution with padded matrices.
*
- * $Date: March 17, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M processors with MVE extension
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_s8.c
index 1bff9c4..b1fa195 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_depthwise_conv_nt_t_s8.c
@@ -21,14 +21,13 @@
* Title: arm_nn_depthwise_conv_nt_t_s8.c
* Description: Depthwise convolution on matrices with no padding.
*
- * $Date: March 17, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M processors with MVE extension.
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_1x_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_1x_s8.c
index 6077658..1a1d4e9 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_1x_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_1x_s8.c
@@ -21,14 +21,13 @@
* Title: arm_nn_mat_mul_core_1x_s8.c
* Description: General Matrix-multiplication function
*
- * $Date: January 20, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_4x_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_4x_s8.c
index 39ad529..aa97a71 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_4x_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mul_core_4x_s8.c
@@ -21,14 +21,13 @@
* Title: arm_nn_mat_mul_core_4x_s8.c
* Description: General matrix multiplication function for MVE extension
*
- * $Date: January 20, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mult_nt_t_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mult_nt_t_s8.c
index 6ad8999..17781e5 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mult_nt_t_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mult_nt_t_s8.c
@@ -21,15 +21,13 @@
* Title: arm_nn_mat_mult_s8_nt_t_s8
* Description: Matrix multiplication support function with the right-hand-side (rhs) matrix transposed
*
- * $Date: July 27 2020
- * $Revision: V.1.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.3
*
* Target Processor: Cortex-M
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
/**
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
index 8373660..fc2e102 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q15.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mult_q15.c
* Description: Q15 vector multiplication with variable output shifts
*
- * $Date: 29. April 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
index cdb5385..66f0eab 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mult_q7.c
@@ -21,14 +21,14 @@
* Title: arm_nn_mult_q7.c
* Description: Q7 vector multiplication with variable output shifts
*
- * $Date: 29. April 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
/**
* @ingroup groupSupport
diff --git a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_vec_mat_mult_t_s8.c b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_vec_mat_mult_t_s8.c
index b235787..062fee9 100644
--- a/CMSIS/NN/Source/NNSupportFunctions/arm_nn_vec_mat_mult_t_s8.c
+++ b/CMSIS/NN/Source/NNSupportFunctions/arm_nn_vec_mat_mult_t_s8.c
@@ -21,15 +21,13 @@
* Title: arm_nn_vec_mat_mult_t_s8
* Description: s8 vector by matrix (transposed) multiplication
*
- * $Date: April 2, 2020
- * $Revision: V.1.5.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.5.1
*
* Target Processor: Cortex-M
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
/**
diff --git a/CMSIS/NN/Source/PoolingFunctions/arm_avgpool_s8.c b/CMSIS/NN/Source/PoolingFunctions/arm_avgpool_s8.c
index 048d32b..0b8e347 100755
--- a/CMSIS/NN/Source/PoolingFunctions/arm_avgpool_s8.c
+++ b/CMSIS/NN/Source/PoolingFunctions/arm_avgpool_s8.c
@@ -21,15 +21,15 @@
* Title: arm_avgpool_s8.c
* Description: Pooling function implementations
*
- * $Date: September 3,2020
- * $Revision: V.2.0.2
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.3
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
#if defined(ARM_MATH_DSP) && !defined(ARM_MATH_MVEI)
diff --git a/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c b/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
index 33a4436..95cb79b 100755
--- a/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
+++ b/CMSIS/NN/Source/PoolingFunctions/arm_max_pool_s8.c
@@ -21,15 +21,15 @@
* Title: arm_max_pool_s8.c
* Description: Pooling function implementations
*
- * $Date: June 11, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
static void compare_and_replace_if_larger_q7(q7_t *base,
const q7_t *target,
diff --git a/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c b/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
index 14e0ef7..9ae8549 100644
--- a/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
+++ b/CMSIS/NN/Source/PoolingFunctions/arm_pool_q7_HWC.c
@@ -21,15 +21,15 @@
* Title: arm_pool_q7_HWC.c
* Description: Pooling function implementations
*
- * $Date: 17. January 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
#if defined (ARM_MATH_DSP)
diff --git a/CMSIS/NN/Source/SVDFunctions/arm_svdf_s8.c b/CMSIS/NN/Source/SVDFunctions/arm_svdf_s8.c
index a03ed9b..3096220 100644
--- a/CMSIS/NN/Source/SVDFunctions/arm_svdf_s8.c
+++ b/CMSIS/NN/Source/SVDFunctions/arm_svdf_s8.c
@@ -21,15 +21,14 @@
* Title: arm_svdf_s8.c
* Description: S8 basic SVDF layer function
*
- * $Date: 17. August 2020
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M processors
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
-#include "arm_nn_types.h"
+#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
/**
diff --git a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
index e852eec..0569477 100644
--- a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
+++ b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q15.c
@@ -21,14 +21,13 @@
* Title: arm_softmax_q15.c
* Description: Q15 softmax function
*
- * $Date: 20. February 2018
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
/**
diff --git a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
index a0ef85e..f412d23 100644
--- a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
+++ b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_q7.c
@@ -21,14 +21,13 @@
* Title: arm_softmax_q7.c
* Description: Q7 softmax function
*
- * $Date: June 8, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
/**
diff --git a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_s8.c b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_s8.c
index 1d5dcf6..cab16ef 100644
--- a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_s8.c
+++ b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_s8.c
@@ -21,13 +21,14 @@
* Title: arm_softmax_s8.c
* Description: S8 softmax function
*
- * $Date: April 6, 2020
- * $Revision: V.2.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.2.0.1
*
* Target Processor: Cortex-M cores
*
* -------------------------------------------------------------------- */
+#include "arm_nnfunctions.h"
#include "arm_nnsupportfunctions.h"
#define ACCUM_BITS 12
diff --git a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_u8.c b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_u8.c
index b2eebd2..a61514a 100644
--- a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_u8.c
+++ b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_u8.c
@@ -21,14 +21,15 @@
* Title: arm_softmax_u8.c
* Description: U8 softmax function
*
- * $Date: May 29, 2020
- * $Revision: V.1.0.1
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.2
*
* Target Processor: Cortex-M CPUs
*
* -------------------------------------------------------------------- */
#include "arm_nnfunctions.h"
+#include "arm_nnsupportfunctions.h"
#define ACCUM_BITS 12
diff --git a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_with_batch_q7.c b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_with_batch_q7.c
index 4c27e33..266d7fd 100755
--- a/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_with_batch_q7.c
+++ b/CMSIS/NN/Source/SoftmaxFunctions/arm_softmax_with_batch_q7.c
@@ -21,14 +21,13 @@
* Title: arm_softmax_with_batch_q7.c
* Description: Q7 softmax function
*
- * $Date: 05. August 2019
- * $Revision: V.1.0.0
+ * $Date: 09. October 2020
+ * $Revision: V.1.0.1
*
* Target Processor: Cortex-M and Cortex-A cores
*
* -------------------------------------------------------------------- */
-#include "arm_math.h"
#include "arm_nnfunctions.h"
/**