Merge pull request BVLC#1195 from longjon/python-copy-from

Expose Net.copy_from and Net.share_with in pycaffe
mitmul · Oct 10, 2014 · cf9dd50 · cf9dd50
2 parents ec89ca2 + 5747075
commit cf9dd50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
@@ -153,6 +153,8 @@ BOOST_PYTHON_MODULE(_caffe) {
   bp::class_<PyNet, shared_ptr<PyNet> >(
       "Net", bp::init<string, string>())
       .def(bp::init<string>())
+      .def("copy_from",             &PyNet::CopyTrainedLayersFrom)
+      .def("share_with",            &PyNet::ShareTrainedLayersWith)
       .def("_forward",              &PyNet::Forward)
       .def("_backward",             &PyNet::Backward)
       .def("reshape",               &PyNet::Reshape)

diff --git a/python/caffe/_caffe.hpp b/python/caffe/_caffe.hpp
@@ -98,6 +98,12 @@ class PyNet {
   inline void check_contiguous_array(PyArrayObject* arr, string name,
       int channels, int height, int width);
 
+  void CopyTrainedLayersFrom(const string filename) {
+    net_->CopyTrainedLayersFrom(filename);
+  }
+  void ShareTrainedLayersWith(PyNet* other) {
+    net_->ShareTrainedLayersWith(other->net_.get());
+  }
   void Forward(int start, int end) { net_->ForwardFromTo(start, end); }
   void Backward(int start, int end) { net_->BackwardFromTo(start, end); }
   void Reshape() { net_->Reshape(); }