Merge pull request BVLC#4 from Russell91/name_changes

added f() methods in c++, including a new one that takes a string prototxt
twmht · Aug 21, 2015 · 1f62afa · 1f62afa
2 parents 1239e65 + 173c605
commit 1f62afa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/include/caffe/apollonet.hpp b/include/caffe/apollonet.hpp
@@ -27,7 +27,9 @@ class ApolloNet {
 
   Dtype ForwardLayer(const string& layer_param_string);
 
-  Dtype ForwardLayer(shared_ptr<Layer<Dtype> > layer);
+  Dtype f(shared_ptr<Layer<Dtype> > layer);
+
+  Dtype f(const string& layer_prototxt);
 
   void BackwardLayer(const string& layer_name);
 

diff --git a/src/caffe/apollonet.cpp b/src/caffe/apollonet.cpp
@@ -18,8 +18,16 @@ template <typename Dtype>
 ApolloNet<Dtype>::ApolloNet() {
   Init();
 }
+
+template <typename Dtype>
+Dtype ApolloNet<Dtype>::f(const string& layer_prototxt) {
+  shared_ptr<Layer<Dtype> > layer =
+    LayerRegistry<Dtype>::CreateLayer(layer_prototxt);
+  return f(layer);
+}
+
 template <typename Dtype>
-Dtype ApolloNet<Dtype>::ForwardLayer(shared_ptr<Layer<Dtype> > layer) {
+Dtype ApolloNet<Dtype>::f(shared_ptr<Layer<Dtype> > layer) {
   /* This function will
    * 1) Add the layer to the cache if it's new
    * 2) Set up the top blobs