Remove cstring include; update nn_test project files

CMSIS/NN/Include/arm_nnsupportfunctions.h

@@ -32,7 +32,7 @@
 
 #include "arm_math.h"
 #include "arm_common_tables.h"
-#include <cstring>
+//#include <cstring>
 
 #ifdef __cplusplus
 extern    "C"

CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.uvoptx

@@ -473,7 +473,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>0</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -1448,8 +1448,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</PathWithFileName>
-      <FilenameWithoutPath>arm_pool_q7_HWC.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Source\NNSupportFunctions\arm_q7_to_q15_no_shift.c</PathWithFileName>
+      <FilenameWithoutPath>arm_q7_to_q15_no_shift.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1460,8 +1460,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Source\NNSupportFunctions\arm_q7_to_q15_no_shift.c</PathWithFileName>
-      <FilenameWithoutPath>arm_q7_to_q15_no_shift.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Source\NNSupportFunctions\arm_q7_to_q15_reordered_no_shift.c</PathWithFileName>
+      <FilenameWithoutPath>arm_q7_to_q15_reordered_no_shift.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1472,8 +1472,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Source\NNSupportFunctions\arm_q7_to_q15_reordered_no_shift.c</PathWithFileName>
-      <FilenameWithoutPath>arm_q7_to_q15_reordered_no_shift.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Source\SoftmaxFunctions\arm_softmax_q7.c</PathWithFileName>
+      <FilenameWithoutPath>arm_softmax_q7.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1484,8 +1484,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Source\SoftmaxFunctions\arm_softmax_q7.c</PathWithFileName>
-      <FilenameWithoutPath>arm_softmax_q7.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</PathWithFileName>
+      <FilenameWithoutPath>arm_softmax_q15.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1496,8 +1496,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</PathWithFileName>
-      <FilenameWithoutPath>arm_softmax_q15.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</PathWithFileName>
+      <FilenameWithoutPath>arm_pool_q7_HWC.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

CMSIS/NN/NN_Lib_Tests/nn_test/arm_nnexamples_nn_test.uvprojx

@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>ARMCM3</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(10000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -560,11 +560,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -585,6 +580,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -618,7 +618,7 @@
         <TargetCommonOption>
           <Device>ARMCM4_FP</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -1162,11 +1162,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -1187,6 +1182,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -1220,7 +1220,7 @@
         <TargetCommonOption>
           <Device>ARMCM7_SP</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -1764,11 +1764,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -1789,6 +1784,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -1822,7 +1822,7 @@
         <TargetCommonOption>
           <Device>ARMCM4_FP</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -2366,11 +2366,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -2391,6 +2386,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -2424,7 +2424,7 @@
         <TargetCommonOption>
           <Device>ARMCM7_SP</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -2968,11 +2968,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -2993,6 +2988,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -3026,7 +3026,7 @@
         <TargetCommonOption>
           <Device>ARMCM4_FP</Device>
           <Vendor>ARM</Vendor>
-          <PackID>ARM.CMSIS.5.2.0</PackID>
+          <PackID>ARM.CMSIS.5.2.1-dev3</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -3570,11 +3570,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\NNSupportFunctions\arm_nntables.c</FilePath>
             </File>
-            <File>
-              <FileName>arm_pool_q7_HWC.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\Source\NNSupportFunctions\arm_pool_q7_HWC.c</FilePath>
-            </File>
             <File>
               <FileName>arm_q7_to_q15_no_shift.c</FileName>
               <FileType>1</FileType>
@@ -3595,6 +3590,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\Source\SoftmaxFunctions\arm_softmax_q15.c</FilePath>
             </File>
+            <File>
+              <FileName>arm_pool_q7_HWC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Source\PoolingFunctions\arm_pool_q7_HWC.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -3716,7 +3716,7 @@
       <file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM3\Source\ARM\startup_ARMCM3.s" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM3\startup_ARMCM3.s</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM3 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM3"/>
         </targetInfos>
@@ -3724,7 +3724,7 @@
       <file attr="config" category="sourceC" name="Device\ARM\ARMCM3\Source\system_ARMCM3.c" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM3\system_ARMCM3.c</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM3 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM3"/>
         </targetInfos>
@@ -3744,7 +3744,7 @@
       <file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM4\Source\ARM\startup_ARMCM4.s" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM4_FP\startup_ARMCM4.s</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM4 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM4_FP"/>
           <targetInfo name="ARMCM4_FP_truncate"/>
@@ -3754,7 +3754,7 @@
       <file attr="config" category="sourceC" name="Device\ARM\ARMCM4\Source\system_ARMCM4.c" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM4_FP\system_ARMCM4.c</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM4 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM4_FP"/>
           <targetInfo name="ARMCM4_FP_truncate"/>
@@ -3764,7 +3764,7 @@
       <file attr="config" category="sourceAsm" condition="ARMCC" name="Device\ARM\ARMCM7\Source\ARM\startup_ARMCM7.s" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM7_SP\startup_ARMCM7.s</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM7 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM7_SP"/>
           <targetInfo name="ARMCM7b_SP"/>
@@ -3773,7 +3773,7 @@
       <file attr="config" category="sourceC" name="Device\ARM\ARMCM7\Source\system_ARMCM7.c" version="1.0.0">
         <instance index="0">RTE\Device\ARMCM7_SP\system_ARMCM7.c</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1" condition="ARMCM7 CMSIS"/>
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.2.1-dev3"/>
         <targetInfos>
           <targetInfo name="ARMCM7_SP"/>
           <targetInfo name="ARMCM7b_SP"/>