From 6a91200757d4484dbdcb3eac78dbf711426685fc Mon Sep 17 00:00:00 2001
From: JiabinYang <marsyang199376@gmail.com>
Date: Tue, 18 Sep 2018 13:16:00 +0000
Subject: [PATCH] fix mac unitest and add test_debugger back

---
 paddle/scripts/paddle_build.sh                | 68 ++-----------------
 .../fluid/tests/unittests/CMakeLists.txt      |  3 +-
 2 files changed, 6 insertions(+), 65 deletions(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index f97c3401ca0..8f854df69d5 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -110,68 +110,12 @@ function cmake_gen() {
     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:-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:-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}
+        WITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON}
+        WITH_AVX=${WITH_AVX:-ON}
     else
-        cat <<EOF
+        INFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR=-/root/.cache/inference_demo}
+    fi
+cat <<EOF
         ========================================
         Configuring cmake in /paddle/build ...
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
@@ -230,10 +174,8 @@ EOF
             -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
 
 }
 
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 6576b45ee23..5312fc60fed 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -30,12 +30,11 @@ 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_debugger \n test_dist_se_resnext")
+    message(WARNING "These tests has been disabled in OSX before being fixed: \n test_detection_map_op \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_debugger)
     list(REMOVE_ITEM TEST_OPS test_dist_se_resnext)
 endif()
 
-- 
GitLab