SDK relese v1.60.5

edgeimpulse · Oct 16, 2024 · 73935fb · 73935fb
1 parent eef0217
commit 73935fb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/EdgeImpulse.EI-SDK.pdsc b/EdgeImpulse.EI-SDK.pdsc
@@ -5,13 +5,16 @@
 	<name>EI-SDK</name>
 	<license>LICENSE-apache-2.0.txt</license>
 	<description>Edge Impulse SDK</description>
-	<url>https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.3/</url>
+	<url>https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.5/</url>
 	<supportContact>[email protected]</supportContact>
 	<repository type="git">https://github.com/edgeimpulse/edge-impulse-sdk-pack.git</repository>
 	<releases>
-		<release version="1.60.3" tag="v1.60.3" date="2024-10-14" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.3/EdgeImpulse.EI-SDK.1.60.3.pack">
+		<release version="1.60.5" tag="v1.60.5" date="2024-10-16" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.5/EdgeImpulse.EI-SDK.1.60.5.pack">
       		EI-SDK
     	</release>	
+		<release version="1.60.3" tag="v1.60.3" date="2024-10-14" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.3/EdgeImpulse.EI-SDK.1.60.3.pack">
+      		EI-SDK
+    	</release>
 		<release version="1.60.2" tag="v1.60.2" date="2024-10-14" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.2/EdgeImpulse.EI-SDK.1.60.2.pack">
       		EI-SDK
     	</release>
@@ -98,9 +101,6 @@
     	</release>
 		<release version="1.50.4" tag="v1.50.4" date="2024-05-23" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.50.4/EdgeImpulse.EI-SDK.1.50.4.pack">
       		EI-SDK
-    	</release>
-		<release version="1.49.39" tag="v1.49.39" date="2024-05-20" url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.49.39/EdgeImpulse.EI-SDK.1.49.39.pack">
-      		EI-SDK
     	</release>
 	</releases>
 	<keywords>
@@ -146,7 +146,7 @@
     </packages>
     </requirements>
 	<components>
-		<component Cclass="EdgeImpulse" Cgroup="SDK" Cversion="1.60.3">
+		<component Cclass="EdgeImpulse" Cgroup="SDK" Cversion="1.60.5">
 			<description>Edge Impulse SDK</description>	
 				<!-- short component description -->
 				<files>

diff --git a/EdgeImpulse.pidx b/EdgeImpulse.pidx
@@ -2,8 +2,8 @@
 <index schemaVersion="1.0.0" xs:noNamespaceSchemaLocation="PackIndex.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
   <vendor>EdgeImpulse</vendor>
   <url>https://raw.githubusercontent.com/edgeimpulse/edge-impulse-sdk-pack/main/</url>
-  <timestamp>2024-10-14 17:19:34</timestamp>
+  <timestamp>2024-10-16 13:57:27</timestamp>
   <pindex>
-    <pdsc url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.3/" vendor="EdgeImpulse" name="EI-SDK" version="1.60.3"/>
+    <pdsc url="https://github.com/edgeimpulse/edge-impulse-sdk-pack/releases/download/v1.60.5/" vendor="EdgeImpulse" name="EI-SDK" version="1.60.5"/>
   </pindex>
 </index>
diff --git a/edgeimpulse/edge-impulse-sdk/dsp/dsp_engines/ei_arm_cmsis_dsp.h b/edgeimpulse/edge-impulse-sdk/dsp/dsp_engines/ei_arm_cmsis_dsp.h
@@ -194,7 +194,7 @@ static int hw_r2c_fft(const float *input, ei::fft_complex_t *output, size_t n_ff
 
 static int hw_r2r_fft(const float *input, float *output, size_t n_fft)
 {
-    if(!can_do_fft(n_fft)) { EIDSP_ERR(ei::EIDSP_NOT_SUPPORTED); }
+    if(!can_do_fft(n_fft)) { return ei::EIDSP_NOT_SUPPORTED; }
 
     float *arm_fft_out;
     auto allocator = EI_MAKE_TRACKED_POINTER(arm_fft_out, n_fft);

diff --git a/edgeimpulse/edge-impulse-sdk/dsp/numpy.hpp b/edgeimpulse/edge-impulse-sdk/dsp/numpy.hpp
@@ -50,9 +50,21 @@
 #elif EIDSP_USE_CMSIS_DSP
 #include "edge-impulse-sdk/dsp/dsp_engines/ei_arm_cmsis_dsp.h"
 #else
+#define EIDSP_INCLUDE_KISSFFT 1
 #include "edge-impulse-sdk/dsp/dsp_engines/ei_no_hw_dsp.h"
 #endif
 
+// More decisions on kissfft
+#ifndef EIDSP_INCLUDE_KISSFFT
+
+#if defined(EI_CLASSIFIER_NON_STANDARD_FFT_SIZES) && !EI_CLASSIFIER_NON_STANDARD_FFT_SIZES
+#define EIDSP_INCLUDE_KISSFFT 0
+#else
+#define EIDSP_INCLUDE_KISSFFT 1
+#endif // EI_CLASSIFIER_NON_STANDARD_FFT_SIZES
+
+#endif // EIDSP_INCLUDE_KISSFFT
+
 // For the following CMSIS includes, we want to use the C fallback, so include whether or not we set the CMSIS flag
 #include "dsp/statistics_functions.h"
 
@@ -1723,6 +1735,7 @@ class numpy {
     }
 
     static int software_rfft(float *fft_input, float *output, size_t n_fft, size_t n_fft_out_features) {
+    #if EIDSP_INCLUDE_KISSFFT || !defined(EIDSP_INCLUDE_KISSFFT)
         kiss_fft_cpx *fft_output = (kiss_fft_cpx*)ei_dsp_malloc(n_fft_out_features * sizeof(kiss_fft_cpx));
         if (!fft_output) {
             EIDSP_ERR(EIDSP_OUT_OF_MEM);
@@ -1751,10 +1764,14 @@ class numpy {
         ei_dsp_free(fft_output, n_fft_out_features * sizeof(kiss_fft_cpx));
 
         return EIDSP_OK;
+    #else
+        return EIDSP_NOT_SUPPORTED;
+    #endif
     }
 
     static int software_rfft(float *fft_input, fft_complex_t *output, size_t n_fft, size_t n_fft_out_features)
     {
+    #if EIDSP_INCLUDE_KISSFFT || !defined(EIDSP_INCLUDE_KISSFFT)
         // create fftr context
         size_t kiss_fftr_mem_length;
 
@@ -1771,6 +1788,9 @@ class numpy {
         ei_dsp_free(cfg, kiss_fftr_mem_length);
 
         return EIDSP_OK;
+    #else
+        return EIDSP_NOT_SUPPORTED;
+    #endif
     }
 
     static int signal_get_data(const float *in_buffer, size_t offset, size_t length, float *out_ptr)