Revert "Merge pull request #114 from jeffdonahue/dags-by-split"
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 18 Feb 2014 01:03:57 +0000 (17:03 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 18 Feb 2014 01:03:57 +0000 (17:03 -0800)
commitdda89784ee208061484f102bff7dde4a8616f3e9
tree2effe9291ef31ad29280cb5038d47ec891485e8f
parent59cdf127c28df07369ca8d2d1ba6f87d21c75972
Revert "Merge pull request #114 from jeffdonahue/dags-by-split"

Revert dags-by-split merge because split layers were not quite ready.
Sorry for the bug!

We are adopting a `master`/`dev` split development
model, where new commits and pull requests will be merged to `dev` for
testing before integration to `master`. This will keep master clean and
stable.

This reverts commit d339d242b43ec5bec9dceb657ee0d665d524b1eb, reversing
changes made to 55198262d79944fa7382868f7ecd108ed4f238a2.
include/caffe/util/insert_splits.hpp [deleted file]
include/caffe/vision_layers.hpp
src/caffe/layer_factory.cpp
src/caffe/layers/split_layer.cpp [deleted file]
src/caffe/net.cpp
src/caffe/test/test_split_layer.cpp [deleted file]
src/caffe/util/insert_splits.cpp [deleted file]