summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKai Li <kaili_kloud@163.com>2014-02-26 21:37:25 +0800
committerKai Li <kaili_kloud@163.com>2014-03-19 23:04:42 +0800
commit8e7153b4db7ae46e4e7a4ec579dc11f58b99cb2e (patch)
tree870d0850260a704d227e4a5d0b46205036d5e65c /tools
parentc60d5517811883bb324fbf78eefc67c23f54d330 (diff)
downloadcaffeonacl-8e7153b4db7ae46e4e7a4ec579dc11f58b99cb2e.tar.gz
caffeonacl-8e7153b4db7ae46e4e7a4ec579dc11f58b99cb2e.tar.bz2
caffeonacl-8e7153b4db7ae46e4e7a4ec579dc11f58b99cb2e.zip
Use lowercase underscore naming convention for Net blob & layer getters
Diffstat (limited to 'tools')
-rw-r--r--tools/binarize_features.cpp4
-rw-r--r--tools/extract_features.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/binarize_features.cpp b/tools/binarize_features.cpp
index 74a389c8..881755a9 100644
--- a/tools/binarize_features.cpp
+++ b/tools/binarize_features.cpp
@@ -78,7 +78,7 @@ int features_binarization_pipeline(int argc, char** argv) {
new Net<Dtype>(real_valued_feature_net_param));
string feature_blob_name(argv[++arg_pos]);
- CHECK(real_valued_feature_net->HasBlob(feature_blob_name))
+ CHECK(real_valued_feature_net->has_blob(feature_blob_name))
<< "Unknown feature blob name " << feature_blob_name << " in the network "
<< real_valued_feature_prototxt;
@@ -92,7 +92,7 @@ int features_binarization_pipeline(int argc, char** argv) {
for (int batch_index = 0; batch_index < num_mini_batches; ++batch_index) {
real_valued_feature_net->Forward(input_vec);
const shared_ptr<Blob<Dtype> > feature_blob = real_valued_feature_net
- ->GetBlob(feature_blob_name);
+ ->blob_by_name(feature_blob_name);
feature_blob_vector.push_back(feature_blob);
}
shared_ptr<Blob<Dtype> > feature_binary_codes(new Blob<Dtype>());
diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp
index 32bb728a..1902aad8 100644
--- a/tools/extract_features.cpp
+++ b/tools/extract_features.cpp
@@ -98,7 +98,7 @@ int feature_extraction_pipeline(int argc, char** argv) {
feature_extraction_net->CopyTrainedLayersFrom(pretrained_net_param);
string extract_feature_blob_name(argv[++arg_pos]);
- CHECK(feature_extraction_net->HasBlob(extract_feature_blob_name))
+ CHECK(feature_extraction_net->has_blob(extract_feature_blob_name))
<< "Unknown feature blob name " << extract_feature_blob_name
<< " in the network " << feature_extraction_proto;
@@ -128,7 +128,7 @@ int feature_extraction_pipeline(int argc, char** argv) {
for (int batch_index = 0; batch_index < num_mini_batches; ++batch_index) {
feature_extraction_net->Forward(input_vec);
const shared_ptr<Blob<Dtype> > feature_blob = feature_extraction_net
- ->GetBlob(extract_feature_blob_name);
+ ->blob_by_name(extract_feature_blob_name);
int num_features = feature_blob->num();
int dim_features = feature_blob->count() / num_features;
Dtype* feature_blob_data;