PaddlePaddle
diff --git a/‎python/paddle/base/layer_helper.py
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎python/paddle/base/layer_helper.py
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎test/deprecated/legacy_test/test_conv2d_api.py renamed to ‎test/deprecated/legacy_test/test_conv2d_api_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_conv2d_api.py renamed to ‎test/deprecated/legacy_test/test_conv2d_api_deprecated.py
Copy file name to clipboard
diff --git a/‎test/deprecated/legacy_test/test_dist_fleet_a_sync_optimizer_geo.py renamed to ‎test/deprecated/legacy_test/test_dist_fleet_a_sync_optimizer_geo_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_dist_fleet_a_sync_optimizer_geo.py renamed to ‎test/deprecated/legacy_test/test_dist_fleet_a_sync_optimizer_geo_deprecated.py
Copy file name to clipboard
diff --git a/‎test/deprecated/legacy_test/test_eager_run_program.py renamed to ‎test/deprecated/legacy_test/test_eager_run_program_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_eager_run_program.py renamed to ‎test/deprecated/legacy_test/test_eager_run_program_deprecated.py
Copy file name to clipboard
diff --git a/‎test/deprecated/legacy_test/test_generator_dataloader.py renamed to ‎test/deprecated/legacy_test/test_generator_dataloader_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_generator_dataloader.py renamed to ‎test/deprecated/legacy_test/test_generator_dataloader_deprecated.py
Copy file name to clipboard
diff --git a/‎tools/gpups_test.sh
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tools/gpups_test.sh
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/parallel_UT_rule.py
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎tools/parallel_UT_rule.py
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎tools/static_mode_white_list.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tools/static_mode_white_list.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/test_run_by_protobuf_3.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tools/test_run_by_protobuf_3.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -172,8 +172,9 @@ def _append_activation_in_pir(input, act=None, use_cudnn=None):
                 attrs = ()
                 if use_cudnn:
                     attrs = ('use_cudnn', use_cudnn)
-
                 act_op = getattr(_C_ops, act)
+                if act == 'softmax':
+                    return act_op(input, -1)
                 return act_op(input, *attrs)
 
             return _append_activation_in_pir(input_var, act_type, use_cudnn)
 
@@ -514,7 +514,8 @@ endif()
 
 set_tests_properties(test_conv2d_op_depthwise_conv
                      PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
-set_tests_properties(test_conv2d_api PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
+set_tests_properties(test_conv2d_api_deprecated PROPERTIES LABELS
+                                                           "RUN_TYPE=EXCLUSIVE")
 set_tests_properties(test_conv_nn_grad PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
 if(WITH_DISTRIBUTE)
   # FIXME(typhoonzero): add these tests back
@@ -714,7 +715,8 @@ set_tests_properties(test_sigmoid_cross_entropy_with_logits_op
 set_tests_properties(test_imperative_optimizer_v2 PROPERTIES TIMEOUT 150)
 set_tests_properties(test_partial_sum_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_sgd_op PROPERTIES TIMEOUT 250)
-set_tests_properties(test_generator_dataloader PROPERTIES TIMEOUT 120)
+set_tests_properties(test_generator_dataloader_deprecated PROPERTIES TIMEOUT
+                                                                     120)
 set_tests_properties(test_partial_concat_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_reduce_op PROPERTIES TIMEOUT 500)
 set_tests_properties(test_conv_nn_grad PROPERTIES TIMEOUT 220)
@@ -724,7 +726,7 @@ set_tests_properties(test_bilinear_interp_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_decoupled_py_reader PROPERTIES TIMEOUT 120)
 set_tests_properties(test_fuse_bn_act_pass PROPERTIES TIMEOUT 120)
 set_tests_properties(test_conv2d_op_depthwise_conv PROPERTIES TIMEOUT 120)
-set_tests_properties(test_conv2d_api PROPERTIES TIMEOUT 120)
+set_tests_properties(test_conv2d_api_deprecated PROPERTIES TIMEOUT 120)
 set_tests_properties(test_elementwise_mul_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_dygraph_multi_forward PROPERTIES TIMEOUT 120)
 set_tests_properties(test_imperative_ocr_attention_model PROPERTIES TIMEOUT 120)
 
@@ -58,7 +58,7 @@ parallel_list="^init_phi_test$|\
 ^test_collective_cpu_barrier_with_gloo$|\
 ^test_conv1d_layer$|\
 ^test_conv1d_transpose_layer$|\
-^test_conv2d_api$|\
+^test_conv2d_api_deprecated$|\
 ^test_conv2d_layer$|\
 ^test_conv2d_op_depthwise_conv$|\
 ^test_conv2d_transpose_layer$|\
 
@@ -556,7 +556,7 @@
     'test_dist_sparse_tensor_load_sgd',
     'test_dist_fleet_a_sync_optimizer_auto_geo',
     'test_dist_lookup_sparse_table_fuse_ops',
-    'test_dist_fleet_a_sync_optimizer_geo',
+    'test_dist_fleet_a_sync_optimizer_geo_deprecated',
     'test_multiprocess_dataloader_iterable_dataset_static',
     'test_dist_fleet_grad_clip',
     'test_fleet_pipeline_meta_optimizer_with_recompute',
@@ -1359,7 +1359,7 @@
     'test_instance_norm_op',
     'test_lambv2_op',
     'test_yolo_box_op',
-    'test_generator_dataloader',
+    'test_generator_dataloader_deprecated',
     'test_conv2d_transpose_op_depthwise_conv',
     'test_imperative_save_load_v2',
     'test_lookahead',
@@ -1501,7 +1501,7 @@
     'test_multiprocess_dataloader_iterable_dataset_dynamic',
     'test_imperative_se_resnext',
     'test_norm_nn_grad',
-    'test_conv2d_api',
+    'test_conv2d_api_deprecated',
 ]
 
 SIXTH_PARALLEL_JOB_NEW = [
@@ -2027,7 +2027,7 @@
     'test_parallel_dygraph_sparse_embedding',
     'test_dist_mnist_ring_allreduce',
     'test_fleet_launch_async',
-    'test_dist_fleet_a_sync_optimizer_geo',
+    'test_dist_fleet_a_sync_optimizer_geo_deprecated',
     'test_auto_checkpoint',
     'test_fleet_pipeline_meta_optimizer',
     'test_dist_fleet_heter_ctr',
@@ -2438,7 +2438,7 @@
     'test_cuda_empty_cache',
     'test_randn_op',
     'test_maximum_op',
-    'test_conv2d_api',
+    'test_conv2d_api_deprecated',
     'test_add_position_encoding_op',
     'test_tensor_methods',
     'test_imperative_partitial_backward',
 
@@ -231,7 +231,7 @@
     'test_generate_mask_labels_op',
     'test_generate_proposal_labels_op',
     'test_generate_proposals_op',
-    'test_generator_dataloader',
+    'test_generator_dataloader_deprecated',
     'test_get_places_op',
     'test_get_tensor_from_selected_rows_op',
     'test_gradient_clip',
 
@@ -24,7 +24,7 @@
     'test_dist_fleet_a_sync_optimizer_async',
     'test_dist_fleet_a_sync_optimizer_auto',
     'test_dist_fleet_a_sync_optimizer_sync',
-    'test_dist_fleet_a_sync_optimizer_geo',
+    'test_dist_fleet_a_sync_optimizer_geo_deprecated',
     'test_dist_fleet_a_sync_optimizer_auto_geo',
     'test_dist_fleet_a_sync_optimizer_auto_async',
     'test_fleet_fp16_allreduce_meta_optimizer',