summaryrefslogtreecommitdiff
path: root/src/caffe/net.cpp
diff options
context:
space:
mode:
authorYangqing Jia <jiayq84@gmail.com>2013-11-11 17:08:27 -0800
committerYangqing Jia <jiayq84@gmail.com>2013-11-11 17:08:27 -0800
commit652d744360fb317a41e0456c0d1226262c5a70d4 (patch)
treed74f78a0ec4917d51a8674804f0535d625f57901 /src/caffe/net.cpp
parent76bf486e3de96fe6f5619693742e5c1bb19074b2 (diff)
parentc8e7cce7316c29b32d0b2dcdc98bff75afa0ab40 (diff)
downloadcaffe-652d744360fb317a41e0456c0d1226262c5a70d4.tar.gz
caffe-652d744360fb317a41e0456c0d1226262c5a70d4.tar.bz2
caffe-652d744360fb317a41e0456c0d1226262c5a70d4.zip
Merge branch 'master' of github.com:Yangqing/caffe
Conflicts: Makefile
Diffstat (limited to 'src/caffe/net.cpp')
-rw-r--r--src/caffe/net.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp
index dec42036..3266064d 100644
--- a/src/caffe/net.cpp
+++ b/src/caffe/net.cpp
@@ -287,7 +287,7 @@ void Net<Dtype>::CopyTrainedLayersFrom(const NetParameter& param) {
DLOG(INFO) << "Ignoring source layer " << source_layer_name;
continue;
}
- DLOG(INFO) << "Loading source layer " << source_layer_name;
+ LOG(INFO) << "Copying source layer " << source_layer_name;
vector<shared_ptr<Blob<Dtype> > >& target_blobs =
layers_[target_layer_id]->blobs();
CHECK_EQ(target_blobs.size(), source_layer.blobs_size())