Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
5e0227dc
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
5e0227dc
编写于
9月 22, 2020
作者:
G
guofei
提交者:
GitHub
9月 22, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cherry-pick 1.8] Fix the unittests to surpport python3.8 (#27451)
test=release/1.8
上级
2747adff
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
9 deletion
+30
-9
python/paddle/fluid/incubate/fleet/base/role_maker.py
python/paddle/fluid/incubate/fleet/base/role_maker.py
+12
-5
python/paddle/fluid/tests/unittests/test_device_guard.py
python/paddle/fluid/tests/unittests/test_device_guard.py
+16
-2
python/paddle/fluid/tests/unittests/test_framework_debug_str.py
.../paddle/fluid/tests/unittests/test_framework_debug_str.py
+1
-1
python/paddle/fluid/tests/unittests/test_save_model_without_var.py
...ddle/fluid/tests/unittests/test_save_model_without_var.py
+1
-1
未找到文件。
python/paddle/fluid/incubate/fleet/base/role_maker.py
浏览文件 @
5e0227dc
...
@@ -14,9 +14,10 @@
...
@@ -14,9 +14,10 @@
"""Defination of Role Makers."""
"""Defination of Role Makers."""
from
__future__
import
print_function
from
__future__
import
print_function
from
multiprocessing
import
Process
,
Manager
import
multiprocessing
import
paddle.fluid
as
fluid
import
paddle.fluid
as
fluid
import
os
import
os
import
sys
import
time
import
time
__all__
=
[
__all__
=
[
...
@@ -602,7 +603,7 @@ class GeneralRoleMaker(RoleMakerBase):
...
@@ -602,7 +603,7 @@ class GeneralRoleMaker(RoleMakerBase):
if
ip_port
!=
""
:
if
ip_port
!=
""
:
self
.
_http_ip_port
=
ip_port
.
split
(
":"
)
self
.
_http_ip_port
=
ip_port
.
split
(
":"
)
# it's for communication between processes
# it's for communication between processes
self
.
_manager
=
Manager
()
self
.
_manager
=
multiprocessing
.
Manager
()
# global dict to store status
# global dict to store status
self
.
_http_server_d
=
self
.
_manager
.
dict
()
self
.
_http_server_d
=
self
.
_manager
.
dict
()
# set running status of http server
# set running status of http server
...
@@ -636,9 +637,15 @@ class GeneralRoleMaker(RoleMakerBase):
...
@@ -636,9 +637,15 @@ class GeneralRoleMaker(RoleMakerBase):
"all"
:
len
(
worker_endpoints
)
+
len
(
eplist
)
"all"
:
len
(
worker_endpoints
)
+
len
(
eplist
)
}
}
# child process for http server
# child process for http server
self
.
_http_server
=
Process
(
if
sys
.
version_info
>=
(
3
,
8
)
and
sys
.
platform
==
'darwin'
:
target
=
self
.
__start_kv_server
,
self
.
_http_server
=
multiprocessing
.
get_context
(
args
=
(
self
.
_http_server_d
,
size_d
))
'fork'
).
Process
(
target
=
self
.
__start_kv_server
,
args
=
(
self
.
_http_server_d
,
size_d
))
else
:
self
.
_http_server
=
multiprocessing
.
Process
(
target
=
self
.
__start_kv_server
,
args
=
(
self
.
_http_server_d
,
size_d
))
self
.
_http_server
.
daemon
=
True
self
.
_http_server
.
daemon
=
True
# set running status to True
# set running status to True
self
.
_http_server_d
[
"running"
]
=
True
self
.
_http_server_d
[
"running"
]
=
True
...
...
python/paddle/fluid/tests/unittests/test_device_guard.py
浏览文件 @
5e0227dc
...
@@ -33,6 +33,14 @@ def execute(main_program, startup_program):
...
@@ -33,6 +33,14 @@ def execute(main_program, startup_program):
exe
.
run
(
main_program
)
exe
.
run
(
main_program
)
def
get_vaild_warning_num
(
warning
,
w
):
num
=
0
for
i
in
range
(
len
(
w
)):
if
warning
in
str
(
w
[
i
].
message
):
num
+=
1
return
num
class
TestDeviceGuard
(
unittest
.
TestCase
):
class
TestDeviceGuard
(
unittest
.
TestCase
):
def
test_device_guard
(
self
):
def
test_device_guard
(
self
):
main_program
=
fluid
.
Program
()
main_program
=
fluid
.
Program
()
...
@@ -108,7 +116,10 @@ class TestDeviceGuard(unittest.TestCase):
...
@@ -108,7 +116,10 @@ class TestDeviceGuard(unittest.TestCase):
i
=
fluid
.
layers
.
increment
(
x
=
i
,
value
=
1
,
in_place
=
True
)
i
=
fluid
.
layers
.
increment
(
x
=
i
,
value
=
1
,
in_place
=
True
)
fluid
.
layers
.
less_than
(
x
=
i
,
y
=
loop_len
,
cond
=
cond
)
fluid
.
layers
.
less_than
(
x
=
i
,
y
=
loop_len
,
cond
=
cond
)
assert
len
(
w
)
==
1
warning
=
"The Op(while) is not support to set device."
warning_num
=
get_vaild_warning_num
(
warning
,
w
)
assert
warning_num
==
1
all_ops
=
main_program
.
global_block
().
ops
all_ops
=
main_program
.
global_block
().
ops
device_attr_name
=
core
.
op_proto_and_checker_maker
.
kOpDeviceAttrName
()
device_attr_name
=
core
.
op_proto_and_checker_maker
.
kOpDeviceAttrName
()
for
op
in
all_ops
:
for
op
in
all_ops
:
...
@@ -138,7 +149,10 @@ class TestDeviceGuard(unittest.TestCase):
...
@@ -138,7 +149,10 @@ class TestDeviceGuard(unittest.TestCase):
shape
=
[
1
],
value
=
4.0
,
dtype
=
'float32'
)
shape
=
[
1
],
value
=
4.0
,
dtype
=
'float32'
)
result
=
fluid
.
layers
.
less_than
(
x
=
x
,
y
=
y
,
force_cpu
=
False
)
result
=
fluid
.
layers
.
less_than
(
x
=
x
,
y
=
y
,
force_cpu
=
False
)
assert
len
(
w
)
==
2
warning
=
"
\'
device_guard
\'
has higher priority when they are used at the same time."
warning_num
=
get_vaild_warning_num
(
warning
,
w
)
assert
warning_num
==
2
all_ops
=
main_program
.
global_block
().
ops
all_ops
=
main_program
.
global_block
().
ops
device_attr_name
=
core
.
op_proto_and_checker_maker
.
kOpDeviceAttrName
()
device_attr_name
=
core
.
op_proto_and_checker_maker
.
kOpDeviceAttrName
()
for
op
in
all_ops
:
for
op
in
all_ops
:
...
...
python/paddle/fluid/tests/unittests/test_framework_debug_str.py
浏览文件 @
5e0227dc
...
@@ -22,7 +22,7 @@ class TestDebugStringFramework(unittest.TestCase):
...
@@ -22,7 +22,7 @@ class TestDebugStringFramework(unittest.TestCase):
def
test_debug_str
(
self
):
def
test_debug_str
(
self
):
p
=
Program
()
p
=
Program
()
p
.
current_block
().
create_var
(
name
=
't'
,
shape
=
[
0
,
1
])
p
.
current_block
().
create_var
(
name
=
't'
,
shape
=
[
0
,
1
])
self
.
assertRaises
(
ValueError
,
callableObj
=
p
.
__str__
)
self
.
assertRaises
(
ValueError
,
p
.
to_string
,
True
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
...
...
python/paddle/fluid/tests/unittests/test_save_model_without_var.py
浏览文件 @
5e0227dc
...
@@ -50,7 +50,7 @@ class TestSaveModelWithoutVar(unittest.TestCase):
...
@@ -50,7 +50,7 @@ class TestSaveModelWithoutVar(unittest.TestCase):
params_filename
=
'params'
)
params_filename
=
'params'
)
expected_warn
=
"no variable in your model, please ensure there are any variables in your model to save"
expected_warn
=
"no variable in your model, please ensure there are any variables in your model to save"
self
.
assertTrue
(
len
(
w
)
>
0
)
self
.
assertTrue
(
len
(
w
)
>
0
)
self
.
assertTrue
(
expected_warn
==
str
(
w
[
0
].
message
))
self
.
assertTrue
(
expected_warn
==
str
(
w
[
-
1
].
message
))
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录