lib: edge_impulse: Disable FP16 option in samples and apps

rlubos · carlescufi · commit 57d1997926de · 2021-11-11T11:29:26.000+01:00
THe CMSIS DSP provided with edge impulse library does not seem to be
compatible with recently introduced Zephyr CONFIG_FP16 option, it ends
up in a compilation error:

error: conflicting types for 'float_t'

Disable the CONFIG_FP16 option in samples/apps using edge impulse.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
@@ -48,6 +48,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
@@ -46,6 +46,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf b/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
@@ -58,6 +58,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf
@@ -50,6 +50,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf
@@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf
@@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
diff --git a/samples/edge_impulse/wrapper/prj.conf b/samples/edge_impulse/wrapper/prj.conf
@@ -16,6 +16,7 @@ CONFIG_LIB_CPLUSPLUS=y
 CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Enable Edge Impulse
 CONFIG_EDGE_IMPULSE=y
