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

Dockerfile

@@ -26,7 +26,7 @@ RUN apt-get update && \
     apt-get install -y git python-pip python-dev openssh-server bison && \
     apt-get install -y wget unzip tar xz-utils bzip2 gzip coreutils && \
     apt-get install -y curl sed grep graphviz libjpeg-dev zlib1g-dev && \
-    apt-get install -y python-numpy python-matplotlib gcc g++ gfortran && \
+    apt-get install -y python-numpy python-matplotlib gcc g++ liblapack-dev liblapacke-dev && \
     apt-get install -y automake locales clang-format-3.8 swig doxygen && \
     apt-get clean -y
 

cmake/util.cmake

@@ -149,7 +149,6 @@ endfunction()
 # Create a python unittest using run_python_tests.sh,
 # which takes care of making correct running environment
 function(add_python_test TEST_NAME)
-    message("PYTHON: ${PYTHON_EXECUTABLE}")
     add_test(NAME ${TEST_NAME}
         COMMAND bash ${PROJ_ROOT}/paddle/scripts/run_python_tests.sh
         ${USE_VIRTUALENV_FOR_TEST} ${PYTHON_EXECUTABLE} ${ARGN}

paddle/capi/Main.cpp

@@ -25,7 +25,6 @@ limitations under the License. */
 static void initPaddle(int argc, char** argv) {
   paddle::initMain(argc, argv);
   paddle::initPython(argc, argv);
-  feenableexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
 }
 
 extern "C" {

paddle/scripts/docker/build.sh

@@ -34,7 +34,8 @@ cmake .. \
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 make -j `nproc`
 if [ ${WITH_TESTING:-OFF} == "ON" ] && [ ${RUN_TEST:-OFF} == "ON" ] ; then
-    ctest -V -j `nproc`
+    pip uninstall -y py-paddle paddle || true
+    ctest -V
 fi
 make install
 pip install /usr/local/opt/paddle/share/wheels/*.whl