Skip to content

Commit 2fd4684

Browse files
authored
Merge pull request #2597 from wangkuiyi/move_third_party_into_build
Move directory third_party into /build
2 parents 109fc93 + be54d38 commit 2fd4684

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ cache:
44
directories:
55
- $HOME/.ccache
66
- $HOME/.cache/pip
7+
- $TRAVIS_BUILD_DIR/build/third_party
78
sudo: required
89
dist: trusty
910
os:
@@ -41,7 +42,9 @@ before_install:
4142
- |
4243
function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
4344
script:
44-
- paddle/scripts/travis/$JOB.sh
45+
- |
46+
timeout 2580 paddle/scripts/travis/${JOB}.sh # 43min timeout
47+
RESULT=$?; if [ $RESULT -eq 0 ] || [ $RESULT -eq 142 ]; then true; else false; fi;
4548
notifications:
4649
email:
4750
on_success: change

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if(ANDROID)
7171
"Disable RDMA when cross-compiling for Android" FORCE)
7272
endif(ANDROID)
7373

74-
set(THIRD_PARTY_PATH "${PROJ_ROOT}/third_party" CACHE STRING
74+
set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
7575
"A path setting third party libraries download & build directories.")
7676

7777
if (WITH_C_API AND WITH_PYTHON)

paddle/scripts/travis/build_doc.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ cd $TRAVIS_BUILD_DIR/build
77

88
# Compile Documentation only.
99
cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF
10+
1011
mkdir output
1112
make -j `nproc`
1213
find .. -name '*whl' | xargs pip install # install all wheels.

0 commit comments

Comments
 (0)