From 4a5bced3b3b9b8d3f9031ca915169070cbfb694a Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sat, 13 Jan 2024 13:48:33 +0800 Subject: [PATCH 1/3] [Dy2St][2.6] Disable `test_transformer` on release/2.6 and update README --- test/dygraph_to_static/CMakeLists.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index 2c5b21de64360b..be88ecc2468c39 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -21,17 +21,6 @@ if(WIN32 AND NOT WITH_GPU) )# disable on Windows CPU CI for timeout endif() -if(NOT WITH_GPU) - # TODO(SigureMo): Temporarily disable train step on Windows CPU CI. - # We should remove this after fix the performance issue. - list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_adam) - list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_sgd) - # disable some model test on CPU to avoid timeout - list(REMOVE_ITEM TEST_OPS test_resnet) - list(REMOVE_ITEM TEST_OPS test_build_strategy) - list(REMOVE_ITEM TEST_OPS test_bert) -endif() - foreach(TEST_OP ${TEST_OPS}) py_test_modules(${TEST_OP} MODULES ${TEST_OP} ENVS ${GC_ENVS} ${SOT_ENVS}) endforeach() @@ -77,3 +66,15 @@ foreach(ITEST ${LEGACY_ONLY_TEST_FILES}) STATUS "PT Disabled OpTest: not found ${ITEST} in dygraph_to_static") endif() endforeach() + +if(NOT WITH_GPU) + # TODO(SigureMo): Temporarily disable train step on Windows CPU CI. + # We should remove this after fix the performance issue. + list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_adam) + list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_sgd) + # disable some model test on CPU to avoid timeout + list(REMOVE_ITEM TEST_OPS test_resnet) + list(REMOVE_ITEM TEST_OPS test_build_strategy) + list(REMOVE_ITEM TEST_OPS test_bert) + list(REMOVE_ITEM TEST_OPS test_transformer) +endif() From 94ced678693f70c3ca0ff17b1ab93ef2195b4b14 Mon Sep 17 00:00:00 2001 From: Nyakku Shigure Date: Wed, 10 Jan 2024 18:52:08 +0800 Subject: [PATCH 2/3] [Docs] Update latest release version in README (#60691) --- README.md | 2 +- README_cn.md | 4 ++-- README_ja.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8f708334ed28f1..001352ea45fc4d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ PaddlePaddle is originated from industrial practices with dedication and commitm ## Installation -### Latest PaddlePaddle Release: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5) +### Latest PaddlePaddle Release: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6) Our vision is to enable deep learning for everyone via PaddlePaddle. Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddle/releases) to track the latest features of PaddlePaddle. diff --git a/README_cn.md b/README_cn.md index a13fa5ba214503..cd45e4e3ecd2b7 100644 --- a/README_cn.md +++ b/README_cn.md @@ -18,9 +18,9 @@ ## 安装 -### PaddlePaddle最新版本: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5) +### PaddlePaddle 最新版本: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6) -跟进PaddlePaddle最新特性请参考我们的[版本说明](https://github.com/PaddlePaddle/Paddle/releases) +跟进 PaddlePaddle 最新特性请参考我们的[版本说明](https://github.com/PaddlePaddle/Paddle/releases) ### 安装最新稳定版本: ``` diff --git a/README_ja.md b/README_ja.md index 22c78a1a79bbd9..dad60eb7ffcf87 100644 --- a/README_ja.md +++ b/README_ja.md @@ -20,7 +20,7 @@ PaddlePaddle は、工業化に対するコミットメントを持つ工業的 ## インストール -### PaddlePaddle の最新リリース: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5) +### PaddlePaddle の最新リリース: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6) 私たちのビジョンは、PaddlePaddle を通じて、誰もが深層学習を行えるようにすることです。 PaddlePaddle の最新機能を追跡するために、私たちの[リリースのお知らせ](https://github.com/PaddlePaddle/Paddle/releases)を参照してください。 From c4cd8a5be0e235af2c13563c645e48bb04e0bf6e Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sat, 13 Jan 2024 16:30:55 +0800 Subject: [PATCH 3/3] restore order --- test/dygraph_to_static/CMakeLists.txt | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index be88ecc2468c39..a7b3a01ce177dd 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -21,6 +21,18 @@ if(WIN32 AND NOT WITH_GPU) )# disable on Windows CPU CI for timeout endif() +if(NOT WITH_GPU) + # TODO(SigureMo): Temporarily disable train step on Windows CPU CI. + # We should remove this after fix the performance issue. + list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_adam) + list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_sgd) + # disable some model test on CPU to avoid timeout + list(REMOVE_ITEM TEST_OPS test_resnet) + list(REMOVE_ITEM TEST_OPS test_build_strategy) + list(REMOVE_ITEM TEST_OPS test_bert) + list(REMOVE_ITEM TEST_OPS test_transformer) +endif() + foreach(TEST_OP ${TEST_OPS}) py_test_modules(${TEST_OP} MODULES ${TEST_OP} ENVS ${GC_ENVS} ${SOT_ENVS}) endforeach() @@ -33,7 +45,6 @@ set_tests_properties(test_seq2seq PROPERTIES TIMEOUT 420) set_tests_properties(test_cycle_gan PROPERTIES TIMEOUT 150) set_tests_properties(test_basic_api_transformation PROPERTIES TIMEOUT 240) set_tests_properties(test_reinforcement_learning PROPERTIES TIMEOUT 120) -set_tests_properties(test_transformer PROPERTIES TIMEOUT 200) set_tests_properties(test_bmn PROPERTIES TIMEOUT 300) if(NOT WIN32) @@ -66,15 +77,3 @@ foreach(ITEST ${LEGACY_ONLY_TEST_FILES}) STATUS "PT Disabled OpTest: not found ${ITEST} in dygraph_to_static") endif() endforeach() - -if(NOT WITH_GPU) - # TODO(SigureMo): Temporarily disable train step on Windows CPU CI. - # We should remove this after fix the performance issue. - list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_adam) - list(REMOVE_ITEM TEST_OPS test_train_step_resnet18_sgd) - # disable some model test on CPU to avoid timeout - list(REMOVE_ITEM TEST_OPS test_resnet) - list(REMOVE_ITEM TEST_OPS test_build_strategy) - list(REMOVE_ITEM TEST_OPS test_bert) - list(REMOVE_ITEM TEST_OPS test_transformer) -endif()