Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
e3107a6a
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e3107a6a
编写于
3月 26, 2019
作者:
D
dongdaxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix windows compile problem
test=develop
上级
398004ec
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
11 deletion
+2
-11
paddle/fluid/framework/data_feed.cc
paddle/fluid/framework/data_feed.cc
+1
-10
paddle/fluid/platform/CMakeLists.txt
paddle/fluid/platform/CMakeLists.txt
+1
-1
未找到文件。
paddle/fluid/framework/data_feed.cc
浏览文件 @
e3107a6a
...
@@ -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
))
{
...
...
paddle/fluid/platform/CMakeLists.txt
浏览文件 @
e3107a6a
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录