Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into map_api

test=develop

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into map_api
test=develop
af0fab94 · Dang Qingqing · e58a5025 · b717a32f · af0fab94
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

python/paddle/fluid/tests/unittests/CMakeLists.txt python/paddle/fluid/tests/unittests/CMakeLists.txt +3 -3

未找到文件。
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -78,9 +78,9 @@ if(WITH_DISTRIBUTE)
        set_tests_properties(test_dist_word2vec PROPERTIES TIMEOUT 200)
        py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext)
        set_tests_properties(test_dist_se_resnext PROPERTIES TIMEOUT 1000)
-
-        py_test_modules(test_dist_transformer MODULES test_dist_transformer)
-        set_tests_properties(test_dist_transformer PROPERTIES TIMEOUT 1000)
+        # FIXME(typhoonzero): add this back
+	#py_test_modules(test_dist_transformer MODULES test_dist_transformer)
+	#set_tests_properties(test_dist_transformer PROPERTIES TIMEOUT 1000)
    endif(NOT APPLE)
    py_test_modules(test_dist_transpiler MODULES test_dist_transpiler)
 endif()