Skip to content

Commit 816a086

Browse files
JoejiongJoejiong
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix_log2
2 parents c7023f9 + 369605b commit 816a086

File tree

15 files changed

+69
-80
lines changed

15 files changed

+69
-80
lines changed

‎cmake/generic.cmake‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ function(cc_test_run TARGET_NAME)
385385
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true)
386386
set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true)
387387
# No unit test should exceed 2 minutes.
388-
if (APPLE OR WIN32)
388+
if (WIN32)
389+
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150)
390+
elseif (APPLE)
389391
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 20)
390392
else()
391393
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15)
@@ -757,7 +759,9 @@ function(py_test TARGET_NAME)
757759
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
758760
endif()
759761

760-
if (APPLE OR WIN32)
762+
if (WIN32)
763+
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150)
764+
elseif (APPLE)
761765
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 20)
762766
else()
763767
# No unit test should exceed 2 minutes in Linux.

‎paddle/fluid/framework/ir/fusion_group/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ cc_library(fusion_group_pass
99
SRCS fusion_group_pass.cc elementwise_group_detector.cc
1010
DEPS subgraph_detector fuse_pass_base code_generator device_code)
1111
cc_test(test_fusion_group_pass SRCS fusion_group_pass_tester.cc DEPS fusion_group_pass graph_viz_pass)
12-
if(NOT ON_INFER)
13-
set_tests_properties(test_code_generator PROPERTIES TIMEOUT 120)
12+
if(WITH_TESTING)
13+
set_tests_properties(test_code_generator PROPERTIES TIMEOUT 120)
1414
endif()

‎paddle/fluid/inference/api/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ cc_test(test_paddle_inference_api SRCS api_tester.cc DEPS paddle_inference_api)
5151
if(WITH_TESTING)
5252
if (NOT APPLE AND NOT WIN32)
5353
inference_base_test(test_api_impl SRCS api_impl_tester.cc DEPS paddle_fluid_shared
54-
ARGS --word2vec_dirname=${WORD2VEC_MODEL_DIR} --book_dirname=${PYTHON_TESTS_DIR}/book)
54+
ARGS --word2vec_dirname=${WORD2VEC_MODEL_DIR} --book_dirname=${IMG_CLS_RESNET_INSTALL_DIR})
5555
set_tests_properties(test_api_impl PROPERTIES DEPENDS test_image_classification)
5656
elseif(WIN32)
5757
inference_base_test(test_api_impl SRCS api_impl_tester.cc DEPS ${inference_deps}
58-
ARGS --word2vec_dirname=${WORD2VEC_MODEL_DIR} --book_dirname=${PYTHON_TESTS_DIR}/book)
58+
ARGS --word2vec_dirname=${WORD2VEC_MODEL_DIR} --book_dirname=${IMG_CLS_RESNET_INSTALL_DIR})
5959
set_tests_properties(test_api_impl PROPERTIES DEPENDS test_image_classification)
6060
endif()
6161

‎paddle/fluid/inference/tests/test.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ if(NOT EXISTS ${WORD2VEC_INSTALL_DIR}/word2vec.inference.model.tar.gz)
5151
endif()
5252
set(WORD2VEC_MODEL_DIR "${WORD2VEC_INSTALL_DIR}/word2vec.inference.model")
5353

54+
set(IMG_CLS_RESNET_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/image_classification_resnet")
55+
if(NOT EXISTS ${IMG_CLS_RESNET_INSTALL_DIR}/image_classification_resnet.inference.model.tgz)
56+
inference_download_and_uncompress(${IMG_CLS_RESNET_INSTALL_DIR} ${INFERENCE_URL} "image_classification_resnet.inference.model.tgz")
57+
endif()
58+
set(IMG_CLS_RESNET_MODEL_DIR "${IMG_CLS_RESNET_INSTALL_DIR}/image_classification_resnet.inference.model")
59+
5460
function (inference_base_test_build TARGET)
5561
set(options "")
5662
set(oneValueArgs "")

‎python/paddle/device.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def get_cudnn_version():
8282
8383
import paddle
8484
85-
cudnn_version = get_cudnn_version()
85+
cudnn_version = paddle.get_cudnn_version()
8686
8787
8888
@@ -117,7 +117,7 @@ def set_device(device):
117117
.. code-block:: python
118118
119119
import paddle
120-
paddle.disable_static()
120+
121121
paddle.set_device("cpu")
122122
x1 = paddle.ones(name='x1', shape=[1, 2], dtype='int32')
123123
x2 = paddle.zeros(name='x2', shape=[1, 2], dtype='int32')
@@ -179,7 +179,6 @@ def get_device():
179179
.. code-block:: python
180180
181181
import paddle
182-
paddle.disable_static()
183182
device = paddle.get_device()
184183
185184
"""

‎python/paddle/fluid/tests/unittests/CMakeLists.txt‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,11 @@ function(py_test_modules TARGET_NAME)
214214
if (py_test_modules_SERIAL)
215215
set_property(TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1)
216216
endif()
217-
218-
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15)
217+
if(WIN32)
218+
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150)
219+
else()
220+
set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15)
221+
endif()
219222
endif()
220223
endfunction()
221224

@@ -606,38 +609,22 @@ endif()
606609

607610
# setting timeout value for old unittests
608611
# set_tests_properties(test_dist_fleet_sparse_embedding_ctr PROPERTIES TIMEOUT 200)
609-
if(NOT WIN32 AND NOT APPLE)
610-
set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 150)
611-
set_tests_properties(test_gru_op PROPERTIES TIMEOUT 200)
612-
set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 150)
613-
set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 150)
614-
set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150)
615-
set_tests_properties(test_parallel_dygraph_sync_batch_norm PROPERTIES TIMEOUT 120)
616-
set_tests_properties(test_collective_broadcast_api PROPERTIES TIMEOUT 120)
617-
set_tests_properties(test_collective_allreduce_api PROPERTIES TIMEOUT 120)
612+
613+
if (NOT WIN32)
614+
set_tests_properties(test_multiprocess_reader_exception PROPERTIES TIMEOUT 120)
615+
set_tests_properties(test_layers PROPERTIES TIMEOUT 120)
616+
set_tests_properties(test_ir_memory_optimize_transformer PROPERTIES TIMEOUT 120)
617+
set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT 120)
618+
endif()
619+
620+
if (WITH_DISTRIBUTE)
621+
set_tests_properties(test_communicator_half_async PROPERTIES TIMEOUT 120)
622+
endif()
623+
if (WITH_DISTRIBUTE AND NOT APPLE)
618624
set_tests_properties(test_fleet_launch PROPERTIES TIMEOUT 120)
619625
set_tests_properties(test_c_comm_init_op PROPERTIES TIMEOUT 120)
620-
set_tests_properties(test_pipeline PROPERTIES TIMEOUT 120)
621-
set_tests_properties(test_reducescatter_api PROPERTIES TIMEOUT 120)
622-
set_tests_properties(test_broadcast PROPERTIES TIMEOUT 120)
623-
set_tests_properties(test_reducescatter PROPERTIES TIMEOUT 120)
624626
set_tests_properties(test_fleet_checkpoint PROPERTIES TIMEOUT 120)
625-
set_tests_properties(test_collective_reduce_api PROPERTIES TIMEOUT 120)
626-
set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT 120)
627-
set_tests_properties(test_allreduce PROPERTIES TIMEOUT 120)
628-
set_tests_properties(test_allgather PROPERTIES TIMEOUT 120)
629627
set_tests_properties(test_launch PROPERTIES TIMEOUT 120)
630-
set_tests_properties(test_collective_scatter_api PROPERTIES TIMEOUT 120)
631-
set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT 120)
632-
endif()
633-
634-
if (NOT WIN32)
635-
set_tests_properties(test_multiprocess_reader_exception PROPERTIES TIMEOUT 120)
636-
set_tests_properties(test_layers PROPERTIES TIMEOUT 120)
637-
set_tests_properties(test_communicator_half_async PROPERTIES TIMEOUT 120)
638-
set_tests_properties(test_ir_memory_optimize_transformer PROPERTIES TIMEOUT 120)
639-
set_tests_properties(test_fleet_utils PROPERTIES TIMEOUT 120)
640-
641628
endif()
642629

643630
# setting timeout value as 15S
@@ -756,11 +743,11 @@ set_tests_properties(test_dygraph_multi_forward PROPERTIES TIMEOUT 120)
756743
set_tests_properties(test_norm_op PROPERTIES TIMEOUT 120)
757744
set_tests_properties(test_imperative_ocr_attention_model PROPERTIES TIMEOUT 120)
758745
set_tests_properties(test_imperative_mnist PROPERTIES TIMEOUT 120)
759-
set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 120)
760-
set_tests_properties(test_gru_op PROPERTIES TIMEOUT 120)
761-
set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 120)
762-
set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 120)
763-
set_tests_properties(test_regularizer PROPERTIES TIMEOUT 120)
746+
set_tests_properties(test_fused_elemwise_activation_op PROPERTIES TIMEOUT 150)
747+
set_tests_properties(test_gru_op PROPERTIES TIMEOUT 200)
748+
set_tests_properties(test_layer_norm_op PROPERTIES TIMEOUT 150)
749+
set_tests_properties(test_pool3d_op PROPERTIES TIMEOUT 150)
750+
set_tests_properties(test_regularizer PROPERTIES TIMEOUT 150)
764751
set_tests_properties(test_imperative_resnet PROPERTIES TIMEOUT 200)
765752
set_tests_properties(test_imperative_resnet_sorted_gradient PROPERTIES TIMEOUT 200)
766753
set_tests_properties(test_imperative_se_resnext PROPERTIES TIMEOUT 200)
@@ -772,8 +759,21 @@ if(WITH_COVERAGE)
772759
endif()
773760
if(WITH_GPU AND NOT WIN32)
774761
set_tests_properties(test_collective_allgather_api PROPERTIES TIMEOUT 120)
762+
set_tests_properties(test_collective_broadcast_api PROPERTIES TIMEOUT 120)
763+
set_tests_properties(test_collective_allreduce_api PROPERTIES TIMEOUT 120)
764+
set_tests_properties(test_pipeline PROPERTIES TIMEOUT 120)
765+
set_tests_properties(test_reducescatter_api PROPERTIES TIMEOUT 120)
766+
set_tests_properties(test_broadcast PROPERTIES TIMEOUT 120)
767+
set_tests_properties(test_reducescatter PROPERTIES TIMEOUT 120)
768+
set_tests_properties(test_collective_reduce_api PROPERTIES TIMEOUT 120)
769+
set_tests_properties(test_collective_reduce PROPERTIES TIMEOUT 120)
770+
set_tests_properties(test_allreduce PROPERTIES TIMEOUT 120)
771+
set_tests_properties(test_allgather PROPERTIES TIMEOUT 120)
772+
set_tests_properties(test_collective_scatter_api PROPERTIES TIMEOUT 120)
773+
set_tests_properties(test_collective_barrier_api PROPERTIES TIMEOUT 120)
775774
endif()
776775
if(WITH_GPU)
777776
set_tests_properties(test_imperative_auto_mixed_precision PROPERTIES TIMEOUT 120)
777+
set_tests_properties(test_parallel_dygraph_sync_batch_norm PROPERTIES TIMEOUT 120)
778778
endif()
779779
set_tests_properties(test_inplace_addto_strategy PROPERTIES TIMEOUT 120)

‎python/paddle/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ endforeach(TEST_OP)
77

88
set_tests_properties(test_se_resnet PROPERTIES TIMEOUT 900)
99
set_tests_properties(test_tsm PROPERTIES TIMEOUT 900)
10-
set_tests_properties(test_yolov3 PROPERTIES TIMEOUT 900)
10+
set_tests_properties(test_yolov3 PROPERTIES TIMEOUT 900 LABELS "RUN_TYPE=EXCLUSIVE")
1111
set_tests_properties(test_mobile_net PROPERTIES TIMEOUT 120)
1212
set_tests_properties(test_seq2seq PROPERTIES TIMEOUT 120)
1313
set_tests_properties(test_cycle_gan PROPERTIES TIMEOUT 120)

‎python/paddle/fluid/tests/unittests/mkldnn/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ foreach(TEST_OP ${TEST_OPS})
55
py_test_modules(${TEST_OP} MODULES ${TEST_OP})
66
endforeach(TEST_OP)
77
set_tests_properties(test_concat_mkldnn_op PROPERTIES TIMEOUT 120)
8+
set_tests_properties(test_conv3d_mkldnn_op PROPERTIES TIMEOUT 120)
9+
set_tests_properties(test_flags_mkldnn_ops_on_off PROPERTIES TIMEOUT 120)

‎python/paddle/fluid/tests/unittests/test_parallel_executor_profiler.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
import paddle.fluid as fluid
2020
import paddle.fluid.core as core
2121
from paddle.fluid.tests.unittests.test_profiler import TestProfiler
22+
import os
23+
24+
# NCCL 2.7 decides to use shared memory while NCCL 2.6 didn't, hence causing the error.
25+
# include/shm.h:28 NCCL WARN Call to posix_fallocate failed: No space left on device
26+
#
27+
# Set environment variables NCCL_SHM_DISABLE=1 to disables the Shared Memory (SHM) transports
28+
# and force to use P2P which is the default transports way of NCCL2.6.
29+
os.environ['NCCL_SHM_DISABLE'] = str(1)
2230

2331

2432
class TestPEProfiler(TestProfiler):

‎python/paddle/fluid/tests/unittests/xpu/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ list(REMOVE_ITEM TEST_OPS test_mean_op_xpu)
77
foreach(TEST_OP ${TEST_OPS})
88
py_test_modules(${TEST_OP} MODULES ${TEST_OP})
99
endforeach(TEST_OP)
10+
11+
set_tests_properties(test_mul_op_xpu PROPERTIES TIMEOUT 120)
12+
set_tests_properties(test_conv2d_op_xpu PROPERTIES TIMEOUT 120)

0 commit comments

Comments
 (0)