diff options
| author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-04-02 14:40:09 -0700 |
|---|---|---|
| committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-04-04 23:39:56 -0700 |
| commit | 584abd3832f0a3f2e7e37fb83dffba0d7ce05d43 (patch) | |
| tree | 42e482b8fac76523c11a96312501ec361951c5c2 /python | |
| parent | 8d44507a30072242a6861bf81e496643cb0cb2a2 (diff) | |
| download | caffe-584abd3832f0a3f2e7e37fb83dffba0d7ce05d43.tar.gz caffe-584abd3832f0a3f2e7e37fb83dffba0d7ce05d43.tar.bz2 caffe-584abd3832f0a3f2e7e37fb83dffba0d7ce05d43.zip | |
pycaffe: expose SGDSolver.solve
Diffstat (limited to 'python')
| -rw-r--r-- | python/caffe/_caffe.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp index 9949430f..1a0974f1 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>()); |