Merge, stronger PyCaffe interface.

Author: naibaf7

python/caffe/__init__.py

@@ -1,4 +1,4 @@
-from .pycaffe import Net, SGDSolver, NesterovSolver, AdaGradSolver, RMSPropSolver, AdaDeltaSolver, AdamSolver
+from .pycaffe import SolverParameter, Net, SGDSolver, NesterovSolver, AdaGradSolver, RMSPropSolver, AdaDeltaSolver, AdamSolver
 from ._caffe import set_mode_cpu, set_mode_gpu, set_device, enumerate_devices, Layer, get_solver, layer_type_list
 from .proto.caffe_pb2 import TRAIN, TEST
 from .classifier import Classifier

python/caffe/_caffe.cpp

@@ -305,7 +305,7 @@ BOOST_PYTHON_MODULE(_caffe) {
     .def("snapshot", &Solver<Dtype>::Snapshot);
 
 
-  bp::class_<SolverParameter>("SolverParam", bp::no_init)
+  bp::class_<SolverParameter>("SolverParameter", bp::init<>())
     .add_property("base_lr",   &SolverParameter::base_lr,
                                &SolverParameter::set_base_lr)
     .add_property("max_iter",  &SolverParameter::max_iter,
@@ -355,7 +355,12 @@ BOOST_PYTHON_MODULE(_caffe) {
                        bp::make_function(&SolverParameter::net,
                        bp::return_value_policy<bp::copy_const_reference>()),
                        static_cast<void (SolverParameter::*)(const string&)>(
-                               &SolverParameter::set_net));
+                               &SolverParameter::set_net))
+    .add_property("train_net",
+                       bp::make_function(&SolverParameter::train_net,
+                       bp::return_value_policy<bp::copy_const_reference>()),
+                       static_cast<void (SolverParameter::*)(const string&)>(
+                               &SolverParameter::set_train_net));
 
 
   bp::class_<SGDSolver<Dtype>, bp::bases<Solver<Dtype> >,

python/caffe/pycaffe.py

@@ -10,8 +10,10 @@
     from itertools import zip_longest as izip_longest
 import numpy as np
 
-from ._caffe import Net, SGDSolver, NesterovSolver, AdaGradSolver, \
-        RMSPropSolver, AdaDeltaSolver, AdamSolver
+from ._caffe import \
+    SolverParameter, Net, SGDSolver, NesterovSolver, AdaGradSolver, \
+    RMSPropSolver, AdaDeltaSolver, AdamSolver
+    
 import caffe.io
 
 # We directly update methods from Net here (rather than using composition or