From e3107a6ae0cdbe4fb6f404328901ccd4554fb8a4 Mon Sep 17 00:00:00 2001 From: dongdaxiang Date: Tue, 26 Mar 2019 23:34:34 +0800 Subject: [PATCH] fix windows compile problem test=develop --- paddle/fluid/framework/data_feed.cc | 11 +---------- paddle/fluid/platform/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/paddle/fluid/framework/data_feed.cc b/paddle/fluid/framework/data_feed.cc index 0d66aeacb..8f19f68ed 100644 --- a/paddle/fluid/framework/data_feed.cc +++ b/paddle/fluid/framework/data_feed.cc @@ -42,13 +42,6 @@ bool DataFeed::SetFileList(const std::vector& files) { CheckInit(); // Do not set finish_set_filelist_ flag, // 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()); finish_set_filelist_ = true; @@ -113,7 +106,6 @@ void PrivateQueueDataFeed::ReadThread() { int err_no = 0; fp_ = fs_open_read(filename, &err_no, pipe_command_); __fsetlocking(&*fp_, FSETLOCKING_BYCALLER); - thread_local string::LineFileReader reader; T instance; while (ParseOneInstanceFromPipe(&instance)) { queue_->Send(instance); @@ -149,7 +141,7 @@ InMemoryDataFeed::InMemoryDataFeed() { cur_channel_ = 0; shuffled_ins_ = std::make_shared>(); shuffled_ins_out_ = std::make_shared>(); - fleet_send_batch_size_ = 80000; + fleet_send_batch_size_ = 80000; // hard code here memory_data_ = nullptr; mutex_for_update_memory_data_ = nullptr; this->file_idx_ = nullptr; @@ -441,7 +433,6 @@ void MultiSlotDataFeed::ReadThread() { fp_ = fs_open_read(filename, &err_no, pipe_command_); CHECK(fp_ != nullptr); __fsetlocking(&*fp_, FSETLOCKING_BYCALLER); - thread_local string::LineFileReader reader; std::vector instance; int ins_num = 0; while (ParseOneInstanceFromPipe(&instance)) { diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt index 70b8c5266..b5ec83a18 100644 --- a/paddle/fluid/platform/CMakeLists.txt +++ b/paddle/fluid/platform/CMakeLists.txt @@ -90,7 +90,7 @@ nv_test(transform_test SRCS transform_test.cu DEPS memory place device_context) cc_library(timer SRCS timer.cc) 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_library(device_tracer SRCS device_tracer.cc DEPS boost profiler_proto framework_proto ${GPU_CTX_DEPS}) -- GitLab