Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleRec
提交
53b6f16a
P
PaddleRec
项目概览
PaddlePaddle
/
PaddleRec
通知
68
Star
12
Fork
5
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
27
列表
看板
标记
里程碑
合并请求
10
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleRec
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
27
Issue
27
列表
看板
标记
里程碑
合并请求
10
合并请求
10
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
53b6f16a
编写于
6月 10, 2020
作者:
T
tangwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix windows adapter
上级
62efc8dc
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
13 addition
and
13 deletion
+13
-13
core/model.py
core/model.py
+3
-3
core/trainers/framework/network.py
core/trainers/framework/network.py
+10
-10
未找到文件。
core/model.py
浏览文件 @
53b6f16a
...
@@ -37,7 +37,7 @@ class ModelBase(object):
...
@@ -37,7 +37,7 @@ class ModelBase(object):
self
.
_fetch_interval
=
20
self
.
_fetch_interval
=
20
self
.
_platform
=
envs
.
get_platform
()
self
.
_platform
=
envs
.
get_platform
()
self
.
_init_hyper_parameters
()
self
.
_init_hyper_parameters
()
self
.
_env
=
config
context
[
"env"
]
=
config
self
.
_slot_inited
=
False
self
.
_slot_inited
=
False
def
_init_hyper_parameters
(
self
):
def
_init_hyper_parameters
(
self
):
...
@@ -49,11 +49,11 @@ class ModelBase(object):
...
@@ -49,11 +49,11 @@ class ModelBase(object):
self
.
_slot_inited
=
True
self
.
_slot_inited
=
True
dataset
=
{}
dataset
=
{}
model_dict
=
{}
model_dict
=
{}
for
i
in
self
.
_env
(
"phase"
):
for
i
in
context
[
"env"
]
(
"phase"
):
if
i
[
"name"
]
==
kargs
[
"name"
]:
if
i
[
"name"
]
==
kargs
[
"name"
]:
model_dict
=
i
model_dict
=
i
break
break
for
i
in
self
.
_env
(
"dataset"
):
for
i
in
context
[
"env"
]
(
"dataset"
):
if
i
[
"name"
]
==
model_dict
[
"dataset_name"
]:
if
i
[
"name"
]
==
model_dict
[
"dataset_name"
]:
dataset
=
i
dataset
=
i
break
break
...
...
core/trainers/framework/network.py
浏览文件 @
53b6f16a
...
@@ -96,7 +96,7 @@ class SingleNetwork(NetworkBase):
...
@@ -96,7 +96,7 @@ class SingleNetwork(NetworkBase):
"default_main_program"
]
=
train_program
.
clone
()
"default_main_program"
]
=
train_program
.
clone
()
context
[
"dataset"
]
=
{}
context
[
"dataset"
]
=
{}
for
dataset
in
self
.
_env
[
"dataset"
]:
for
dataset
in
context
[
"env"
]
[
"dataset"
]:
if
dataset
[
"type"
]
!=
"DataLoader"
:
if
dataset
[
"type"
]
!=
"DataLoader"
:
dataset_class
=
QueueDataset
(
context
)
dataset_class
=
QueueDataset
(
context
)
context
[
"dataset"
][
dataset
[
context
[
"dataset"
][
dataset
[
...
@@ -113,12 +113,12 @@ class PSNetwork(NetworkBase):
...
@@ -113,12 +113,12 @@ class PSNetwork(NetworkBase):
def
build_network
(
self
,
context
):
def
build_network
(
self
,
context
):
context
[
"model"
]
=
{}
context
[
"model"
]
=
{}
if
len
(
self
.
_env
[
"phase"
])
>
1
:
if
len
(
context
[
"env"
]
[
"phase"
])
>
1
:
warnings
.
warn
(
warnings
.
warn
(
"Cluster Train Only Support One Phase."
,
"Cluster Train Only Support One Phase."
,
category
=
UserWarning
,
category
=
UserWarning
,
stacklevel
=
2
)
stacklevel
=
2
)
model_dict
=
self
.
_env
[
"phase"
][
0
]
model_dict
=
context
[
"env"
]
[
"phase"
][
0
]
context
[
"model"
][
model_dict
[
"name"
]]
=
{}
context
[
"model"
][
model_dict
[
"name"
]]
=
{}
dataset_name
=
model_dict
[
"dataset_name"
]
dataset_name
=
model_dict
[
"dataset_name"
]
...
@@ -154,7 +154,7 @@ class PSNetwork(NetworkBase):
...
@@ -154,7 +154,7 @@ class PSNetwork(NetworkBase):
else
:
else
:
context
[
"fleet"
].
init_worker
()
context
[
"fleet"
].
init_worker
()
context
[
"dataset"
]
=
{}
context
[
"dataset"
]
=
{}
for
dataset
in
self
.
_env
[
"dataset"
]:
for
dataset
in
context
[
"env"
]
[
"dataset"
]:
if
dataset
[
"type"
]
!=
"DataLoader"
:
if
dataset
[
"type"
]
!=
"DataLoader"
:
dataset_class
=
QueueDataset
(
context
)
dataset_class
=
QueueDataset
(
context
)
context
[
"dataset"
][
dataset
[
context
[
"dataset"
][
dataset
[
...
@@ -200,12 +200,12 @@ class PslibNetwork(NetworkBase):
...
@@ -200,12 +200,12 @@ class PslibNetwork(NetworkBase):
def
build_network
(
self
,
context
):
def
build_network
(
self
,
context
):
context
[
"model"
]
=
{}
context
[
"model"
]
=
{}
if
len
(
self
.
_env
[
"phase"
])
>
1
:
if
len
(
context
[
"env"
]
[
"phase"
])
>
1
:
warnings
.
warn
(
warnings
.
warn
(
"Cluster Train Only Support One Phase."
,
"Cluster Train Only Support One Phase."
,
category
=
UserWarning
,
category
=
UserWarning
,
stacklevel
=
2
)
stacklevel
=
2
)
model_dict
=
self
.
_env
[
"phase"
][
0
]
model_dict
=
context
[
"env"
]
[
"phase"
][
0
]
train_program
=
fluid
.
Program
()
train_program
=
fluid
.
Program
()
startup_program
=
fluid
.
Program
()
startup_program
=
fluid
.
Program
()
scope
=
fluid
.
Scope
()
scope
=
fluid
.
Scope
()
...
@@ -247,7 +247,7 @@ class PslibNetwork(NetworkBase):
...
@@ -247,7 +247,7 @@ class PslibNetwork(NetworkBase):
self
.
_server
(
context
)
self
.
_server
(
context
)
else
:
else
:
context
[
"dataset"
]
=
{}
context
[
"dataset"
]
=
{}
for
dataset
in
self
.
_env
[
"dataset"
]:
for
dataset
in
context
[
"env"
]
[
"dataset"
]:
if
dataset
[
"type"
]
!=
"DataLoader"
:
if
dataset
[
"type"
]
!=
"DataLoader"
:
dataset_class
=
QueueDataset
(
context
)
dataset_class
=
QueueDataset
(
context
)
context
[
"dataset"
][
dataset
[
context
[
"dataset"
][
dataset
[
...
@@ -267,12 +267,12 @@ class CollectiveNetwork(NetworkBase):
...
@@ -267,12 +267,12 @@ class CollectiveNetwork(NetworkBase):
def
build_network
(
self
,
context
):
def
build_network
(
self
,
context
):
context
[
"model"
]
=
{}
context
[
"model"
]
=
{}
if
len
(
self
.
_env
[
"phase"
])
>
1
:
if
len
(
context
[
"env"
]
[
"phase"
])
>
1
:
warnings
.
warn
(
warnings
.
warn
(
"Cluster Train Only Support One Phase."
,
"Cluster Train Only Support One Phase."
,
category
=
UserWarning
,
category
=
UserWarning
,
stacklevel
=
2
)
stacklevel
=
2
)
model_dict
=
self
.
_env
[
"phase"
][
0
]
model_dict
=
context
[
"env"
]
[
"phase"
][
0
]
context
[
"model"
][
model_dict
[
"name"
]]
=
{}
context
[
"model"
][
model_dict
[
"name"
]]
=
{}
dataset_name
=
model_dict
[
"dataset_name"
]
dataset_name
=
model_dict
[
"dataset_name"
]
...
@@ -311,7 +311,7 @@ class CollectiveNetwork(NetworkBase):
...
@@ -311,7 +311,7 @@ class CollectiveNetwork(NetworkBase):
"default_main_program"
]
=
train_program
"default_main_program"
]
=
train_program
context
[
"dataset"
]
=
{}
context
[
"dataset"
]
=
{}
for
dataset
in
self
.
_env
[
"dataset"
]:
for
dataset
in
context
[
"env"
]
[
"dataset"
]:
if
dataset
[
"type"
]
!=
"DataLoader"
:
if
dataset
[
"type"
]
!=
"DataLoader"
:
dataset_class
=
QueueDataset
(
context
)
dataset_class
=
QueueDataset
(
context
)
context
[
"dataset"
][
dataset
[
context
[
"dataset"
][
dataset
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录