Pycaffe interface update.

Author: naibaf7

python/caffe/_caffe.cpp

@@ -325,7 +325,7 @@ BOOST_PYTHON_MODULE(_caffe) {
         bp::return_value_policy<bp::copy_const_reference>()))
     .add_property("_blobs", bp::make_function(&Net<Dtype>::blobs,
         bp::return_internal_reference<>()))
-    .add_property("_layers", bp::make_function(&Net<Dtype>::layers,
+    .add_property("layers", bp::make_function(&Net<Dtype>::layers,
         bp::return_internal_reference<>()))
     .add_property("_blob_names", bp::make_function(&Net<Dtype>::blob_names,
         bp::return_value_policy<bp::copy_const_reference>()))

python/caffe/pycaffe.py

@@ -52,12 +52,12 @@ def _Net_params(self):
                         if len(lr.blobs) > 0])
 
 @property
-def _Net_layers(self):
+def _Net_layers_dict(self):
     """
     An OrderedDict (bottom to top, i.e., input to output) of network
     layers indexed by name
     """
-    return OrderedDict(zip(self._layer_names, self._layers))
+    return OrderedDict(zip(self._layer_names, self.layers))
 
 
 @property
@@ -313,7 +313,7 @@ def __getitem__(self, name):
         return [id_to_name[i] for i in ids]
 
 # Attach methods to Net.
-Net.layers = _Net_layers
+Net.layers_dict = _Net_layers_dict
 Net.blobs = _Net_blobs
 Net.blob_loss_weights = _Net_blob_loss_weights
 Net.params = _Net_params