提交 11136db7 编写于 作者: W wangguibao

Merge branch 'async_executor' of https://github.com/wangguibao/Paddle into async_executor

...@@ -41,6 +41,7 @@ namespace framework { ...@@ -41,6 +41,7 @@ namespace framework {
std::vector<std::string> DataFeed::filelist_; std::vector<std::string> DataFeed::filelist_;
size_t DataFeed::file_idx_; size_t DataFeed::file_idx_;
std::mutex DataFeed::mutex_for_pick_file_; std::mutex DataFeed::mutex_for_pick_file_;
bool DataFeed::finish_set_filelist_;
void DataFeed::AddFeedVar(Variable* var, const std::string& name) { void DataFeed::AddFeedVar(Variable* var, const std::string& name) {
CheckInit(); CheckInit();
......
...@@ -205,7 +205,7 @@ class DataFeed { ...@@ -205,7 +205,7 @@ class DataFeed {
int batch_size_; int batch_size_;
bool finish_init_; bool finish_init_;
bool finish_set_filelist_; static bool finish_set_filelist_;
bool finish_binding_memory_; bool finish_binding_memory_;
bool finish_start_; bool finish_start_;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册