Add names to the blobs returned by CaffeLayer

Even though these are redundant, this keeps the meaning of
CaffeBlob.name consistent for now, and will allow CaffeBlob construction
to be simplified.

diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
index c5e9e84..c2a2618 100644 (file)
--- a/python/caffe/_caffe.cpp
+++ b/python/caffe/_caffe.cpp
@@ -108,7 +108,11 @@ class CaffeLayer {
 
   string name() const { return name_; }
   vector<CaffeBlob> blobs() {
-    return vector<CaffeBlob>(layer_->blobs().begin(), layer_->blobs().end());
+    vector<CaffeBlob> result;
+    for (int i = 0; i < layer_->blobs().size(); ++i) {
+      result.push_back(CaffeBlob(layer_->blobs()[i], name_));
+    }
+    return result;
   }
 
   // this is here only to satisfy boost's vector_indexing_suite