提交 25b91deb 编写于 作者: S superjom

set num_records to total_records

上级 09119d38
...@@ -16,7 +16,6 @@ link_directories(${PROJECT_SOURCE_DIR}/thirdparty/local/lib) ...@@ -16,7 +16,6 @@ link_directories(${PROJECT_SOURCE_DIR}/thirdparty/local/lib)
add_library(storage add_library(storage
${PROJECT_SOURCE_DIR}/visualdl/backend/storage/storage.cc ${PROJECT_SOURCE_DIR}/visualdl/backend/storage/storage.cc
${PROJECT_SOURCE_DIR}/visualdl/backend/storage/storage.pb.cc) ${PROJECT_SOURCE_DIR}/visualdl/backend/storage/storage.pb.cc)
add_library(c_api ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/c_api.cc)
add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/sdk.cc) add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/sdk.cc)
add_library(im ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im.cc) add_library(im ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im.cc)
...@@ -29,4 +28,3 @@ add_executable(vl_test ...@@ -29,4 +28,3 @@ add_executable(vl_test
${PROJECT_SOURCE_DIR}/visualdl/backend/test.cc ${PROJECT_SOURCE_DIR}/visualdl/backend/test.cc
${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im_test.cc) ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im_test.cc)
target_link_libraries(vl_test storage im gtest glog protobuf gflags) target_link_libraries(vl_test storage im gtest glog protobuf gflags)
#include <ctime>
#include <glog/logging.h> #include <glog/logging.h>
#include <ctime>
#include "visualdl/backend/logic/im.h" #include "visualdl/backend/logic/im.h"
...@@ -45,15 +45,14 @@ void InformationMaintainer::AddRecord(const std::string &tag, ...@@ -45,15 +45,14 @@ void InformationMaintainer::AddRecord(const std::string &tag,
auto *tablet = storage_.Find(tag); auto *tablet = storage_.Find(tag);
CHECK(tablet); CHECK(tablet);
auto num_records = tablet->num_records(); auto num_records = tablet->total_records();
const auto num_samples = tablet->num_samples(); const auto num_samples = tablet->num_samples();
int offset; int offset;
// use reservoir sampling or not // use reservoir sampling or not
if (num_samples > 0) { if (num_samples > 0) {
offset = ReserviorSample(num_samples, num_records + 1); offset = ReserviorSample(num_samples, num_records + 1);
if (offset < 0) if (offset < 0) return;
return;
} else { } else {
offset = num_records; offset = num_records;
} }
...@@ -66,11 +65,11 @@ void InformationMaintainer::AddRecord(const std::string &tag, ...@@ -66,11 +65,11 @@ void InformationMaintainer::AddRecord(const std::string &tag,
} }
*record = data; *record = data;
tablet->set_num_records(num_records + 1); tablet->set_total_records(num_records + 1);
} }
void InformationMaintainer::Clear() { void InformationMaintainer::Clear() {
auto* data = storage().mutable_data(); auto *data = storage().mutable_data();
data->clear_tablets(); data->clear_tablets();
data->clear_dir(); data->clear_dir();
data->clear_timestamp(); data->clear_timestamp();
...@@ -79,7 +78,7 @@ void InformationMaintainer::Clear() { ...@@ -79,7 +78,7 @@ void InformationMaintainer::Clear() {
void InformationMaintainer::PersistToDisk() { void InformationMaintainer::PersistToDisk() {
CHECK(!storage_.data().dir().empty()) << "path of storage should be set"; CHECK(!storage_.data().dir().empty()) << "path of storage should be set";
// TODO make dir first // TODO make dir first
//MakeDir(storage_.data().dir()); // MakeDir(storage_.data().dir());
storage_.Save(storage_.data().dir() + "/storage.pb"); storage_.Save(storage_.data().dir() + "/storage.pb");
} }
......
#include <fstream>
#include <glog/logging.h> #include <glog/logging.h>
#include <fstream>
#include "visualdl/backend/storage/storage.h" #include "visualdl/backend/storage/storage.h"
...@@ -24,15 +24,15 @@ storage::Record *Storage::NewRecord(const std::string &tag) { ...@@ -24,15 +24,15 @@ storage::Record *Storage::NewRecord(const std::string &tag) {
CHECK(tablet) << "Tablet" << tag << " should be create first"; CHECK(tablet) << "Tablet" << tag << " should be create first";
auto *record = tablet->mutable_records()->Add(); auto *record = tablet->mutable_records()->Add();
// increase num_records // increase num_records
int num_records = tablet->num_records(); int num_records = tablet->total_records();
tablet->set_num_records(num_records + 1); tablet->set_total_records(num_records + 1);
return record; return record;
} }
storage::Record *Storage::GetRecord(const std::string &tag, int offset) { storage::Record *Storage::GetRecord(const std::string &tag, int offset) {
auto *tablet = Find(tag); auto *tablet = Find(tag);
CHECK(tablet) << "Tablet" << tag << " should be create first"; CHECK(tablet) << "Tablet" << tag << " should be create first";
auto num_records = tablet->num_records(); auto num_records = tablet->total_records();
CHECK_LT(offset, num_records) << "invalid offset"; CHECK_LT(offset, num_records) << "invalid offset";
return tablet->mutable_records()->Mutable(offset); return tablet->mutable_records()->Mutable(offset);
} }
......
...@@ -42,7 +42,8 @@ message Entry { ...@@ -42,7 +42,8 @@ message Entry {
} }
/* /*
The Record proto is designed to represent any data structure for any component, for The Record proto is designed to represent any data structure for any component,
for
example, to store a record of Scalar component example, to store a record of Scalar component
Record { Record {
...@@ -63,19 +64,23 @@ Record { ...@@ -63,19 +64,23 @@ Record {
meta = [100, 200] meta = [100, 200]
} }
for other complex structure which have more fields than `timestamp`, `id` and meta, the additional fields for other complex structure which have more fields than `timestamp`, `id` and
can store in the `data` field, for it can store a list of values in different basic data types. meta, the additional fields
can store in the `data` field, for it can store a list of values in different
basic data types.
A component handlers in logic layer should know how to write or load a record for the corresponding component. A component handlers in logic layer should know how to write or load a record
for the corresponding component.
*/ */
message Record { message Record {
// one record might have multiple fields, one specific component should know how // one record might have multiple fields, one specific component should know
// how
// to parse the records. // to parse the records.
repeated Entry data = 1; repeated Entry data = 1;
// NOTE the timestamp, id, dtype might be useless for that all the meta info can // NOTE the timestamp, id, dtype might be useless for that all the meta info
// can
// be stored in `data` field. // be stored in `data` field.
int64 timestamp = 2; int64 timestamp = 2;
// store the count of writing operations to the tablet.
int64 id = 3; int64 id = 3;
DataType dtype = 4; DataType dtype = 4;
// shape or some other meta infomation for this record, if all the records // shape or some other meta infomation for this record, if all the records
...@@ -85,9 +90,12 @@ message Record { ...@@ -85,9 +90,12 @@ message Record {
} }
/* /*
A Tablet stores the records of a component which type is `component` and indidates as `tag`. A Tablet stores the records of a component which type is `component` and
The records will be saved in a file which name contains `tag`. During the running period, indidates as `tag`.
`num_records` will be accumulated, and `num_samples` indicates the size of sample set the The records will be saved in a file which name contains `tag`. During the
running period,
`num_records` will be accumulated, and `num_samples` indicates the size of
sample set the
reservoir sampling algorithm will collect. reservoir sampling algorithm will collect.
*/ */
message Tablet { message Tablet {
...@@ -97,18 +105,22 @@ message Tablet { ...@@ -97,18 +105,22 @@ message Tablet {
kHistogram = 1; kHistogram = 1;
kGraph = 2; kGraph = 2;
} }
// type of the component, different component should have different storage format. // type of the component, different component should have different storage
// format.
Type component = 1; Type component = 1;
// records the total count of records, each Write operation should increate this value. // records the total count of records, each Write operation should increate
int64 num_records = 2; // this value.
// indicate the number of instances to sample, this should be a constant value. int64 total_records = 2;
// indicate the number of instances to sample, this should be a constant
// value.
int32 num_samples = 3; int32 num_samples = 3;
repeated Record records = 4; repeated Record records = 4;
// store a meta infomation if all the records share. // store a meta infomation if all the records share.
Entry meta = 5; Entry meta = 5;
// the unique identification for this `Tablet`. // the unique identification for this `Tablet`.
string tag = 6; string tag = 6;
// one tablet might have multiple captions, for example, a scalar component might have // one tablet might have multiple captions, for example, a scalar component
// might have
// two plots labeled "train" and "test". // two plots labeled "train" and "test".
repeated string captions = 7; repeated string captions = 7;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册