diff --git a/Dockerfile b/Dockerfile index c3ad0c9c2f6d619f2b2ef2bcf21429937d06dd6e..6d5797da9e06a514e03dee52bd248478fa41813f 100644 --- a/Dockerfile +++ b/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 diff --git a/cmake/util.cmake b/cmake/util.cmake index 966e0a7bf60fdeaac575b9d9c19c7095e104b13c..b828eef322bc570c07f5c357353641117a094c16 100644 --- a/cmake/util.cmake +++ b/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} diff --git a/paddle/capi/Main.cpp b/paddle/capi/Main.cpp index 7f24561e9aafc1e900f6371ad3c7e5a45033a9ef..78c43949dfe325d0e1a6ba10ae51cb7b858f6c52 100644 --- a/paddle/capi/Main.cpp +++ b/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" { diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh index bc8eef4ea87d207dd26b20eac9e4a23d26236aed..9e72c68d4bb1e3708b01885460b10a0f9dc5afe8 100644 --- a/paddle/scripts/docker/build.sh +++ b/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