jcf94 commented on a change in pull request #6073:
URL: https://github.com/apache/incubator-tvm/pull/6073#discussion_r457784703
##########
File path: src/auto_scheduler/measure_record.cc
##########
@@ -82,98 +63,23 @@ struct Handler<::tvm::Array<::tvm::auto_scheduler::Step>> {
inline static void Write(dmlc::JSONWriter* writer,
const ::tvm::Array<::tvm::auto_scheduler::Step>&
data) {
writer->BeginArray(false);
- for (size_t i = 0; i < data.size(); ++i) {
+ for (const auto& step : data) {
writer->WriteArraySeperator();
writer->BeginArray(false);
- if (auto ps = data[i].as<::tvm::auto_scheduler::ReorderStepNode>()) {
- writer->WriteArrayItem(std::string("RE"));
- writer->WriteArrayItem(ps->stage_id);
- writer->WriteArrayItem(IntArrayToVector(ps->after_ids));
- } else if (auto ps = data[i].as<::tvm::auto_scheduler::SplitStepNode>())
{
- writer->WriteArrayItem(std::string("SP"));
- writer->WriteArrayItem(ps->stage_id);
- writer->WriteArrayItem(ps->iter_id);
- writer->WriteArrayItem(ps->extent ?
::tvm::auto_scheduler::GetIntImm(ps->extent.value())
- : 0);
- writer->WriteArrayItem(IntArrayToVector(ps->lengths));
- writer->WriteArrayItem(static_cast<int>(ps->inner_to_outer));
- } else if (auto ps = data[i].as<::tvm::auto_scheduler::FuseStepNode>()) {
- writer->WriteArrayItem(std::string("FU"));
- writer->WriteArrayItem(ps->stage_id);
- writer->WriteArrayItem(IntArrayToVector(ps->fused_ids));
- } else {
- LOG(FATAL) << "Invalid step: " << data[i];
- }
+ step->WriteToRecord(writer);
writer->EndArray();
}
writer->EndArray();
}
inline static void Read(dmlc::JSONReader* reader,
::tvm::Array<::tvm::auto_scheduler::Step>* data) {
- std::vector<int> int_list;
- bool s, inner_to_outer;
- std::string name, scope_name, pragma_type, ti_func_name;
- int stage_id, iter_id, extent;
-
reader->BeginArray();
data->clear();
while (reader->NextArrayItem()) {
reader->BeginArray();
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&name);
- if (name == "RE") {
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&stage_id);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&int_list);
- ::tvm::Array<::tvm::Integer> after_ids;
- for (const auto& i : int_list) {
- after_ids.push_back(i);
- }
- data->push_back(::tvm::auto_scheduler::ReorderStep(stage_id,
after_ids));
- } else if (name == "SP") {
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&stage_id);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&iter_id);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&extent);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&int_list);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&inner_to_outer);
- ::tvm::Array<::tvm::Optional<::tvm::Integer>> lengths;
- for (const auto& i : int_list) {
- lengths.push_back(::tvm::Integer(i));
- }
- data->push_back(::tvm::auto_scheduler::SplitStep(
- stage_id, iter_id, extent == 0 ? ::tvm::PrimExpr() : extent,
lengths, inner_to_outer));
- } else if (name == "FU") {
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&stage_id);
- s = reader->NextArrayItem();
- CHECK(s);
- reader->Read(&int_list);
- ::tvm::Array<::tvm::Integer> fused_ids;
- for (const auto& i : int_list) {
- fused_ids.push_back(i);
- }
- data->push_back(::tvm::auto_scheduler::FuseStep(stage_id, fused_ids));
- } else {
- LOG(FATAL) << "Invalid step format";
- }
- s = reader->NextArrayItem();
- CHECK(!s);
+ data->push_back(::tvm::auto_scheduler::StepReadFromRecord(reader));
+ CHECK(!reader->NextArrayItem());
Review comment:
Ok, I think I'd better add the bool value s back here...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
