Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
8700a7bd
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2297
Star
20931
Fork
5422
代码
文件
提交
分支
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8700a7bd
编写于
1月 11, 2021
作者:
G
gongweibao
提交者:
GitHub
1月 11, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix unittests bugs. (#30250)
上级
dd6f5919
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
16 addition
and
15 deletion
+16
-15
python/paddle/fluid/tests/unittests/CMakeLists.txt
python/paddle/fluid/tests/unittests/CMakeLists.txt
+13
-12
python/paddle/fluid/tests/unittests/test_fleet_launch_cloud.sh
...n/paddle/fluid/tests/unittests/test_fleet_launch_cloud.sh
+3
-3
未找到文件。
python/paddle/fluid/tests/unittests/CMakeLists.txt
浏览文件 @
8700a7bd
...
@@ -39,7 +39,6 @@ list(APPEND MIXED_DIST_TEST_OPS test_fleet_launch_async)
...
@@ -39,7 +39,6 @@ list(APPEND MIXED_DIST_TEST_OPS test_fleet_launch_async)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_launch_cloud
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_launch_cloud
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_launch_nproc
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_launch_nproc
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_api_input
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_api_input
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_checkpoint
)
list
(
APPEND MIXED_DIST_TEST_OPS test_collective_optimizer
)
list
(
APPEND MIXED_DIST_TEST_OPS test_collective_optimizer
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_base
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_base
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_base_2
)
list
(
APPEND MIXED_DIST_TEST_OPS test_fleet_base_2
)
...
@@ -128,6 +127,7 @@ if(WIN32)
...
@@ -128,6 +127,7 @@ if(WIN32)
LIST
(
REMOVE_ITEM TEST_OPS test_complex_matmul
)
LIST
(
REMOVE_ITEM TEST_OPS test_complex_matmul
)
endif
()
endif
()
LIST
(
REMOVE_ITEM TEST_OPS test_fleet_checkpoint
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint1
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint1
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint2
)
LIST
(
REMOVE_ITEM TEST_OPS test_auto_checkpoint2
)
...
@@ -509,7 +509,6 @@ if(WITH_DISTRIBUTE)
...
@@ -509,7 +509,6 @@ if(WITH_DISTRIBUTE)
if
(
NOT APPLE
)
if
(
NOT APPLE
)
if
(
WITH_GPU
)
if
(
WITH_GPU
)
bash_test_modules
(
test_c_comm_init_op START_BASH test_c_comm_init_op.sh ENVS PADDLE_BINARY_DIR=
${
PADDLE_BINARY_DIR
}
)
bash_test_modules
(
test_c_comm_init_op START_BASH test_c_comm_init_op.sh ENVS PADDLE_BINARY_DIR=
${
PADDLE_BINARY_DIR
}
)
py_test_modules
(
test_fleet_checkpoint MODULES test_fleet_checkpoint
)
py_test_modules
(
test_launch_coverage MODULES test_launch_coverage
)
py_test_modules
(
test_launch_coverage MODULES test_launch_coverage
)
endif
()
endif
()
...
@@ -579,15 +578,18 @@ if(NOT WIN32)
...
@@ -579,15 +578,18 @@ if(NOT WIN32)
endif
()
endif
()
if
(
WITH_DISTRIBUTE AND NOT APPLE AND NOT WIN32
)
if
(
WITH_DISTRIBUTE AND NOT APPLE AND NOT WIN32
)
bash_test_modules
(
test_auto_checkpoint START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
py_test_modules
(
test_fleet_checkpoint MODULES test_fleet_checkpoint
)
bash_test_modules
(
test_auto_checkpoint1 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
set_tests_properties
(
test_fleet_checkpoint PROPERTIES TIMEOUT 200
)
bash_test_modules
(
test_auto_checkpoint2 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
set_tests_properties
(
test_fleet_checkpoint PROPERTIES LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint3 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint_multiple START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint1 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint_dist_basic START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint2 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs1 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint3 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs2 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint_multiple START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs3 START_BASH dist_test.sh TIMEOUT 140 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_auto_checkpoint_dist_basic START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs1 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs2 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
bash_test_modules
(
test_hdfs3 START_BASH dist_test.sh TIMEOUT 200 LABELS
"RUN_TYPE=EXCLUSIVE:NIGHTLY"
)
endif
()
endif
()
add_subdirectory
(
sequence
)
add_subdirectory
(
sequence
)
...
@@ -660,7 +662,6 @@ endif()
...
@@ -660,7 +662,6 @@ endif()
if
(
WITH_DISTRIBUTE AND NOT APPLE
)
if
(
WITH_DISTRIBUTE AND NOT APPLE
)
if
(
WITH_GPU
)
if
(
WITH_GPU
)
set_tests_properties
(
test_c_comm_init_op PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_c_comm_init_op PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_fleet_checkpoint PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_dist_mnist_gradient_merge PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_dist_mnist_gradient_merge PROPERTIES TIMEOUT 120
)
endif
()
endif
()
endif
()
endif
()
...
...
python/paddle/fluid/tests/unittests/test_fleet_launch_cloud.sh
浏览文件 @
8700a7bd
...
@@ -28,12 +28,12 @@ export PADDLE_PORT=35789
...
@@ -28,12 +28,12 @@ export PADDLE_PORT=35789
export
TRAINER_PORTS_NUM
=
2
export
TRAINER_PORTS_NUM
=
2
distributed_args
=
"--ips=
${
cluster_node_ips
}
--gpus=0,1 --log_dir=testlog"
distributed_args
=
"--ips=
${
cluster_node_ips
}
--gpus=0,1 --log_dir=testlog"
CUDA_VISIBLE_DEVICES
=
0,1 python
-m
paddle.distributed.fleet.launch
${
distributed_args
}
multi_process.py fleet
run
CUDA_VISIBLE_DEVICES
=
0,1 python
-m
paddle.distributed.fleet.launch
${
distributed_args
}
multi_process.py fleet
launchcloud
str1
=
"selected_gpus:0 worker_endpoints:127.0.0.1:35789,127.0.0.1:35790,127.0.0.2:35789,127.0.0.2:35790 trainers_num:4 current_endpoint:127.0.0.1:35789 trainer_id:0"
str1
=
"selected_gpus:0 worker_endpoints:127.0.0.1:35789,127.0.0.1:35790,127.0.0.2:35789,127.0.0.2:35790 trainers_num:4 current_endpoint:127.0.0.1:35789 trainer_id:0"
str2
=
"selected_gpus:1 worker_endpoints:127.0.0.1:35789,127.0.0.1:35790,127.0.0.2:35789,127.0.0.2:35790 trainers_num:4 current_endpoint:127.0.0.1:35790 trainer_id:1"
str2
=
"selected_gpus:1 worker_endpoints:127.0.0.1:35789,127.0.0.1:35790,127.0.0.2:35789,127.0.0.2:35790 trainers_num:4 current_endpoint:127.0.0.1:35790 trainer_id:1"
file_0
=
"multi_process_fleet
run
.check_0.log"
file_0
=
"multi_process_fleet
launchcloud
.check_0.log"
file_1
=
"multi_process_fleet
run
.check_1.log"
file_1
=
"multi_process_fleet
launchcloud
.check_1.log"
echo
"paddlecloud params test"
echo
"paddlecloud params test"
if
grep
-q
"
$str1
"
"
$file_0
"
;
then
if
grep
-q
"
$str1
"
"
$file_0
"
;
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录