提交 e3107a6a 编写于 作者: D dongdaxiang

fix windows compile problem

test=develop
上级 398004ec
...@@ -42,13 +42,6 @@ bool DataFeed::SetFileList(const std::vector<std::string>& files) { ...@@ -42,13 +42,6 @@ bool DataFeed::SetFileList(const std::vector<std::string>& files) {
CheckInit(); CheckInit();
// Do not set finish_set_filelist_ flag, // Do not set finish_set_filelist_ flag,
// since a user may set file many times after init reader // since a user may set file many times after init reader
/*
if (finish_set_filelist_) {
VLOG(3) << "info: you have set the filelist.";
return false;
}
*/
// PADDLE_ENFORCE(files.size(), "You have set an empty filelist.");
filelist_.assign(files.begin(), files.end()); filelist_.assign(files.begin(), files.end());
finish_set_filelist_ = true; finish_set_filelist_ = true;
...@@ -113,7 +106,6 @@ void PrivateQueueDataFeed<T>::ReadThread() { ...@@ -113,7 +106,6 @@ void PrivateQueueDataFeed<T>::ReadThread() {
int err_no = 0; int err_no = 0;
fp_ = fs_open_read(filename, &err_no, pipe_command_); fp_ = fs_open_read(filename, &err_no, pipe_command_);
__fsetlocking(&*fp_, FSETLOCKING_BYCALLER); __fsetlocking(&*fp_, FSETLOCKING_BYCALLER);
thread_local string::LineFileReader reader;
T instance; T instance;
while (ParseOneInstanceFromPipe(&instance)) { while (ParseOneInstanceFromPipe(&instance)) {
queue_->Send(instance); queue_->Send(instance);
...@@ -149,7 +141,7 @@ InMemoryDataFeed<T>::InMemoryDataFeed() { ...@@ -149,7 +141,7 @@ InMemoryDataFeed<T>::InMemoryDataFeed() {
cur_channel_ = 0; cur_channel_ = 0;
shuffled_ins_ = std::make_shared<paddle::framework::BlockingQueue<T>>(); shuffled_ins_ = std::make_shared<paddle::framework::BlockingQueue<T>>();
shuffled_ins_out_ = std::make_shared<paddle::framework::BlockingQueue<T>>(); shuffled_ins_out_ = std::make_shared<paddle::framework::BlockingQueue<T>>();
fleet_send_batch_size_ = 80000; fleet_send_batch_size_ = 80000; // hard code here
memory_data_ = nullptr; memory_data_ = nullptr;
mutex_for_update_memory_data_ = nullptr; mutex_for_update_memory_data_ = nullptr;
this->file_idx_ = nullptr; this->file_idx_ = nullptr;
...@@ -441,7 +433,6 @@ void MultiSlotDataFeed::ReadThread() { ...@@ -441,7 +433,6 @@ void MultiSlotDataFeed::ReadThread() {
fp_ = fs_open_read(filename, &err_no, pipe_command_); fp_ = fs_open_read(filename, &err_no, pipe_command_);
CHECK(fp_ != nullptr); CHECK(fp_ != nullptr);
__fsetlocking(&*fp_, FSETLOCKING_BYCALLER); __fsetlocking(&*fp_, FSETLOCKING_BYCALLER);
thread_local string::LineFileReader reader;
std::vector<MultiSlotType> instance; std::vector<MultiSlotType> instance;
int ins_num = 0; int ins_num = 0;
while (ParseOneInstanceFromPipe(&instance)) { while (ParseOneInstanceFromPipe(&instance)) {
......
...@@ -90,7 +90,7 @@ nv_test(transform_test SRCS transform_test.cu DEPS memory place device_context) ...@@ -90,7 +90,7 @@ nv_test(transform_test SRCS transform_test.cu DEPS memory place device_context)
cc_library(timer SRCS timer.cc) cc_library(timer SRCS timer.cc)
cc_test(timer_test SRCS timer_test.cc DEPS timer) cc_test(timer_test SRCS timer_test.cc DEPS timer)
cc_library(lodtensor_printer SRCS lodtensor_printer.cc) cc_library(lodtensor_printer SRCS lodtensor_printer.cc DEPS ddim place tensor scope lod_tensor variable_helper framework_proto)
cc_test(lodtensor_printer_test SRCS lodtensor_printer_test.cc DEPS lodtensor_printer) cc_test(lodtensor_printer_test SRCS lodtensor_printer_test.cc DEPS lodtensor_printer)
cc_library(device_tracer SRCS device_tracer.cc DEPS boost profiler_proto framework_proto ${GPU_CTX_DEPS}) cc_library(device_tracer SRCS device_tracer.cc DEPS boost profiler_proto framework_proto ${GPU_CTX_DEPS})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册