iir_q15: Rename to emlearn_iir_q15

Author: jonnor

Makefile

@@ -28,8 +28,8 @@ $(MODULES_PATH)/emlearn_cnn.mpy:
 $(MODULES_PATH)/emlearn_kmeans.mpy:
 	make -C src/emlearn_kmeans/ ARCH=$(ARCH) MPY_DIR=$(MPY_DIR_ABS) V=1 clean dist
 
-$(MODULES_PATH)/eml_iir_q15.mpy:
-	make -C src/eml_iir_q15/ ARCH=$(ARCH) MPY_DIR=$(MPY_DIR_ABS) V=1 clean dist
+$(MODULES_PATH)/emlearn_iir_q15.mpy:
+	make -C src/emlearn_iir_q15/ ARCH=$(ARCH) MPY_DIR=$(MPY_DIR_ABS) V=1 clean dist
 
 $(MODULES_PATH)/emlearn_arrayutils.mpy:
 	make -C src/emlearn_arrayutils/ ARCH=$(ARCH) MPY_DIR=$(MPY_DIR_ABS) V=1 clean dist
@@ -52,7 +52,7 @@ emlearn_cnn.results: $(MODULES_PATH)/emlearn_cnn.mpy
 emlearn_kmeans.results: $(MODULES_PATH)/emlearn_kmeans.mpy
 	MICROPYPATH=$(MODULES_PATH) $(MICROPYTHON_BIN) tests/test_kmeans.py
 
-eml_iir_q15.results: $(MODULES_PATH)/eml_iir_q15.mpy
+emlearn_iir_q15.results: $(MODULES_PATH)/emlearn_iir_q15.mpy
 	MICROPYPATH=$(MODULES_PATH) $(MICROPYTHON_BIN) tests/test_iir_q15.py
 
 emlearn_arrayutils.results: $(MODULES_PATH)/emlearn_arrayutils.mpy
@@ -74,8 +74,8 @@ release:
 	zip -r $(RELEASE_NAME).zip $(RELEASE_NAME)
 	#cp $(RELEASE_NAME).zip emlearn-micropython-latest.zip
 
-check: emlearn_trees.results emlearn_neighbors.results emliir.results eml_iir_q15.results emlearn_fft.results emlearn_kmeans.results emlearn_arrayutils.results emlearn_cnn.results
+check: emlearn_trees.results emlearn_neighbors.results emliir.results emlearn_iir_q15.results emlearn_fft.results emlearn_kmeans.results emlearn_arrayutils.results emlearn_cnn.results
 
-dist: $(MODULES_PATH)/emlearn_trees.mpy $(MODULES_PATH)/emlearn_neighbors.mpy $(MODULES_PATH)/emliir.mpy $(MODULES_PATH)/eml_iir_q15.mpy $(MODULES_PATH)/emlearn_fft.mpy $(MODULES_PATH)/emlearn_kmeans.mpy $(MODULES_PATH)/emlearn_arrayutils.mpy $(MODULES_PATH)/emlearn_cnn.mpy
+dist: $(MODULES_PATH)/emlearn_trees.mpy $(MODULES_PATH)/emlearn_neighbors.mpy $(MODULES_PATH)/emliir.mpy $(MODULES_PATH)/emlearn_iir_q15.mpy $(MODULES_PATH)/emlearn_fft.mpy $(MODULES_PATH)/emlearn_kmeans.mpy $(MODULES_PATH)/emlearn_arrayutils.mpy $(MODULES_PATH)/emlearn_cnn.mpy
 
 

benchmarks/iir/iir_run.py

@@ -30,8 +30,8 @@ def iir_process_file(inp, out, filters, chunksize):
             import emliir
             filter = emliir.new(coefficients)
         elif reader.typecode == 'h':
-            import eml_iir_q15
-            filter = eml_iir_q15.new(coefficients)
+            import emlearn_iir_q15
+            filter = emlearn_iir_q15.new(coefficients)
         else:
             raise ValueError("Input must either be float32/f or int16/h")
 

examples/soundlevel_iir/soundlevel.py

@@ -6,7 +6,7 @@
 
 import emliir
 from emlearn_arrayutils import linear_map
-#import eml_iir_q15
+#import emlearn_iir_q15
 #from iir_python import IIRFilter
 
 class IIRFilterEmlearn:
@@ -20,8 +20,8 @@ def process(self, samples):
 class IIRFilterEmlearnFixed:
 
     def __init__(self, coefficients):
-        c = eml_iir_q15.convert_coefficients(coefficients)
-        self.iir = eml_iir_q15.new(c)
+        c = emlearn_iir_q15.convert_coefficients(coefficients)
+        self.iir = emlearn_iir_q15.new(c)
     def process(self, samples):
         self.iir.run(samples)
 

src/eml_iir_q15/Makefile renamed to src/emlearn_iir_q15/Makefile

@@ -13,7 +13,7 @@ CMSIS_DSP_DIR := ../../dependencies/CMSIS-DSP
 DIST_DIR := ../../dist/$(ARCH)_$(MPY_ABI_VERSION)
 
 # Name of module
-MOD = eml_iir_q15
+MOD = emlearn_iir_q15
 
 # Source files (.c or .py)
 SRC = iir_filter.c iir_filter.py

src/eml_iir_q15/iir_filter.c renamed to src/emlearn_iir_q15/iir_filter.c

@@ -9,7 +9,7 @@ def convert_coefficients(c, scale=(2**13)-1):
 
     # Transposed Direct Form II / sosfilt / emliir
     # [ b0, b1, b2, 1.0, -a1, -a2 ]
-    # Direct Form I / eml_iir_q15 
+    # Direct Form I / emlearn_iir_q15 
     # [ b0, 0, b1, b2, a1, a2 ]
 
     # NOTE: CMSIS-DSP “a” coefficients are negative compared to SciPy conventions

src/eml_iir_q15/iir_filter.py renamed to src/emlearn_iir_q15/iir_filter.py

@@ -1,6 +1,6 @@
 
 
-import eml_iir_q15
+import emlearn_iir_q15
 
 import array
 import gc
@@ -23,7 +23,7 @@
 def test_convert_coefficients():
 
     inp = EXAMPLE_COEFFICIENTS
-    out = eml_iir_q15.convert_coefficients(inp)
+    out = emlearn_iir_q15.convert_coefficients(inp)
 
 
 def test_iir_del():
@@ -33,11 +33,11 @@ def test_iir_del():
     gc.enable()
     gc.collect()
 
-    coefficients = eml_iir_q15.convert_coefficients(EXAMPLE_COEFFICIENTS)
+    coefficients = emlearn_iir_q15.convert_coefficients(EXAMPLE_COEFFICIENTS)
 
     before_new = gc.mem_alloc()
 
-    model = eml_iir_q15.new(coefficients)
+    model = emlearn_iir_q15.new(coefficients)
     after_new = gc.mem_alloc()
     added = after_new - before_new