OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

[caffe2] update make_mnist_db and make_image_db to move strings into DB::Put() (#60919)

Browse Source 
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/60919

Update make_mnist_db.cc and make_image_db.cc to work with the DB API changes
in D29204425 (00896cb9ed).  This is similar to the changes to make_cifar_db.cc landed in
D29374754 (394f60b0fc).
ghstack-source-id: 132621346

Test Plan: buck build caffe2/binaries/...

Reviewed By: valmikir

Differential Revision: D29447314

fbshipit-source-id: 33aff85c24d8b785211287de23d46704c7eb0726
This commit is contained in:
Adam Simpkins 2021-06-29 11:49:00 -07:00 committed by Facebook GitHub Bot
parent fab1b6cc70
commit 808d0e3353
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/make_image_db.cc
View File

@ -243,7 +243,6 @@ void ConvertImageDataset(
constexpr auto key_max_length = 256; constexpr auto key_max_length = 256;
char key_cstr[key_max_length]; char key_cstr[key_max_length];
string value;
int count = 0; int count = 0;
for (auto i = 0; i < lines.size(); i++) { for (auto i = 0; i < lines.size(); i++) {
// Get serialized proto for this entry // Get serialized proto for this entry
@ -255,7 +254,7 @@ void ConvertImageDataset(
DCHECK_LE(key_len, sizeof(key_cstr)); DCHECK_LE(key_len, sizeof(key_cstr));
// Put in db // Put in db
transaction->Put(string(key_cstr), value); transaction->Put(string(key_cstr), std::move(value));
if (++count % 1000 == 0) { if (++count % 1000 == 0) {
// Commit the current writes. // Commit the current writes.

4
binaries/make_mnist_db.cc
View File

@ -91,7 +91,6 @@ void convert_dataset(const char* image_filename, const char* label_filename,
int count = 0; int count = 0;
const int kMaxKeyLength = 11; const int kMaxKeyLength = 11;
char key_cstr[kMaxKeyLength]; char key_cstr[kMaxKeyLength];
string value;
TensorProtos protos; TensorProtos protos;
TensorProto* data = protos.add_protos(); TensorProto* data = protos.add_protos();
@ -119,11 +118,10 @@ void convert_dataset(const char* image_filename, const char* label_filename,
} }
label->set_int32_data(0, static_cast<int>(label_value)); label->set_int32_data(0, static_cast<int>(label_value));
snprintf(key_cstr, kMaxKeyLength, "%08d", item_id); snprintf(key_cstr, kMaxKeyLength, "%08d", item_id);
protos.SerializeToString(&value);
string keystr(key_cstr); string keystr(key_cstr);
// Put in db // Put in db
transaction->Put(keystr, value); transaction->Put(keystr, protos.SerializeAsString());
if (++count % 1000 == 0) { if (++count % 1000 == 0) {
transaction->Commit(); transaction->Commit();
} }