From 584abd3832f0a3f2e7e37fb83dffba0d7ce05d43 Mon Sep 17 00:00:00 2001
From: Jonathan L Long <jonlong@cs.berkeley.edu>
Date: Wed, 2 Apr 2014 14:40:09 -0700
Subject: [PATCH] pycaffe: expose SGDSolver.solve

---
 python/caffe/_caffe.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
index 9949430..1a0974f 100644
--- a/python/caffe/_caffe.cpp
+++ b/python/caffe/_caffe.cpp
@@ -293,6 +293,11 @@ class CaffeSGDSolver {
   }
 
   CaffeNet net() { return CaffeNet(solver_->net()); }
+  void Solve() { return solver_->Solve(); }
+  void SolveResume(const string& resume_file) {
+    CheckFile(resume_file);
+    return solver_->Solve(resume_file);
+  }
 
  protected:
   shared_ptr<SGDSolver<float> > solver_;
@@ -333,7 +338,9 @@ BOOST_PYTHON_MODULE(_caffe) {
 
   boost::python::class_<CaffeSGDSolver, boost::noncopyable>(
       "SGDSolver", boost::python::init<string>())
-      .add_property("net", &CaffeSGDSolver::net);
+      .add_property("net", &CaffeSGDSolver::net)
+      .def("solve",        &CaffeSGDSolver::Solve)
+      .def("solve",        &CaffeSGDSolver::SolveResume);
 
   boost::python::class_<vector<CaffeBlob> >("BlobVec")
       .def(vector_indexing_suite<vector<CaffeBlob>, true>());
-- 
2.7.4