Clean travis ci

.travis.yml

@@ -47,7 +47,7 @@ before_install:
     fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
   - if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
-  - pip install --upgrade pip 
+  - pip install --upgrade pip
   - pip install wheel protobuf sphinx recommonmark sphinx_rtd_theme virtualenv pre-commit requests==2.9.2 LinkChecker
 script:
   - paddle/scripts/travis/main.sh

cmake/external/python.cmake

@@ -138,41 +138,22 @@ SET(NUMPY_SOURCES_DIR ${PYTHON_SOURCES_DIR}/numpy)
 SET(NUMPY_TAG_VERSION "v1.11.3")
 SET(NUMPY_VERSION "1.11.3")
 
+SET(EGG_NAME "")
+SET(PYTHON_NUMPY_INCLUDE_DIR "")
 IF(WIN32)
     SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-${HOST_SYSTEM}.egg")
 ELSE(WIN32)
     IF(APPLE)
-        SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-${HOST_SYSTEM}-${MACOS_VERSION}-x86_64.egg")
+        SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-${HOST_SYSTEM}-${MACOS_VERSION}")
     ELSE(APPLE)
-        SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-linux-x86_64.egg")
+        SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-linux")
+        SET(EGG_NAME "numpy-${NUMPY_VERSION}-py2.7-linux")
     ENDIF(APPLE)
-ENDIF(WIN32)
 
-SET(PYTHON_NUMPY_INCLUDE_DIR "${PY_SITE_PACKAGES_PATH}/${EGG_NAME}/numpy/core/include")
-IF(${PYTHON_FOUND}) # local python
-    SET(PYTHON_NUMPY_INCLUDE_DIR
-        "${PY_SITE_PACKAGES_PATH}/${EGG_NAME}/numpy/core/include")
-ELSE(${PYTHON_FOUND}) # global python
-    SET(PYTHON_NUMPY_INCLUDE_DIR "")
-    SET(PY_SITE_PACKAGES_DIR "")
-    FILE(WRITE ${PROJECT_BINARY_DIR}/FindNumpyPath.py
-        "try: import site; print(site.getsitepackages())\nexcept:pass\n")
-    EXEC_PROGRAM("env ${py_env} ${PYTHON_EXECUTABLE}" ${PROJECT_BINARY_DIR}
-        ARGS "FindNumpyPath.py" OUTPUT_VARIABLE NUMPY_PATH)
-
-    STRING(REPLACE "[" "" NUMPY_PATH "${NUMPY_PATH}")
-    STRING(REPLACE "]" "" NUMPY_PATH "${NUMPY_PATH}")
-    STRING(REPLACE "'" "" NUMPY_PATH "${NUMPY_PATH}")
-    STRING(REPLACE ", " ";" SITE_DIRS "${NUMPY_PATH}")
-
-    FOREACH(SITE_DIR ${SITE_DIRS})
-        IF(EXISTS ${SITE_DIR})
-            LIST(APPEND PYTHON_NUMPY_INCLUDE_DIR
-                "${SITE_DIR}/${EGG_NAME}/numpy/core/include")
-            SET(PY_SITE_PACKAGES_DIR "${SITE_DIR}")
-        ENDIF()
+    FOREACH(suffix x86_64 intel fat64 fat32 universal)
+        LIST(APPEND PYTHON_NUMPY_INCLUDE_DIR ${PY_SITE_PACKAGES_PATH}/${EGG_NAME}-${suffix}.egg/numpy/core/include)
     ENDFOREACH()
-ENDIF(${PYTHON_FOUND})
+ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${PYTHON_NUMPY_INCLUDE_DIR})
 

paddle/scripts/travis/build_and_test.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 source ./common.sh
 
+python -c 'import pip; print(pip.pep425tags.get_supported())'
+
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   CMAKE_EXTRA="-DWITH_SWIG_PY=OFF"
 else
@@ -14,11 +16,11 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   NRPOC=`nproc`
   make -j $NPROC
   make coveralls
+  sudo make install
 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   NPROC=`sysctl -n hw.ncpu`
   make -j $NPROC
   env CTEST_OUTPUT_ON_FAILURE=1 make test ARGS="-j $NPROC"
+  sudo make install
+  sudo paddle version
 fi
-
-sudo make install
-sudo paddle version

python/CMakeLists.txt

@@ -16,7 +16,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
 add_custom_command(OUTPUT ${OUTPUT_DIR}/.timestamp
     COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
     COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT_DIR}/.timestamp
-    DEPENDS gen_proto_py ${PY_FILES})
+    DEPENDS gen_proto_py ${PY_FILES} ${external_project_dependencies})
 
 add_custom_target(paddle_python ALL DEPENDS
     ${OUTPUT_DIR}/.timestamp)