Back-merge
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Wed, 24 Sep 2014 21:48:04 +0000 (14:48 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Wed, 24 Sep 2014 21:48:04 +0000 (14:48 -0700)
commit90bd50d4c09e3ba1beebfb30cb63556c28fa8c1b
tree2bdd39f981fad63519cff5e650a2b3e020c6f8ce
parent2c8d946b67d5024ec56d6abc85ea53ed33df8fa4
parent4bb198ae4431f3c24b6faf9ab3a63841a50b1ced
Back-merge

  Fixed param order of cv::Size in cv::resize
  switch examples to lmdb (except for custom data loaders)
  fix cifar10 paths so they can be run from caffe root
  default backend to lmdb for image conversion and mean computation