diff options
| author | Kevin James Matzen <kmatzen@cs.cornell.edu> | 2014-10-12 20:54:39 -0400 |
|---|---|---|
| committer | Kevin James Matzen <kmatzen@cs.cornell.edu> | 2014-10-14 19:31:30 -0400 |
| commit | 80a99b939bfad88d918e82b41fd2c28c454abb50 (patch) | |
| tree | 09cd70cf77a9306660a312aa99404275c281aadd /tools | |
| parent | 2200a7a4b1f7fa7ac5fac7a2463552e8fe0ca9c2 (diff) | |
| download | caffeonacl-80a99b939bfad88d918e82b41fd2c28c454abb50.tar.gz caffeonacl-80a99b939bfad88d918e82b41fd2c28c454abb50.tar.bz2 caffeonacl-80a99b939bfad88d918e82b41fd2c28c454abb50.zip | |
Changed Database::buffer_t to Database::key_type and Database::value_type
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/compute_image_mean.cpp | 4 | ||||
| -rw-r--r-- | tools/convert_imageset.cpp | 4 | ||||
| -rw-r--r-- | tools/extract_features.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/compute_image_mean.cpp b/tools/compute_image_mean.cpp index 5f6ea6ee..d13c4a0f 100644 --- a/tools/compute_image_mean.cpp +++ b/tools/compute_image_mean.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) { int count = 0; // load first datum Database::const_iterator iter = database->begin(); - const Database::buffer_t& first_blob = iter->value; + const Database::value_type& first_blob = iter->value; datum.ParseFromArray(first_blob.data(), first_blob.size()); sum_blob.set_num(1); @@ -53,7 +53,7 @@ int main(int argc, char** argv) { for (Database::const_iterator iter = database->begin(); iter != database->end(); ++iter) { // just a dummy operation - const Database::buffer_t& blob = iter->value; + const Database::value_type& blob = iter->value; datum.ParseFromArray(blob.data(), blob.size()); const std::string& data = datum.data(); size_in_datum = std::max<int>(datum.data().size(), diff --git a/tools/convert_imageset.cpp b/tools/convert_imageset.cpp index 5ad2c0b4..1cdca7e0 100644 --- a/tools/convert_imageset.cpp +++ b/tools/convert_imageset.cpp @@ -110,10 +110,10 @@ int main(int argc, char** argv) { // sequential int length = snprintf(key_cstr, kMaxKeyLength, "%08d_%s", line_id, lines[line_id].first.c_str()); - Database::buffer_t value(datum.ByteSize()); + Database::value_type value(datum.ByteSize()); datum.SerializeWithCachedSizesToArray( reinterpret_cast<unsigned char*>(value.data())); - Database::buffer_t keystr(key_cstr, key_cstr + length); + Database::key_type keystr(key_cstr, key_cstr + length); // Put in db CHECK(database->put(keystr, value)); diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp index 0c7660d5..1340192c 100644 --- a/tools/extract_features.cpp +++ b/tools/extract_features.cpp @@ -155,12 +155,12 @@ int feature_extraction_pipeline(int argc, char** argv) { for (int d = 0; d < dim_features; ++d) { datum.add_float_data(feature_blob_data[d]); } - Database::buffer_t value(datum.ByteSize()); + Database::value_type value(datum.ByteSize()); datum.SerializeWithCachedSizesToArray( reinterpret_cast<unsigned char*>(value.data())); int length = snprintf(key_str, kMaxKeyStrLength, "%d", image_indices[i]); - Database::buffer_t key(key_str, key_str + length); + Database::key_type key(key_str, key_str + length); CHECK(feature_dbs.at(i)->put(key, value)); ++image_indices[i]; if (image_indices[i] % 1000 == 0) { |