1. debian/control - use ti-linalg instead of libblas-dev

2. debian/changelog - use new version 1.0.1.0
3. remove /src/database/makefile
4. change /src/app/makefile /src/benchmark/makefile /src/test/makefile to use ti-linalg library
5. build/build_version.txt - change to 1.0.1.0 version

diff --git a/build/build_version.txt b/build/build_version.txt
index 1921233b3e10b450bd3d5f367bb342f1b864fea2..0839c1f8dbe59c2ed27b75f97269428fc03fe1a7 100644 (file)
--- a/build/build_version.txt
+++ b/build/build_version.txt
@@ -1 +1 @@
-1.0.0.0
+1.0.1.0

diff --git a/debian/changelog b/debian/changelog
index 4781bed357702763e6c93e0d8b8bda996e63ba85..e01b59fc6eb591bdc7f20d92cf6d0c5ba1c85629 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ti-ml (01.00.01.00-0ubuntu0~ppa1) trusty; urgency=medium
+
+  * Added pre-downloaded images to one of the examples(appCNNClassCIFAR10)
+
+ -- TI Keystone PPA <ti-keystone-ppa@list.ti.com>  Fri, 01 May 2015 04:04:49 +0000
+
 ti-ml (01.00.00.00-0ubuntu0~ppa2) trusty; urgency=medium
 
   * Fixing debian/control

diff --git a/debian/control b/debian/control
index 49463a118b7626360645b82f26a70b6a4fa40d0a..e79dfaca86ad5cc2469fa35725113be1cd35ef28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: TI Keystone PPA <ti-keystone-ppa@list.ti.com>
 Build-Depends: debhelper (>= 9),\r
                ti-opencl (>= 0.12.0),\r
                ti-cgt-c6x (>= 8.0.0GAv2),\r
-              libatlas-base-dev (>= 3.10.1),\r
+              ti-linalg (>= 00.08.00.00),\r
               libjpeg-dev,\r
               libprotobuf-dev (>= 2.5.0),\r
               libopencv-dev (>= 2.4.8)\r
@@ -15,7 +15,7 @@ Package: ti-ml
 Depends: ${misc:Depends}, \r
          ti-opencl (>= 0.12.0),\r
          ti-cgt-c6x (>= 8.0.0GAv2),\r
-        libatlas-base-dev (>= 3.10.1),\r
+        ti-linalg (>= 00.08.00.00),\r
         libjpeg-dev,\r
         libprotobuf-dev (>= 2.5.0),\r
         libopencv-dev (>= 2.4.8)\r

diff --git a/src/app/makefile b/src/app/makefile
index 38e2da5de582b6b58465a597757dcfc62e12085a..7bafae2a71b46a791965162723e2d4ae05a363ec 100644 (file)
--- a/src/app/makefile
+++ b/src/app/makefile
@@ -37,7 +37,7 @@
 C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
 /usr/include
 C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
-C_LIB = timl blas jpeg m 
+C_LIB = timl cblas_armplusdsp blis OpenCL stdc++ rt jpeg m
 C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
 C_LIB_PATH = /usr/lib ../../bin
 C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)

diff --git a/src/benchmark/makefile b/src/benchmark/makefile
index b02953b3113224d76bdbbca32790d4f2d6ce0a4d..f09a75ff2541a7a2643d957109d99c07c3082b73 100644 (file)
--- a/src/benchmark/makefile
+++ b/src/benchmark/makefile
@@ -37,7 +37,7 @@
 C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
 /usr/include
 C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
-C_LIB = timl blas jpeg m 
+C_LIB =  timl cblas_armplusdsp blis OpenCL stdc++ rt jpeg m
 C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
 C_LIB_PATH = /usr/lib ../../bin
 C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)

diff --git a/src/benchmark/makefile~ b/src/benchmark/makefile~
new file mode 100644 (file)
index 0000000..b02953b
--- /dev/null
+++ b/src/benchmark/makefile~
@@ -0,0 +1,82 @@
+################################################################################
+#
+# makefile
+#
+# Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#    Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#    Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+#
+#    Neither the name of Texas Instruments Incorporated nor the names of
+#    its contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+################################################################################
+
+C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
+/usr/include
+C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
+C_LIB = timl blas jpeg m 
+C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
+C_LIB_PATH = /usr/lib ../../bin
+C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)
+CC = gcc
+CFLAGS += -g -O3 -fopenmp
+
+CPPC = g++
+
+AR = @ar
+ARFLAGS = -rcs
+RM = @rm
+RMFLAGS += -fr
+
+# BENCHMARK
+BENCHMARK_SRC_DIR = .
+BENCHMARK_CFILES = $(shell find $(BENCHMARK_SRC_DIR) -name "*.c")
+BENCHMARK_HFILES = $(shell find $(BENCHMARK_SRC_DIR) -name "*.h")
+BENCHMARK_OBJS = $(patsubst %.c, %.o, $(BENCHMARK_CFILES))
+
+# BENCHMARK CNN CLASS
+BENCHMARK_CNN_CLASS_BIN_CFILES = $(shell find $(BENCHMARK_SRC_DIR)/cnn/class -name "*.c")
+BENCHMARK_CNN_CLASS_BIN_OBJS =  $(patsubst %.c, %.o, $(BENCHMARK_CNN_CLASS_BIN_CFILES))
+BENCHMARK_CNN_CLASS_BINS =  $(patsubst %.c, %.bin, $(BENCHMARK_CNN_CLASS_BIN_CFILES))
+
+BENCHMARK_BINS = $(BENCHMARK_CNN_CLASS_BINS)
+
+# benchmarkCNNClass bins
+$(BENCHMARK_CNN_CLASS_BINS): %.bin: %.o  $(COMMON_LIB_FULL_NAME)
+       $(CC) $(CFLAGS) -o $@ $^ \
+       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
+       
+# benchmark objs
+$(BENCHMARK_OBJS):%.o: %.c $(COMMON_LIB_HFILES) $(BENCHMARK_HFILES)
+       $(CC) -c $(CFLAGS) -o $@ $< \
+       $(C_INCLUDE_PATH_FLAG)
+
+all: $(BENCHMARK_BINS)
+
+clean:
+       $(RM) $(RMFLAGS) \
+       $(BENCHMARK_OBJS) \
+       $(BENCHMARK_BINS)

diff --git a/src/database/makefile b/src/database/makefile
deleted file mode 100644 (file)
index 38e2da5..0000000
--- a/src/database/makefile
+++ /dev/null
@@ -1,162 +0,0 @@
-################################################################################
-#
-# makefile
-#
-# Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#    Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#    Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-#
-#    Neither the name of Texas Instruments Incorporated nor the names of
-#    its contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-################################################################################
-
-C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
-/usr/include
-C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
-C_LIB = timl blas jpeg m 
-C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
-C_LIB_PATH = /usr/lib ../../bin
-C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)
-CC = gcc
-CFLAGS += -g -O3 -fopenmp
-
-CPPC = g++
-
-
-AR = @ar
-ARFLAGS = -rcs
-RM = @rm
-RMFLAGS += -fr
-
-
-# APP CNN CLASS
-APP_CNN_CLASS_BIN_CFILES = $(shell find ./cnn/class -name "*.c")
-APP_CNN_CLASS_BIN_OBJS =  $(patsubst %.c, %.o, $(APP_CNN_CLASS_BIN_CFILES))
-APP_CNN_CLASS_BINS =  $(patsubst %.c, %.bin, $(APP_CNN_CLASS_BIN_CFILES))
-APP_CNN_CLASS_HFILES = $(shell find ./cnn/class -name "*.h")
-
-# APP CNN SL
-APP_CNN_SL_BIN_HFILES = $(shell find ./cnn/scene -name "*.h")
-APP_CNN_SL_BIN_CFILES = $(shell find ./cnn/scene/sbd -name "*.c")
-APP_CNN_SL_BIN_OBJS =  $(patsubst %.c, %.o, $(APP_CNN_SL_BIN_CFILES))
-APP_CNN_SL_BINS =  $(patsubst %.c, %.bin, $(APP_CNN_SL_BIN_CFILES))
-APP_CNN_SL_CFILES = $(shell find ./cnn/scene -name "*.c")
-APP_CNN_SL_OBJS = $(patsubst %.c, %.o, $(APP_CNN_SL_CFILES))
-APP_CNN_SL_AUX_OBJS = $(filter-out $(APP_CNN_SL_BIN_OBJS), $(APP_CNN_SL_OBJS))
-
-# APP CNN INTEROP CAFFE
-APP_CNN_INTEROP_CAFFE_BIN_CFILES = $(shell find ./cnn/interop/caffe -name "*.cpp")
-APP_CNN_INTEROP_CAFFE_BIN_OBJS =  $(patsubst %.cpp, %.o, $(APP_CNN_INTEROP_CAFFE_BIN_CFILES))
-APP_CNN_INTEROP_CAFFE_BINS = ./cnn/interop/caffe/appCNNInteropCaffe.bin
-APP_CNN_INTEROP_CAFFE_HFILES = $(shell find ./cnn/interop/caffe -name "*.hpp")
-
-# APP CNN CONVERT IMAGENET
-APP_CNN_CONVERT_IMAGENET_BIN_CFILES = $(shell find ./cnn/convert/imagenet -name "*.cpp")
-APP_CNN_CONVERT_IMAGENET_BIN_OBJS =  $(patsubst %.cpp, %.o, $(APP_CNN_CONVERT_IMAGENET_BIN_CFILES))
-APP_CNN_CONVERT_IMAGENET_BINS = ./cnn/convert/imagenet/appCNNConvertImageNet.bin
-APP_CNN_CONVERT_IMAGENET_HFILES = $(shell find ./cnn/convert/imagenet -name "*.hpp")
-
-# APP CNN CONVERT SBD
-APP_CNN_CONVERT_SBD_BIN_CFILES = $(shell find ./cnn/convert/sbd -name "*.cpp")
-APP_CNN_CONVERT_SBD_BIN_OBJS =  $(patsubst %.cpp, %.o, $(APP_CNN_CONVERT_SBD_BIN_CFILES))
-APP_CNN_CONVERT_SBD_BINS = ./cnn/convert/sbd/appCNNConvertSBD.bin
-APP_CNN_CONVERT_SBD_HFILES = $(shell find ./cnn/convert/sbd -name "*.hpp")
-
-
-APP_CNN_BINS = \
-$(APP_CNN_CLASS_BINS) \
-$(APP_CNN_SL_BINS) \
-$(APP_CNN_CONVERT_IMAGENET_BINS) \
-$(APP_CNN_CONVERT_SBD_BINS) \
-$(APP_CNN_INTEROP_CAFFE_BINS)
-
-APP_CNN_OBJS = \
-$(APP_CNN_CLASS_BIN_OBJS) \
-$(APP_CNN_SL_OBJS) \
-$(APP_CNN_INTEROP_CAFFE_BIN_OBJS) \
-$(APP_CNN_CONVERT_IMAGENET_BIN_OBJS) \
-$(APP_CNN_CONVERT_SBD_BIN_OBJS)
-
-all: $(APP_CNN_BINS)
-
-clean:
-       $(RM) $(RMFLAGS) \
-       $(APP_CNN_OBJS) \
-       $(APP_CNN_BINS)
-
-# appCNNClass bins
-$(APP_CNN_CLASS_BINS): %.bin: %.o
-       $(CC) $(CFLAGS) -o $@ $^ \
-       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
-       
-# appCNNClass objs
-$(APP_CNN_CLASS_BIN_OBJS): %.o: %.c $(APP_CNN_CLASS_HFILES)
-       $(CC) -c $(CFLAGS) -o $@ $< \
-       $(C_INCLUDE_PATH_FLAG)
-       
-# appCNNScene bins
-$(APP_CNN_SL_BINS): %.bin: %.o $(APP_CNN_SL_AUX_OBJS)
-       $(CC) $(CFLAGS) -o $@ $^ \
-       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
-
-# appCNNScene objs
-$(APP_CNN_SL_OBJS): %.o: %.c $(APP_CNN_SL_HFILES)
-       $(CC) -c $(CFLAGS) -o $@ $< \
-       $(C_INCLUDE_PATH_FLAG)
-
-# appCNNConvertImageNet bins 
-$(APP_CNN_CONVERT_IMAGENET_BINS): $(APP_CNN_CONVERT_IMAGENET_BIN_OBJS)
-       $(CPPC) $(CFLAGS) -o $(APP_CNN_CONVERT_IMAGENET_BINS) $^ \
-       -lopencv_core -lopencv_highgui -lopencv_imgproc \
-       $(C_LIB_PATH_FLAG)
-       
-# appCNNConvertImageNet objs
-$(APP_CNN_CONVERT_IMAGENET_BIN_OBJS): %.o: %.cpp $(APP_CNN_CONVERT_IMAGENET_HFILES)
-       $(CPPC) -c $(CFLAGS) -o $@ $< \
-       $(C_INCLUDE_PATH_FLAG)
-
-# appCNNConvertSBD bins 
-$(APP_CNN_CONVERT_SBD_BINS): $(APP_CNN_CONVERT_SBD_BIN_OBJS)
-       $(CPPC) $(CPPFLAGS) -o $(APP_CNN_CONVERT_SBD_BINS) $^ \
-       -lopencv_core -lopencv_highgui -lopencv_imgproc \
-       $(C_LIB_PATH_FLAG)
-       
-# appCNNConvertSBD objs
-$(APP_CNN_CONVERT_SBD_BIN_OBJS): %.o: %.cpp $(APP_CNN_CONVERT_SBD_HFILES)
-       $(CPPC) -c $(CFLAGS) -o $@ $< \
-       $(C_INCLUDE_PATH_FLAG)
-
-# appCNNInteropCaffe bins
-$(APP_CNN_INTEROP_CAFFE_BINS): $(APP_CNN_INTEROP_CAFFE_BIN_OBJS)
-       $(CPPC) $(CFLAGS) -o $(APP_CNN_INTEROP_CAFFE_BINS) $^ \
-       -lprotobuf \
-       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
-
-# appCNNInteropCaffe objs
-$(APP_CNN_INTEROP_CAFFE_BIN_OBJS): %.o: %.cpp $(APP_CNN_INTEROP_CAFFE_HFILES)
-       $(CPPC) -c $(CFLAGS) -o $@ $< \
-       $(C_INCLUDE_PATH_FLAG)

diff --git a/src/test/makefile b/src/test/makefile
index 546edd6fc16526a4e88a22f84ec57d6c241a477c..148e6e5415902ff91401819418fe6ac9f9585f43 100644 (file)
--- a/src/test/makefile
+++ b/src/test/makefile
@@ -37,7 +37,7 @@
 C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
 /usr/include
 C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
-C_LIB = timl blas jpeg m 
+C_LIB =  timl cblas_armplusdsp blis OpenCL stdc++ rt jpeg m 
 C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
 C_LIB_PATH = /usr/lib ../../bin
 C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)

diff --git a/src/test/makefile~ b/src/test/makefile~
new file mode 100644 (file)
index 0000000..546edd6
--- /dev/null
+++ b/src/test/makefile~
@@ -0,0 +1,97 @@
+################################################################################
+#
+# makefile
+#
+# Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#    Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#    Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+#
+#    Neither the name of Texas Instruments Incorporated nor the names of
+#    its contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+################################################################################
+
+C_INCLUDE_PATH = ../common/api ../common/cnn ../common/util \
+/usr/include
+C_INCLUDE_PATH_FLAG = $(foreach d, $(C_INCLUDE_PATH), -I$d)
+C_LIB = timl blas jpeg m 
+C_LIB_FLAG = $(foreach d, $(C_LIB), -l$d)
+C_LIB_PATH = /usr/lib ../../bin
+C_LIB_PATH_FLAG = $(foreach d, $(C_LIB_PATH), -L$d)
+CC = gcc
+CFLAGS += -g -O3 -fopenmp
+
+CPPC = g++
+
+AR = @ar
+ARFLAGS = -rcs
+RM = @rm
+RMFLAGS += -fr
+
+# TEST
+TEST_SRC_DIR = .
+
+# TEST CNN
+TEST_CNN_BINS = $(TEST_SRC_DIR)/cnn/testCNN.bin
+TEST_CNN_CFILES = $(shell find $(TEST_SRC_DIR)/cnn -name "*.c")
+TEST_CNN_HFILES = $(shell find $(TEST_SRC_DIR)/util -name "*.h")
+TEST_CNN_OBJS = $(patsubst %.c, %.o, $(TEST_CNN_CFILES))
+
+# TEST UTIL
+TEST_UTIL_BINS = $(TEST_SRC_DIR)/util/testUtil.bin
+TEST_UTIL_CFILES = $(shell find $(TEST_SRC_DIR)/util -name "*.c")
+TEST_UTIL_HFILES = $(shell find $(TEST_SRC_DIR)/util -name "*.h")
+TEST_UTIL_OBJS = $(patsubst %.c, %.o, $(TEST_UTIL_CFILES))
+
+TEST_BINS = $(TEST_CNN_BINS) $(TEST_UTIL_BINS)
+TEST_OBJS = $(TEST_CNN_OBJS) $(TEST_UTIL_OBJS)
+
+all: $(TEST_BINS)
+
+clean:
+       $(RM) $(RMFLAGS) \
+       $(TEST_OBJS) \
+       $(TEST_BINS)
+
+# testCNN bins
+$(TEST_CNN_BINS): %.bin: %.o  $(TEST_CNN_OBJS)
+       $(CC) $(CFLAGS) -o $@ $^ \
+       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
+
+# testUtil bins
+$(TEST_UTIL_BINS): %.bin: %.o  $(TEST_UTIL_OBJS)
+       $(CC) $(CFLAGS) -o $@ $^ \
+       $(C_LIB_FLAG) $(C_LIB_PATH_FLAG)
+
+# testCNN objs
+$(TEST_CNN_OBJS):%.o: %.c $(TEST_CNN_HFILES)
+       $(CC) -c $(CFLAGS) -o $@ $< \
+       $(C_INCLUDE_PATH_FLAG)
+       
+# testUtil objs
+$(TEST_UTIL_OBJS):%.o: %.c $(TEST_UTIL_HFILES)
+       $(CC) -c $(CFLAGS) -o $@ $< \
+       $(C_INCLUDE_PATH_FLAG)