提交 3ecc63ad 编写于 作者: L liaogang

Add python in travis ci for paddle version command

上级 fc47492f
...@@ -25,7 +25,9 @@ addons: ...@@ -25,7 +25,9 @@ addons:
- git - git
- build-essential - build-essential
- libatlas-base-dev - libatlas-base-dev
- python
- python-pip - python-pip
- python2.7-dev
- curl - curl
- graphviz - graphviz
- clang-format-3.8 - clang-format-3.8
......
...@@ -94,17 +94,17 @@ add_dependencies(python_api_wheel python_swig_sources ...@@ -94,17 +94,17 @@ add_dependencies(python_api_wheel python_swig_sources
paddle_cuda) paddle_cuda)
if(WITH_TESTING) if(WITH_TESTING)
SET(PIP_SOURCES_DIR ${PYTHON_SOURCES_DIR}/pip) SET(PIP_SOURCES_DIR ${PYTHON_SOURCES_DIR}/pip)
ExternalProject_Add(pip ExternalProject_Add(pip
${EXTERNAL_PROJECT_LOG_ARGS} ${EXTERNAL_PROJECT_LOG_ARGS}
GIT_REPOSITORY https://github.com/pypa/pip.git GIT_REPOSITORY https://github.com/pypa/pip.git
GIT_TAG 9.0.1 GIT_TAG 9.0.1
PREFIX ${PIP_SOURCES_DIR} PREFIX ${PIP_SOURCES_DIR}
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py install INSTALL_COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py install
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
DEPENDS python setuptools python_api_wheel DEPENDS python setuptools python_api_wheel
) )
add_subdirectory(test) add_subdirectory(test)
endif() endif()
add_test(NAME test_swig_api add_test(NAME test_swig_api
COMMAND bash ${PROJ_ROOT}/paddle/api/test/run_tests.sh ${PYTHON_EXECUTABLE} ${PYTHON_INSTALL_DIR}/bin/pip) COMMAND bash ${PROJ_ROOT}/paddle/api/test/run_tests.sh ${PYTHON_EXECUTABLE})
...@@ -20,10 +20,6 @@ popd > /dev/null ...@@ -20,10 +20,6 @@ popd > /dev/null
cd $SCRIPTPATH cd $SCRIPTPATH
# rm -rf .test_env
# virtualenv .test_env
# source .test_env/bin/activate
$1 -m pip install ../../dist/*.whl $1 -m pip install ../../dist/*.whl
test_list="testArguments.py testGradientMachine.py testMatrix.py testVector.py testTrain.py testTrainer.py" test_list="testArguments.py testGradientMachine.py testMatrix.py testVector.py testTrain.py testTrainer.py"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册