Changed stddev to var and added affine params to BatchNorm

Author: AnirudhBHarish

c_reference/include/conv1d.h

@@ -58,5 +58,5 @@ int AvgPool1D(float *output_signal, unsigned out_T, const float *input_signal, u
     int padding, unsigned kernel_size, int activations);
 
 int BatchNorm1d(float* output_signal, float* input_signal, unsigned in_T, unsigned in_channels, 
-    float* mean, float* stddev, unsigned in_place);
+    float* mean, float* var, unsigned affine, float* gamma , float * beta, unsigned in_place);
 #endif

c_reference/src/Makefile

@@ -6,7 +6,10 @@ include ../config.mk
 INCLUDE_DIR=../include
 IFLAGS = -I $(INCLUDE_DIR)
 
-all: conv1d.o conv_utils.o utils.o fastgrnn.o classifier.o rnnpool.o quantized_utils.o quantized_fastgrnn.o quantized_rnnpool.o quantized_mbconv.o 
+all: dscnn.o conv1d.o conv_utils.o utils.o fastgrnn.o classifier.o rnnpool.o quantized_utils.o quantized_fastgrnn.o quantized_rnnpool.o quantized_mbconv.o 
+
+dscnn.o : dscnn.c
+	$(CC) -o $@ $(IFLAGS) $(CFLAGS) -c $^
 
 conv_utils.o : conv_utils.c
 	$(CC) -o $@ $(IFLAGS) $(CFLAGS) -c $^

c_reference/src/conv1d.c

@@ -211,18 +211,36 @@ int AvgPool1D(float *output_signal, unsigned out_T, const float *input_signal, u
 }
 
 int BatchNorm1d(float* output_signal, float* input_signal, unsigned in_T, unsigned in_channels, 
-    float* mean, float* stddev, unsigned in_place){
-    if(in_place){
-        for(int t = 0; t < in_T ; t++){
-            for(int d = 0 ; d < in_channels ; d++){
-                input_signal[t * in_channels + d]  = (input_signal[t * in_channels + d] - mean[d])/stddev[d];
+    float* mean, float* var, unsigned affine, float* gamma , float * beta, unsigned in_place){
+    if(affine){
+        if(in_place){
+            for(int t = 0; t < in_T ; t++){
+                for(int d = 0 ; d < in_channels ; d++){
+                    input_signal[t * in_channels + d]  = gamma[d]*((input_signal[t * in_channels + d] - mean[d])/sqrt(var[d])) + beta[d];
+                }
+            }
+        }
+        else{
+            for(int t = 0; t < in_T ; t++){
+                for(int d = 0 ; d < in_channels ; d++){
+                    output_signal[t * in_channels + d] = gamma[d]*((input_signal[t * in_channels + d] - mean[d])/sqrt(var[d])) + beta[d];
+                }
             }
         }
     }
     else{
-        for(int t = 0; t < in_T ; t++){
-            for(int d = 0 ; d < in_channels ; d++){
-                output_signal[t * in_channels + d] = (input_signal[t * in_channels + d] - mean[d])/stddev[d];
+        if(in_place){
+            for(int t = 0; t < in_T ; t++){
+                for(int d = 0 ; d < in_channels ; d++){
+                    input_signal[t * in_channels + d]  = ((input_signal[t * in_channels + d] - mean[d])/sqrt(var[d]));
+                }
+            }
+        }
+        else{
+            for(int t = 0; t < in_T ; t++){
+                for(int d = 0 ; d < in_channels ; d++){
+                    output_signal[t * in_channels + d] = ((input_signal[t * in_channels + d] - mean[d])/sqrt(var[d]));
+                }
             }
         }
     }

c_reference/tests/Makefile

@@ -7,7 +7,11 @@ INCLUDE_DIR=../include
 SRC_DIR=../src
 IFLAGS = -I $(INCLUDE_DIR)
 
-all: test_avg_pool test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv
+all: test_avg_pool test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_dscnn_lr test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv
+
+DSCNN_DIR=dscnn
+test_dscnn_lr: $(DSCNN_DIR)/test_dscnn_lr.c $(SRC_DIR)/conv_utils.o $(SRC_DIR)/conv1d.o $(SRC_DIR)/dscnn.o
+	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
 
 CONV1D_DIR=conv1d
 test_conv1d: $(CONV1D_DIR)/conv1d_regular/test_conv1d.c $(SRC_DIR)/conv_utils.o $(SRC_DIR)/conv1d.o
@@ -44,7 +48,7 @@ test_quantized_mbconv: $(MBCONV_DIR)/test_quantized_mbconv.c $(SRC_DIR)/quantize
 .PHONY: clean cleanest
 
 clean: 
-	rm -f *.o *.gch test_avg_pool test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv
+	rm -f *.o *.gch test_avg_pool test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_dscnn_lr test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv
 
 cleanest: clean
 	rm *~