iir: Q15 matches on a simple high pass filter

Author: jonnor

benchmarks/iir/SimpleFilters.ipynb

@@ -1,19 +1,28 @@
 
+import os
 import sys
+
 import npyfile
 
+ST_SIZE = 6
+
 def iir_process_file(inp, out, filters, chunksize):
 
     coefficients_shape, coefficients = npyfile.load(filters)
     print('c', coefficients_shape, coefficients)
+    
 
     # NOTE: filter shape and type checked by the C modules
 
     # Processing is done by streaming, to keep RAM usage low
     with npyfile.Reader(inp) as reader:
 
         # Check inputs and setup filters
-        print('r', reader.shape, reader.typecode, reader.itemsize)
+        print('r', inp, os.stat(inp)[ST_SIZE], reader.shape, reader.typecode, reader.itemsize)
+
+        #if reader.typecode == 'i':
+        #    reader.typecode = 'h'
+        #    coefficients = array.array('h', coefficients)
 
         if len(reader.shape) != 1:
             raise ValueError("Input must be 1d")
@@ -26,18 +35,13 @@ def iir_process_file(inp, out, filters, chunksize):
         else:
             raise ValueError("Input must either be float32/f or int16/h")
 
-
-        with npyfile.Writer(inp, reader.shape, reader.typecode) as writer:
+        with npyfile.Writer(out, reader.shape, reader.typecode) as writer:
 
             # Apply filters
             for chunk in reader.read_data_chunks(chunksize):
-                print(len(chunk))
-
                 filter.run(chunk) # operates in-place
-
                 writer.write_values(chunk)
 
-
 def main():
 
     args = sys.argv

benchmarks/iir/iir_run.py

@@ -19,6 +19,9 @@ def run_iir(data : array.array,
 
     with tempfile.TemporaryDirectory() as temp_dir:
 
+        #temp_dir = 'temp'
+        #os.makedirs(temp_dir)
+
         filter_path = os.path.join(temp_dir, 'filter.npy')
         input_path = os.path.join(temp_dir, 'input.npy')
         output_path = os.path.join(temp_dir, 'output.npy')
@@ -27,6 +30,8 @@ def run_iir(data : array.array,
         npyfile.save(filter_path, coefficients)
         npyfile.save(input_path, data)
 
+        input_size = os.stat(input_path).st_size
+    
         assert not os.path.exists(output_path), output_path
 
         # run the processing function
@@ -40,9 +45,14 @@ def run_iir(data : array.array,
         cmd = ' '.join(args)
 
         print('run: ', cmd)
-
-        out = subprocess.check_output(args)
-        print(out)
+        try:
+            out = subprocess.check_output(args)
+        except subprocess.CalledProcessError as e:
+            out = e.stdout
+
+        print('out')
+        for line in out.decode('utf-8').split('\n'):
+            print(line)
 
         # load the output
         assert os.path.exists(output_path), output_path

benchmarks/iir/iir_run_subprocess.py

@@ -4,7 +4,7 @@
 
 - Level 0a. Run a pretrained example/demo in the browser
 - Level 0b. Run a pretrained example/demo on a board
-- Level 1. Train on-device
+- Level 1. Train custom model on-device
 - Level 2. Collect a dataset, do training on PC, deploy back to microcontroller
 - Level 3. Bake the custom model into the firmware
 
@@ -49,7 +49,7 @@ Examples
 Benchmarks
 
 - Add FLASH and RAM usage
-- Test gzip compression of .csv model
+- Test gzip compression of .csv model for trees
 - Add a couple of different sized models to benchmark?
 - Add another application/dataset for benchmark
 

doc/TODO.md

@@ -47,8 +47,8 @@ static mp_obj_t iir_filter_new(mp_obj_t array_obj) {
     // Extract buffer pointer and verify typecode
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(array_obj, &bufinfo, MP_BUFFER_RW);
-    if (bufinfo.typecode != 'i') {
-        mp_raise_ValueError(MP_ERROR_TEXT("expecting int16/i array"));
+    if (bufinfo.typecode != 'h') {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting int16/h array"));
     }
     q15_t *values = bufinfo.buf;
     const int n_values = bufinfo.len / sizeof(*values);
@@ -57,7 +57,7 @@ static mp_obj_t iir_filter_new(mp_obj_t array_obj) {
         mp_raise_ValueError(MP_ERROR_TEXT("Filter coefficients must be multiple of 6"));
     }
 
-    const int post_shift = 1; // FIXME: allow to pass as argument
+    const int post_shift = 2; // FIXME: allow to pass as argument
 
     // Construct object
     mp_obj_iir_filter_t *o = mp_obj_malloc(mp_obj_iir_filter_t, (mp_obj_type_t *)&iir_filter_type);
@@ -103,8 +103,8 @@ static mp_obj_t iir_filter_run(mp_obj_t self_obj, mp_obj_t array_obj) {
     // Extract buffer pointer and verify typecode
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(array_obj, &bufinfo, MP_BUFFER_RW);
-    if (bufinfo.typecode != 'i') {
-        mp_raise_ValueError(MP_ERROR_TEXT("expecting int16/i array"));
+    if (bufinfo.typecode != 'h') {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting int16/h array"));
     }
     q15_t *values = bufinfo.buf;
     const int n_values = bufinfo.len / sizeof(*values);