integrate with ML KWS

deanmcgregor · Mar 16, 2019 · 42dc321 · 42dc321
1 parent ae4736d
commit 42dc321
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 11 deletions.
diff --git a/.emacs b/.emacs
@@ -134,6 +134,11 @@
 
 (add-hook 'find-file-hooks 'make-some-files-read-only)
 
+(add-hook 'python-mode-hook
+  (lambda ()
+    (setq indent-tabs-mode t)
+    (setq tab-width 4)
+    (setq python-indent 4)))
 
 ;example
 ;============

diff --git a/com/as.infrastructure/Kconfig b/com/as.infrastructure/Kconfig
@@ -5,3 +5,4 @@ source "$ASROOT/com/as.infrastructure/memory/Kconfig"
 source "$ASROOT/com/as.infrastructure/system/Kconfig"
 source "$ASROOT/com/as.infrastructure/clib/Kconfig"
 source "$ASROOT/com/as.infrastructure/libraries/Kconfig"
+source "$ASROOT/com/as.infrastructure/libraries/nn/Kconfig"
diff --git a/com/as.infrastructure/arch/virt/Kconfig b/com/as.infrastructure/arch/virt/Kconfig
@@ -38,9 +38,21 @@ config MCU
 	bool "MCAL MCU driver"
 	default y
 
+choice
+	prompt "ethernet driver"
+	default LWIP_DRV
+
 config LWIP_DRV
 	bool "LWIP driver"
 	depends on PCI
-	default y
+
+config UIP_DRV
+	bool "micro IP driver from contiki"
+	depends on PCI
+
+config NO_ETH_DRV
+	   bool "disabled"
+
+endchoice
 
 endmenu
diff --git a/com/as.infrastructure/arch/x86/Kconfig b/com/as.infrastructure/arch/x86/Kconfig
@@ -35,10 +35,22 @@ config MCU
 	bool "MCAL MCU driver"
 	default y
 
+choice
+	prompt "ethernet driver"
+	default LWIP_DRV
+
 config LWIP_DRV
 	bool "LWIP driver"
 	depends on PCI
-	default y
+
+config UIP_DRV
+	bool "micro IP driver from contiki"
+	depends on PCI
+
+config NO_ETH_DRV
+	   bool "disabled"
+
+endchoice
 
 if RTTHREAD
 config LIBC_SIGNAL_H__

diff --git a/com/as.infrastructure/libraries/Kconfig b/com/as.infrastructure/libraries/Kconfig
@@ -12,15 +12,6 @@ config TRACE
 	bool "enable the trace library"
 	default n
 
-config ARMNN
-	bool "enable ARM CMSIS NN library"
-	default n
-
-config NNOM
-	bool "enable Neural Network on Microcontroller"
-	default y
-	depends on ARMNN
-
 config LIBFIXMATH
 	bool "Cross Platform Fixed Point Maths Library"
 	default y

diff --git a/com/as.infrastructure/libraries/nn/Kconfig b/com/as.infrastructure/libraries/nn/Kconfig
@@ -0,0 +1,17 @@
+menu "AI libraries for Microcontrollers"
+
+config ARMNN
+	bool "enable ARM CMSIS NN library"
+	default n
+
+config NNOM
+	bool "enable Neural Network on Microcontroller"
+	default y
+	depends on ARMNN
+
+config KWS
+	bool "Keyword spotting for Microcontrollers"
+	default y
+	depends on ARMNN
+
+endmenu
diff --git a/com/as.infrastructure/libraries/nn/armnn/SConscript b/com/as.infrastructure/libraries/nn/armnn/SConscript
@@ -10,5 +10,7 @@ objs = []
 AddPackage('https://github.com/autoas/CMSIS_5.git')
 if('NNOM' in MODULES):
     AddPackage('https://github.com/autoas/nnom.git')
+if('KWS' in MODULES):
+    AddPackage('https://github.com/autoas/ML-KWS-for-MCU.git')
 
 Return('objs')