提交 7cf8e0c9 编写于 作者: Y Yu Yang

Lazy install Paddle wheels

* install wheels when invoke paddle script if current python don't
  have paddle packages, or installed a previous version.
* Also add `make install` to travis
上级 dbaabc94
...@@ -29,6 +29,7 @@ before_install: ...@@ -29,6 +29,7 @@ before_install:
script: script:
- paddle/scripts/travis/build.sh - paddle/scripts/travis/build.sh
- paddle/scripts/travis/unittest.sh - paddle/scripts/travis/unittest.sh
- paddle/scripts/travis/make_install.sh
notifications: notifications:
email: email:
on_success: change on_success: change
......
...@@ -43,6 +43,40 @@ fi ...@@ -43,6 +43,40 @@ fi
export PYTHONPATH=${PWD}:${PYTHONPATH} export PYTHONPATH=${PWD}:${PYTHONPATH}
# Check python lib installed or not.
pip --help > /dev/null
if [ $? -ne 0 ]; then
echo "pip should be installed to run paddle."
exit 1
fi
INSTALLED_VERSION=`pip freeze 2>/dev/null | grep '^paddle' | sed 's/.*==//g'`
if [ -z ${INSTALLED_VERSION} ]; then
INSTALLED_VERSION="0.0.0" # not installed
fi
cat <<EOF | python -
from distutils.version import LooseVersion
import sys
if LooseVersion("${INSTALLED_VERSION}") < LooseVersion("@PADDLE_VERSION@"):
sys.exit(1)
else:
sys.exit(0)
EOF
if [ $? -eq 1 ]; then # Older version installed, or not installed at all
echo "First time run paddle, need to install some python dependencies."
BASEDIR=$(dirname "$0")
pip install ${BASEDIR}/../opt/paddle/share/wheels/*.whl
if [ $? -ne 0 ]; then
echo "pip install wheels failed. "
echo "Please use 'sudo paddle' at the first time you use PaddlePaddle"
echo "PaddlePaddle will install some python dependencies automatically."
fi
echo "Python dependencies are installed."
fi
case "$1" in case "$1" in
"train") "train")
${DEBUGGER} $MYDIR/../opt/paddle/bin/paddle_trainer ${@:2} ${DEBUGGER} $MYDIR/../opt/paddle/bin/paddle_trainer ${@:2}
......
#!/bin/bash #!/bin/bash
cd `dirname $0` cd `dirname $0`
cd ../../../ source ./common.sh
set -e
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_TESTING=ON -DON_TRAVIS=ON cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_TESTING=ON -DON_TRAVIS=ON
make -j `nproc` make -j `nproc`
#!/bin/bash
set -e
mkdir -p ../../../build
cd ../../../build
#!/bin/bash
cd `dirname $0`
source ./common.sh
sudo make install
sudo paddle version
#!/bin/bash #!/bin/bash
set -e
cd `dirname $0` cd `dirname $0`
cd ../../../build source ./common.sh
env CTEST_OUTPUT_ON_FAILURE=1 make test ARGS="-j `nproc`" env CTEST_OUTPUT_ON_FAILURE=1 make test ARGS="-j `nproc`"
...@@ -22,10 +22,6 @@ find_python_module(pip REQUIRED) ...@@ -22,10 +22,6 @@ find_python_module(pip REQUIRED)
find_python_module(wheel REQUIRED) find_python_module(wheel REQUIRED)
find_python_module(google.protobuf REQUIRED) find_python_module(google.protobuf REQUIRED)
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install -f
WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR})")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/
DESTINATION opt/paddle/share/wheels DESTINATION opt/paddle/share/wheels
) )
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册