add split layer insertion tests; move split insertion code to util file

2 files changed, 21 insertions, 3 deletions

diff --git a/include/caffe/net.hpp b/include/caffe/net.hpp
index cee1d386..684d6c5a 100644
--- a/include/caffe/net.hpp
+++ b/include/caffe/net.hpp
@@ -28,9 +28,6 @@ class Net {
 
   // Initialize a network with the network parameter.
   void Init(const NetParameter& param);
-  // Copy NetParameters with SplitLayers added to replace any shared bottom
-  // blobs with unique bottom blobs provided by the SplitLayer.
-  void AddSplits(const NetParameter& param, NetParameter* param_split);
 
   // Run forward with the input blobs already fed separately. You can get the
   // input blobs using input_blobs().
diff --git a/include/caffe/util/insert_splits.hpp b/include/caffe/util/insert_splits.hpp
new file mode 100644
index 00000000..f8aae288
--- /dev/null
+++ b/include/caffe/util/insert_splits.hpp
@@ -0,0 +1,21 @@
+// Copyright 2014 Jeff Donahue
+
+#ifndef _CAFFE_UTIL_INSERT_SPLITS_HPP_
+#define _CAFFE_UTIL_INSERT_SPLITS_HPP_
+
+#include "caffe/proto/caffe.pb.h"
+
+using std::string;
+
+namespace caffe {
+
+// Copy NetParameters with SplitLayers added to replace any shared bottom
+// blobs with unique bottom blobs provided by the SplitLayer.
+void insert_splits(const NetParameter& param, NetParameter* param_split);
+
+void configure_split_layer(const string& blob_name,
+    const int split_count, LayerConnection* split_layer_connection);
+
+}  // namespace caffe
+
+#endif  // CAFFE_UTIL_INSERT_SPLITS_HPP_