diff --git a/paddle/fluid/framework/data_feed.cc b/paddle/fluid/framework/data_feed.cc index 89f3ec79212b67e050b82518c52216a184f97fe8..e4255101dca5a8e56538a2f5fde37c87a288dfba 100755 --- a/paddle/fluid/framework/data_feed.cc +++ b/paddle/fluid/framework/data_feed.cc @@ -155,7 +155,7 @@ void MultiSlotDataFeed::Init(paddle::framework::DataFeedDesc& data_feed_desc) { finish_init_ = false; finish_set_filelist_ = false; finish_start_ = false; - /* + if (!data_feed_desc.has_multi_slot_desc()){ LOG(ERROR) << "error: multi_slot_desc has not been set"; exit(-1); @@ -178,7 +178,7 @@ void MultiSlotDataFeed::Init(paddle::framework::DataFeedDesc& data_feed_desc) { } } feed_vec_.resize(use_slots_.size()); - */ + finish_init_ = true; } diff --git a/paddle/fluid/framework/data_feed.h b/paddle/fluid/framework/data_feed.h index 42dcb7abe0baa261cf515247e09ce9480a880769..388925b5af4297d982ae0569005a2b3a8be6a7d2 100755 --- a/paddle/fluid/framework/data_feed.h +++ b/paddle/fluid/framework/data_feed.h @@ -176,8 +176,8 @@ class DataFeed { LOG(ERROR) << "error: The function SetBufferSize is not implemented"; exit(-1); } - virtual const std::vector& GetAllSlots() {return all_slots_;} - virtual const std::vector& GetUseSlots() {return use_slots_;} + virtual const std::vector& GetAllSlotAlias() {return all_slots_;} + virtual const std::vector& GetUseSlotAlias() {return use_slots_;} std::vector& GetFeedVec() {return feed_vec_;} virtual void AddFeedVar(Variable* var, const std::string& name); protected: