Combined testbenches for conv1d and changed macros

Author: AnirudhBHarish

.gitattributes

@@ -70,7 +70,5 @@ c_reference/tests/conv1d/conv1d_depthwise/conv_param_depth.h filter=lfs diff=lfs
 c_reference/tests/kws/precnn_params.h filter=lfs diff=lfs merge=lfs -text
 c_reference/tests/kws/postcnn_params.h filter=lfs diff=lfs merge=lfs -text
 c_reference/tests/kws/rnn_params.h filter=lfs diff=lfs merge=lfs -text
-c_reference/tests/dscnn/dscnn_param_lr.h filter=lfs diff=lfs merge=lfs -text
-c_reference/tests/dscnn/dscnn_param_lr_depth_point.h filter=lfs diff=lfs merge=lfs -text
 c_reference/tests/rnn_bricked/rnn_params.h filter=lfs diff=lfs merge=lfs -text
 c_reference/tests/rnn_bricked/rnn_bricked_io.h filter=lfs diff=lfs merge=lfs -text

c_reference/include/rnn_bricked.h

@@ -23,7 +23,7 @@ typedef int (*rnn_t)(float* const, unsigned, const float* const, unsigned, unsig
 // For Bi-Directional use, there are 2 constarints
 // 1) (in_time - window) % hop == 0
 // 2) both the window % hop == 0
-// 3) sample_first_brick and sample_last_brick = 0
+// 3) sample_first_brick and sample_last_brick = 1
 //
 // Violation of these constraints can lead to one of the following issues
 // 1) segmenation faults 

c_reference/src/rnn_bricked.c

@@ -12,7 +12,7 @@ int forward_bricked_rnn(float* output_signal, unsigned rnn_hidden, float* input_
   unsigned in_time, unsigned in_dims, unsigned window, unsigned hop,
   rnn_t rnn, const void* params, void* buffers,
   int bi_direction, int sample_first_brick, int normalize) {
-  int out_index = 0, t;
+  int out_index = 0, t; // t is an index, but we want ot remember the value after the loop. Hence we define it outside
 
   unsigned rnn_assign_offset = rnn_hidden;
   float* temp_hiddenstate = (float*)calloc(rnn_hidden, sizeof(float));

c_reference/tests/Makefile

@@ -8,22 +8,10 @@ MODEL_DIR=../models
 SRC_DIR=../src
 IFLAGS = -I $(INCLUDE_DIR) -I $(MODEL_DIR)
 
-all: test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_dscnn_lr test_dscnn_lr_depth_point test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv test_quantized_face_detection test_quantized_face_detection_fast test_quantized_face_detection_sparse test_rnn_bricked test_phoneme_det_cnn_rnn
+all: test_fastgrnn_lr test_conv1d test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv test_quantized_face_detection test_quantized_face_detection_fast test_quantized_face_detection_sparse test_rnn_bricked test_phoneme_det_cnn_rnn
 
 CONV1D_DIR=conv1d
-test_conv1d: $(CONV1D_DIR)/conv1d_regular/test_conv1d.c $(SRC_DIR)/conv1d.o $(SRC_DIR)/utils.o
-	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
-test_conv1d_depth: $(CONV1D_DIR)/conv1d_depthwise/test_conv1d_depth.c $(SRC_DIR)/conv1d.o $(SRC_DIR)/utils.o
-	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
-test_conv1d_lr: $(CONV1D_DIR)/conv1d_lr/test_conv1d_lr.c $(SRC_DIR)/conv1d.o $(SRC_DIR)/utils.o
-	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
-test_conv1d_lr_depth: $(CONV1D_DIR)/conv1d_lr_depthwise/test_conv1d_lr_depth.c $(SRC_DIR)/conv1d.o $(SRC_DIR)/utils.o
-	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
-
-DSCNN_DIR=dscnn
-test_dscnn_lr: $(DSCNN_DIR)/test_dscnn_lr.c $(SRC_DIR)/utils.o $(SRC_DIR)/conv1d.o $(SRC_DIR)/dscnn.o
-	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
-test_dscnn_lr_depth_point : $(DSCNN_DIR)/test_dscnn_lr_depth_point.c $(SRC_DIR)/utils.o $(SRC_DIR)/conv1d.o $(SRC_DIR)/dscnn.o
+test_conv1d: $(CONV1D_DIR)/test_conv1d.c $(SRC_DIR)/conv1d.o $(SRC_DIR)/utils.o
 	$(CC) -o $@ $^ $(IFLAGS) $(CFLAGS) -lm
 
 FASTGRNN_DIR=fastgrnn
@@ -65,7 +53,7 @@ test_phoneme_det_cnn_rnn: $(KWS_DIR)/test_phoneme_det_cnn_rnn.c $(SRC_DIR)/utils
 .PHONY: clean cleanest
 
 clean: 
-	rm -f *.o *.gch test_conv1d test_conv1d_depth test_conv1d_lr test_conv1d_lr_depth test_dscnn_lr test_dscnn_lr_depth_point test_fastgrnn_lr test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv test_quantized_face_detection test_quantized_face_detection_fast test_quantized_face_detection_sparse test_rnn_bricked test_phoneme_det_cnn_rnn
+	rm -f *.o *.gch test_fastgrnn_lr test_conv1d test_rnnpool test_quantized_utils test_quantized_fastgrnn test_quantized_rnnpool test_quantized_mbconv test_quantized_face_detection test_quantized_face_detection_fast test_quantized_face_detection_sparse test_rnn_bricked test_phoneme_det_cnn_rnn
 
 cleanest: clean
 	rm *~

c_reference/tests/conv1d/conv1d_depthwise/conv_param_depth.h

@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84a457f9627cc6b439a886866b341562eaa42ca1330326aa1e9ec0c3c0a839bc
-size 1883689
+version https://git-lfs.github.com/spec/v1
+oid sha256:366394ea8c774d6cf481cca16a90fade1485991c0b5788489df6b6626bd236ca
+size 1884036

c_reference/tests/conv1d/conv1d_depthwise/test_conv1d_depth.c

@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72fe39ff914d860556af1bc72a40af3fcb2d4540bc60b18924f6de4b882a9a44
-size 5119351
+version https://git-lfs.github.com/spec/v1
+oid sha256:580bb827ae804ad27ef75be6ba16731aff547a22631f9c3ee62e17cf79e3c838
+size 5119705

c_reference/tests/conv1d/conv1d_lr/conv_param_lr.h

@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7d62a5a82464d0cd03857bbc1e0add56624fd294f748b47259f72fc81ead930
-size 1947518
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e44aba5fb5b03b601060e6ebacfe9047132825f711431bcaf3279a582425151
+size 1948109