Merge pull request #478 from kloudkl/cpu_only_tests
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Wed, 25 Jun 2014 23:58:03 +0000 (16:58 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Wed, 25 Jun 2014 23:58:03 +0000 (16:58 -0700)
CPU only tests

1  2 
src/caffe/common.cpp

Simple merge