From fbc004bbde414eeba5a9f30f5f26d1aa745f6f43 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Mon, 15 Jan 2024 22:13:52 +0800 Subject: [PATCH 1/5] [Dy2St] Increase `test_transformer` ut time --- test/dygraph_to_static/CMakeLists.txt | 3 ++- .../{test_transformer.py => test_transformerx.py} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename test/dygraph_to_static/{test_transformer.py => test_transformerx.py} (100%) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index bddf91c865b14..b23c8eca4ac7c 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -29,7 +29,7 @@ if(NOT WITH_GPU) 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) + list(REMOVE_ITEM TEST_OPS test_transformerx) endif() foreach(TEST_OP ${TEST_OPS}) @@ -59,6 +59,7 @@ if(WITH_GPU) set_tests_properties(test_train_step_resnet18_sgd PROPERTIES TIMEOUT 240) set_tests_properties(test_train_step_resnet18_adam PROPERTIES TIMEOUT 240) set_tests_properties(test_bert PROPERTIES TIMEOUT 240) + set_tests_properties(test_transformerx PROPERTIES TIMEOUT 240) endif() # Legacy IR only tests for dygraph_to_static diff --git a/test/dygraph_to_static/test_transformer.py b/test/dygraph_to_static/test_transformerx.py similarity index 100% rename from test/dygraph_to_static/test_transformer.py rename to test/dygraph_to_static/test_transformerx.py From 081fd97d928c8549ff7b824fc5c68b065e0c7708 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Mon, 15 Jan 2024 22:20:28 +0800 Subject: [PATCH 2/5] test mobile net on ci --- test/dygraph_to_static/CMakeLists.txt | 4 ++-- .../{test_mobile_net.py => test_mobile_netx.py} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename test/dygraph_to_static/{test_mobile_net.py => test_mobile_netx.py} (100%) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index b23c8eca4ac7c..a37a3721b2ad4 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -39,7 +39,7 @@ endforeach() set_tests_properties(test_se_resnet PROPERTIES TIMEOUT 900) set_tests_properties(test_yolov3 PROPERTIES TIMEOUT 900 LABELS "RUN_TYPE=EXCLUSIVE") -set_tests_properties(test_mobile_net PROPERTIES TIMEOUT 120) +set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 240) 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) @@ -52,7 +52,7 @@ endif() if(APPLE) set_tests_properties(test_bmn PROPERTIES TIMEOUT 300) - set_tests_properties(test_mobile_net PROPERTIES TIMEOUT 300) + set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 300) endif() if(WITH_GPU) diff --git a/test/dygraph_to_static/test_mobile_net.py b/test/dygraph_to_static/test_mobile_netx.py similarity index 100% rename from test/dygraph_to_static/test_mobile_net.py rename to test/dygraph_to_static/test_mobile_netx.py From 8acff35e6ff91fb6290d8ca5b904d60f030ea521 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 16 Jan 2024 00:02:59 +0800 Subject: [PATCH 3/5] save ci time --- test/dygraph_to_static/test_mobile_netx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dygraph_to_static/test_mobile_netx.py b/test/dygraph_to_static/test_mobile_netx.py index b7be4a68c2752..26b5dc3574848 100644 --- a/test/dygraph_to_static/test_mobile_netx.py +++ b/test/dygraph_to_static/test_mobile_netx.py @@ -22,7 +22,7 @@ from dygraph_to_static_utils import ( Dy2StTestBase, enable_to_static_guard, - test_legacy_and_pt_and_pir, + test_legacy_and_pir, ) from predictor_utils import PredictorTools @@ -738,7 +738,7 @@ def assert_same_predict(self, model_name): err_msg=f'inference_pred_res:\n {predictor_pre}\n, st_pre: \n{st_pre}.', ) - @test_legacy_and_pt_and_pir + @test_legacy_and_pir def test_mobile_net(self): # MobileNet-V1 self.assert_same_loss("MobileNetV1") From 57e400b1e9b01f9ce3e4e311aea2c33c4493bb2a Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 16 Jan 2024 02:36:54 +0800 Subject: [PATCH 4/5] disable on ci --- test/dygraph_to_static/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index a37a3721b2ad4..dac2a0a758ad0 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -30,6 +30,7 @@ if(NOT WITH_GPU) list(REMOVE_ITEM TEST_OPS test_build_strategy) list(REMOVE_ITEM TEST_OPS test_bert) list(REMOVE_ITEM TEST_OPS test_transformerx) + list(REMOVE_ITEM TEST_OPS test_mobile_netx) endif() foreach(TEST_OP ${TEST_OPS}) @@ -39,7 +40,6 @@ endforeach() set_tests_properties(test_se_resnet PROPERTIES TIMEOUT 900) set_tests_properties(test_yolov3 PROPERTIES TIMEOUT 900 LABELS "RUN_TYPE=EXCLUSIVE") -set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 240) 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) @@ -52,7 +52,6 @@ endif() if(APPLE) set_tests_properties(test_bmn PROPERTIES TIMEOUT 300) - set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 300) endif() if(WITH_GPU) @@ -60,6 +59,7 @@ if(WITH_GPU) set_tests_properties(test_train_step_resnet18_adam PROPERTIES TIMEOUT 240) set_tests_properties(test_bert PROPERTIES TIMEOUT 240) set_tests_properties(test_transformerx PROPERTIES TIMEOUT 240) + set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 240) endif() # Legacy IR only tests for dygraph_to_static From 7a37771fc3841334a7942a8f80cf4f64facaa76c Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 16 Jan 2024 18:25:28 +0800 Subject: [PATCH 5/5] discard rename --- test/dygraph_to_static/CMakeLists.txt | 8 ++++---- .../{test_mobile_netx.py => test_mobile_net.py} | 0 .../{test_transformerx.py => test_transformer.py} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename test/dygraph_to_static/{test_mobile_netx.py => test_mobile_net.py} (100%) rename test/dygraph_to_static/{test_transformerx.py => test_transformer.py} (100%) diff --git a/test/dygraph_to_static/CMakeLists.txt b/test/dygraph_to_static/CMakeLists.txt index dac2a0a758ad0..93983b64f7f05 100644 --- a/test/dygraph_to_static/CMakeLists.txt +++ b/test/dygraph_to_static/CMakeLists.txt @@ -29,8 +29,8 @@ if(NOT WITH_GPU) 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_transformerx) - list(REMOVE_ITEM TEST_OPS test_mobile_netx) + list(REMOVE_ITEM TEST_OPS test_transformer) + list(REMOVE_ITEM TEST_OPS test_mobile_net) endif() foreach(TEST_OP ${TEST_OPS}) @@ -58,8 +58,8 @@ if(WITH_GPU) set_tests_properties(test_train_step_resnet18_sgd PROPERTIES TIMEOUT 240) set_tests_properties(test_train_step_resnet18_adam PROPERTIES TIMEOUT 240) set_tests_properties(test_bert PROPERTIES TIMEOUT 240) - set_tests_properties(test_transformerx PROPERTIES TIMEOUT 240) - set_tests_properties(test_mobile_netx PROPERTIES TIMEOUT 240) + set_tests_properties(test_transformer PROPERTIES TIMEOUT 240) + set_tests_properties(test_mobile_net PROPERTIES TIMEOUT 240) endif() # Legacy IR only tests for dygraph_to_static diff --git a/test/dygraph_to_static/test_mobile_netx.py b/test/dygraph_to_static/test_mobile_net.py similarity index 100% rename from test/dygraph_to_static/test_mobile_netx.py rename to test/dygraph_to_static/test_mobile_net.py diff --git a/test/dygraph_to_static/test_transformerx.py b/test/dygraph_to_static/test_transformer.py similarity index 100% rename from test/dygraph_to_static/test_transformerx.py rename to test/dygraph_to_static/test_transformer.py