fix mac unitest on ci

7 years ago · facfec10bc
parent 2c31ea9293
commit facfec10bc
2 changed files with 133 additions and 70 deletions
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@ -108,69 +108,133 @@ function cmake_gen() {
           fi
        fi
    fi
-
+    
+    if [ "$SYSTEM" == "Darwin" ]; then
    cat <<EOF
-    ========================================
-    Configuring cmake in /paddle/build ...
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
-        ${PYTHON_FLAGS}
-        -DWITH_DSO=ON
-        -DWITH_DOC=${WITH_DOC:-OFF}
-        -DWITH_GPU=${WITH_GPU:-OFF}
-        -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
-        -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF}
-        -DWITH_MKL=${WITH_MKL:-ON}
-        -DWITH_AVX=${WITH_AVX:-OFF}
-        -DWITH_GOLANG=${WITH_GOLANG:-OFF}
-        -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
-        -DWITH_C_API=${WITH_C_API:-OFF}
-        -DWITH_PYTHON=${WITH_PYTHON:-ON}
-        -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
-        -DCUDNN_ROOT=/usr/
-        -DWITH_TESTING=${WITH_TESTING:-ON}
-        -DWITH_FAST_BUNDLE_TEST=ON
-        -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
-        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-        -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
-        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-        -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
-        -DWITH_INFERENCE=${WITH_INFERENCE:-ON}
-        -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
-        -DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
-        -DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
-        -DPY_VERSION=${PY_VERSION:-2.7}
-    ========================================
+        ========================================
+        Configuring cmake in /paddle/build ...
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+            ${PYTHON_FLAGS}
+            -DWITH_DSO=ON
+            -DWITH_DOC=${WITH_DOC:-OFF}
+            -DWITH_GPU=${WITH_GPU:-OFF}
+            -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
+            -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON}
+            -DWITH_MKL=${WITH_MKL:-ON}
+            -DWITH_AVX=${WITH_AVX:-ON}
+            -DWITH_GOLANG=${WITH_GOLANG:-OFF}
+            -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
+            -DWITH_C_API=${WITH_C_API:-OFF}
+            -DWITH_PYTHON=${WITH_PYTHON:-ON}
+            -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
+            -DCUDNN_ROOT=/usr/
+            -DWITH_TESTING=${WITH_TESTING:-ON}
+            -DWITH_FAST_BUNDLE_TEST=ON
+            -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
+            -DWITH_INFERENCE=${WITH_INFERENCE:-ON}
+            -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
+            -DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
+            -DPY_VERSION=${PY_VERSION:-2.7}
+        ========================================
 EOF
-    # Disable UNITTEST_USE_VIRTUALENV in docker because
-    # docker environment is fully controlled by this script.
-    # See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
-    cmake .. \
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
-        ${PYTHON_FLAGS} \
-        -DWITH_DSO=ON \
-        -DWITH_DOC=${WITH_DOC:-OFF} \
-        -DWITH_GPU=${WITH_GPU:-OFF} \
-        -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
-        -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF} \
-        -DWITH_MKL=${WITH_MKL:-ON} \
-        -DWITH_AVX=${WITH_AVX:-OFF} \
-        -DWITH_GOLANG=${WITH_GOLANG:-OFF} \
-        -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
-        -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
-        -DWITH_C_API=${WITH_C_API:-OFF} \
-        -DWITH_PYTHON=${WITH_PYTHON:-ON} \
-        -DCUDNN_ROOT=/usr/ \
-        -DWITH_TESTING=${WITH_TESTING:-ON} \
-        -DWITH_FAST_BUNDLE_TEST=ON \
-        -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
-        -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
-        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-        -DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
-        -DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
-        -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
-        -DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo} \
-        -DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
-        -DPY_VERSION=${PY_VERSION:-2.7}
+        # Disable UNITTEST_USE_VIRTUALENV in docker because
+        # docker environment is fully controlled by this script.
+        # See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
+        cmake .. \
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
+            ${PYTHON_FLAGS} \
+            -DWITH_DSO=ON \
+            -DWITH_DOC=${WITH_DOC:-OFF} \
+            -DWITH_GPU=${WITH_GPU:-OFF} \
+            -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
+            -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON} \
+            -DWITH_MKL=${WITH_MKL:-ON} \
+            -DWITH_AVX=${WITH_AVX:-ON} \
+            -DWITH_GOLANG=${WITH_GOLANG:-OFF} \
+            -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
+            -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
+            -DWITH_C_API=${WITH_C_API:-OFF} \
+            -DWITH_PYTHON=${WITH_PYTHON:-ON} \
+            -DCUDNN_ROOT=/usr/ \
+            -DWITH_TESTING=${WITH_TESTING:-ON} \
+            -DWITH_FAST_BUNDLE_TEST=ON \
+            -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
+            -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
+            -DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
+            -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
+            -DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
+            -DPY_VERSION=${PY_VERSION:-2.7}
+    else
+        cat <<EOF
+        ========================================
+        Configuring cmake in /paddle/build ...
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+            ${PYTHON_FLAGS}
+            -DWITH_DSO=ON
+            -DWITH_DOC=${WITH_DOC:-OFF}
+            -DWITH_GPU=${WITH_GPU:-OFF}
+            -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF}
+            -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF}
+            -DWITH_MKL=${WITH_MKL:-ON}
+            -DWITH_AVX=${WITH_AVX:-OFF}
+            -DWITH_GOLANG=${WITH_GOLANG:-OFF}
+            -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
+            -DWITH_C_API=${WITH_C_API:-OFF}
+            -DWITH_PYTHON=${WITH_PYTHON:-ON}
+            -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON}
+            -DCUDNN_ROOT=/usr/
+            -DWITH_TESTING=${WITH_TESTING:-ON}
+            -DWITH_FAST_BUNDLE_TEST=ON
+            -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+            -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
+            -DWITH_INFERENCE=${WITH_INFERENCE:-ON}
+            -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON}
+            -DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
+            -DWITH_ANAKIN=${WITH_ANAKIN:-OFF}
+            -DPY_VERSION=${PY_VERSION:-2.7}
+        ========================================
+EOF
+        # Disable UNITTEST_USE_VIRTUALENV in docker because
+        # docker environment is fully controlled by this script.
+        # See /Paddle/CMakeLists.txt, UNITTEST_USE_VIRTUALENV option.
+        cmake .. \
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
+            ${PYTHON_FLAGS} \
+            -DWITH_DSO=ON \
+            -DWITH_DOC=${WITH_DOC:-OFF} \
+            -DWITH_GPU=${WITH_GPU:-OFF} \
+            -DWITH_AMD_GPU=${WITH_AMD_GPU:-OFF} \
+            -DWITH_DISTRIBUTE=${WITH_DISTRIBUTE:-OFF} \
+            -DWITH_MKL=${WITH_MKL:-ON} \
+            -DWITH_AVX=${WITH_AVX:-OFF} \
+            -DWITH_GOLANG=${WITH_GOLANG:-OFF} \
+            -DCUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All} \
+            -DWITH_SWIG_PY=${WITH_SWIG_PY:-ON} \
+            -DWITH_C_API=${WITH_C_API:-OFF} \
+            -DWITH_PYTHON=${WITH_PYTHON:-ON} \
+            -DCUDNN_ROOT=/usr/ \
+            -DWITH_TESTING=${WITH_TESTING:-ON} \
+            -DWITH_FAST_BUNDLE_TEST=ON \
+            -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
+            -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DWITH_CONTRIB=${WITH_CONTRIB:-ON} \
+            -DWITH_INFERENCE=${WITH_INFERENCE:-ON} \
+            -DWITH_INFERENCE_API_TEST=${WITH_INFERENCE_API_TEST:-ON} \
+            -DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo} \
+            -DWITH_ANAKIN=${WITH_ANAKIN:-OFF} \
+            -DPY_VERSION=${PY_VERSION:-2.7}
+    fi
+
 }

 function abort(){
@ -232,8 +296,8 @@ function build_mac() {
    ============================================
 EOF
    make clean
-    sudo make -j 8
-    sudo make install -j 8
+    make -j 8
+    make install -j 8
 }

 function build_android() {
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@ -30,15 +30,12 @@ list(REMOVE_ITEM TEST_OPS op_test) # op_test is a helper python file, not a test
 list(REMOVE_ITEM TEST_OPS decorators) # decorators is a helper python file, not a test

 if(APPLE)
-    message(WARNING "These tests has been disabled in OSX before being fixed: \n test_detection_map_op \n test_desc_clone \n test_debugger \n test_program_code \n test_dist_transformer \n test_dist_se_resnext")
+    message(WARNING "These tests has been disabled in OSX before being fixed: \n test_detection_map_op \n test_debugger \n test_dist_se_resnext")
    # this op is not support on mac
    list(REMOVE_ITEM TEST_OPS test_fusion_seqexpand_concat_fc_op)
    # TODO: add the unitest back when it fixed
    list(REMOVE_ITEM TEST_OPS test_detection_map_op)
-    list(REMOVE_ITEM TEST_OPS test_desc_clone)
    list(REMOVE_ITEM TEST_OPS test_debugger)
-    list(REMOVE_ITEM TEST_OPS test_program_code)
-    list(REMOVE_ITEM TEST_OPS test_dist_transformer)
    list(REMOVE_ITEM TEST_OPS test_dist_se_resnext)
 endif()

@ -73,11 +70,13 @@ py_test_modules(test_warpctc_op MODULES test_warpctc_op ENVS FLAGS_warpctc_dir=$
 if(WITH_DISTRIBUTE)
    py_test_modules(test_dist_train MODULES test_dist_train SERIAL)
    set_tests_properties(test_listen_and_serv_op PROPERTIES TIMEOUT 20)
-    set_tests_properties(test_dist_mnist PROPERTIES TIMEOUT 200)
-    set_tests_properties(test_dist_word2vec PROPERTIES TIMEOUT 200)
+    if(NOT APPLE)
+        set_tests_properties(test_dist_mnist PROPERTIES TIMEOUT 200)
+        set_tests_properties(test_dist_word2vec PROPERTIES TIMEOUT 200)
+        py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL)
+    endif(NOT APPLE)
    py_test_modules(test_dist_transpiler MODULES test_dist_transpiler)
    py_test_modules(test_dist_transformer MODULES test_dist_transformer SERIAL)
-    py_test_modules(test_dist_se_resnext MODULES test_dist_se_resnext SERIAL)
 endif()
 py_test_modules(test_parallel_executor_crf MODULES test_parallel_executor_crf SERIAL)
 py_test_modules(test_parallel_executor_fetch_feed MODULES test_parallel_executor_fetch_feed SERIAL)