updated a bunch of things, ready to test if it breaks things

[jacinto-ai/caffe-jacinto.git] / src / caffe / blob.hpp

diff --git a/src/caffe/blob.hpp b/src/caffe/blob.hpp
index f0e19c277de09ae49591a4d774cba501376042e5..f31d3b0f693c7b3f3a60412e390b7f0be3064b32 100644 (file)
--- a/src/caffe/blob.hpp
+++ b/src/caffe/blob.hpp
@@ -29,6 +29,10 @@ class Blob {
       const int w = 0) const {
     return ((n * channels_ + c) * height_ + h) * width_ + w;
   }
+  // Copy from source. If copy_diff is false, we copy the data; if copy_diff
+  // is true, we copy the diff.
+  void CopyFrom(const Blob<Dtype>& source, bool copy_diff = false,
+      bool reshape = false);
 
   inline Dtype data_at(const int n, const int c, const int h,
       const int w) const {