From 5db75623f3be8808169d3cada1a82ec26ed8733b Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 10:02:05 -0400 Subject: [PATCH 1/8] Use more direct configuration of cmake, disable unstable for gcc tests --- .travis.sh | 15 ++------------- .travis.yml | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.travis.sh b/.travis.sh index 522d82353..209b08ee0 100755 --- a/.travis.sh +++ b/.travis.sh @@ -22,19 +22,8 @@ function build_and_test () sudo update-alternatives --set gcc /usr/bin/gcc-$GCC_VERSION fi - # gcc is too slow and we have a time limit in Travis CI: selective builds. - if [ "$BUILD_EXAMPLES" == "1" ]; then - GTSAM_BUILD_EXAMPLES_ALWAYS=ON - else - GTSAM_BUILD_EXAMPLES_ALWAYS=OFF - fi - if [ "$RUN_TESTS" == "1" ]; then - GTSAM_BUILD_TESTS=ON - else - GTSAM_BUILD_TESTS=OFF - fi - cmake $SOURCE_DIR \ + -GTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS @@ -42,7 +31,7 @@ function build_and_test () make -j2 # Run tests: - if [ "$RUN_TESTS" == "1" ]; then + if [ "$GTSAM_BUILD_TESTS" == "ON" ]; then make check fi diff --git a/.travis.yml b/.travis.yml index bce676721..857c6469f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,23 +27,24 @@ env: - MAKEFLAGS="-j 2" - CCACHE_SLOPPINESS=pch_defines,time_macros +# gcc is too slow and we have a time limit in Travis CI: selective builds. matrix: include: - compiler: gcc os: linux - env: BUILD_EXAMPLES=1 + env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF - compiler: gcc os: linux - env: RUN_TESTS=1 - - compiler: gcc - os: linux - env: BUILD_EXAMPLES=1 GCC_VERSION="8" - - compiler: clang - os: linux - env: BUILD_EXAMPLES=1 - - compiler: gcc - os: osx - env: BUILD_EXAMPLES=1 - - compiler: clang - os: osx - env: RUN_TESTS=1 + env: GTSAM_BUILD_UNSTABLE=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON # gcc too slow for all tests + # - compiler: gcc + # os: linux + # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF GCC_VERSION="8" + # - compiler: clang + # os: linux + # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF + # - compiler: gcc + # os: osx + # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF + # - compiler: clang + # os: osx + # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON From 1dedbe65ff94f9d085e44d1ed27379e9041fbf77 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 10:08:55 -0400 Subject: [PATCH 2/8] Fix typo --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 209b08ee0..bb3b497ed 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,7 +23,7 @@ function build_and_test () fi cmake $SOURCE_DIR \ - -GTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ + -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS From 2382d958251b00c6e5fb8bbc93ab100120aba864 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 11:02:37 -0400 Subject: [PATCH 3/8] Re-enabled rest of matrix --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 857c6469f..f1ddd240c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,15 +36,15 @@ matrix: - compiler: gcc os: linux env: GTSAM_BUILD_UNSTABLE=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON # gcc too slow for all tests - # - compiler: gcc - # os: linux - # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF GCC_VERSION="8" - # - compiler: clang - # os: linux - # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF - # - compiler: gcc - # os: osx - # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF - # - compiler: clang - # os: osx - # env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON + - compiler: gcc + os: linux + env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF GCC_VERSION="8" + - compiler: clang + os: linux + env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF + - compiler: gcc + os: osx + env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF + - compiler: clang + os: osx + env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON From b06e5f0e832de341004de7adceead13e86f058ba Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 16:43:33 -0400 Subject: [PATCH 4/8] Install ccache on OSX and add GTSAM_BUILD_WITH_CCACHE flag to cmake --- .travis.sh | 1 + .travis.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.travis.sh b/.travis.sh index bb3b497ed..76d384263 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,6 +23,7 @@ function build_and_test () fi cmake $SOURCE_DIR \ + -DGTSAM_BUILD_WITH_CCACHE=ON -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS diff --git a/.travis.yml b/.travis.yml index f1ddd240c..402dec48c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,10 @@ addons: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi +install: + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ccache ; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi + script: - bash .travis.sh From ea63adf20d6b7f3683e491d43460df7c85880062 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 16:48:33 -0400 Subject: [PATCH 5/8] Another typo :-( --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 76d384263..f7a9fef42 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,7 +23,7 @@ function build_and_test () fi cmake $SOURCE_DIR \ - -DGTSAM_BUILD_WITH_CCACHE=ON + -DGTSAM_BUILD_WITH_CCACHE=ON \ -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS From a1daa163be207d5c3e56f30c2e717dc331f08e6f Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 18:12:08 -0400 Subject: [PATCH 6/8] Add ccache stats --- .travis.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index f7a9fef42..434187e4f 100755 --- a/.travis.sh +++ b/.travis.sh @@ -23,7 +23,6 @@ function build_and_test () fi cmake $SOURCE_DIR \ - -DGTSAM_BUILD_WITH_CCACHE=ON \ -DGTSAM_BUILD_UNSTABLE=$GTSAM_BUILD_UNSTABLE \ -DGTSAM_BUILD_EXAMPLES_ALWAYS=$GTSAM_BUILD_EXAMPLES_ALWAYS \ -DGTSAM_BUILD_TESTS=$GTSAM_BUILD_TESTS @@ -36,6 +35,9 @@ function build_and_test () make check fi + # Print ccache stats + ccache -s + cd $SOURCE_DIR } From 1e663a3a79e4c5c57db2c8e4e93a8f9c59f5b07f Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 22:55:57 -0400 Subject: [PATCH 7/8] Removed brew update and gcc build on mac Hoping that the latter will fix cache issue on Mac. And who uses gcc on Mac anyway? --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 402dec48c..a7032638a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ addons: - libpython-dev python-numpy - libboost-all-dev -before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi +# before_install: +# - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ccache ; fi @@ -46,9 +46,9 @@ matrix: - compiler: clang os: linux env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF - - compiler: gcc - os: osx - env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF +# - compiler: gcc +# os: osx +# env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=ON GTSAM_BUILD_TESTS=OFF - compiler: clang os: osx env: GTSAM_BUILD_UNSTABLE=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF GTSAM_BUILD_TESTS=ON From 0d731e9b0c11d90c4669dfbab2f7f03077e75cd8 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 2 Jun 2019 23:58:46 -0400 Subject: [PATCH 8/8] Disable brew update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7032638a..4b4487103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ccache ; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi script: