From 0b50519a7e90454fb4da15673a191d5adff677c9 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 18 Dec 2017 13:11:18 +0000 Subject: [PATCH 1/7] And another attempt. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c167418..fa3e93e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ before_install: sudo apt-get install cmake; sudo apt-get install libboost1.55-all-dev; wget https://github.com/Itseez/opencv/archive/3.1.0.zip; - unzip 3.1.0.zip; - opencv-3.1.0; + unzip 3.1.0.zip -q; + cd opencv-3.1.0; mkdir build; cd build; fi @@ -51,7 +51,8 @@ before_install: - if [ ${TRAVIS_OS_NAME} = osx ]; then brew update; brew install tbb; - brew install homebrew/science/opencv || brew link --overwrite homebrew/python/numpy + brew install homebrew/science/opencv + homebrew/python/numpy fi before_script: From 2c0291eb027d4f380579930a256be5e7adc242e2 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 18 Dec 2017 13:34:37 +0000 Subject: [PATCH 2/7] Yet again --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa3e93e..c506b7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: sudo apt-get install cmake; sudo apt-get install libboost1.55-all-dev; wget https://github.com/Itseez/opencv/archive/3.1.0.zip; - unzip 3.1.0.zip -q; + unzip -q 3.1.0.zip; cd opencv-3.1.0; mkdir build; cd build; @@ -51,8 +51,7 @@ before_install: - if [ ${TRAVIS_OS_NAME} = osx ]; then brew update; brew install tbb; - brew install homebrew/science/opencv - homebrew/python/numpy + brew install homebrew/science/opencv; fi before_script: From 5d76569ead0c8f6c7cd16aa559caf69e970d93cc Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 19 Dec 2017 17:31:42 +0000 Subject: [PATCH 3/7] More attempts to fix travis. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c506b7e..90b876c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,8 @@ before_install: - if [ ${TRAVIS_OS_NAME} = osx ]; then brew update; brew install tbb; - brew install homebrew/science/opencv; + brew tap homebrew/science; + brew install opencv; fi before_script: @@ -67,7 +68,5 @@ script: - make -j2 - ../build/bin/FaceLandmarkImg -fdir "../samples/" -out_dir "./demo_img/" -wild -q - ../build/bin/FaceLandmarkImg -inroot ../samples -f sample1.jpg -out_dir data -of sample1.txt -multi_view 1 -wild -q - - ../build/bin/FaceLandmarkVidMulti -inroot ../samples -f multi_face.avi -q - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -out_dir -q - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -simsize 200 -simscale 0.5 -q - - ../build/bin/FaceLandmarkVid -inroot ../samples -f 2015-10-15-15-14.avi -f multi_face.avi -q From 69f73ecc1155b6cb4729cda7d52b24fd7c8210d5 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 19 Dec 2017 19:12:05 +0000 Subject: [PATCH 4/7] More travis fixes, --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90b876c..968aa39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ script: - cd build - cmake -D CMAKE_BUILD_TYPE=RELEASE CMAKE_CXX_FLAGS="-std=c++11" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11" .. - make -j2 - - ../build/bin/FaceLandmarkImg -fdir "../samples/" -out_dir "./demo_img/" -wild -q + - ../build/bin/FaceLandmarkImg -fdir "../samples/" -out_dir "./demo_img" -wild -q - ../build/bin/FaceLandmarkImg -inroot ../samples -f sample1.jpg -out_dir data -of sample1.txt -multi_view 1 -wild -q - - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -out_dir -q + - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -out_dir output -q - ../build/bin/FeatureExtraction -f "../samples/2015-10-15-15-14.avi" -simsize 200 -simscale 0.5 -q From e5bfeae31b9ba9dfb2f89afc8abf983ae43b231b Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sat, 23 Dec 2017 10:15:41 +0000 Subject: [PATCH 5/7] Attempting to fix OS X builds. --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 968aa39..796febd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,12 @@ before_install: brew update; brew install tbb; brew tap homebrew/science; - brew install opencv; + brew install vtk; + wget https://github.com/Itseez/opencv/archive/3.1.0.zip; + unzip -q 3.1.0.zip; + cd opencv-3.1.0; + mkdir build; + cd build; fi before_script: From d092681547f3e168835c8596e5d512063a7c6cb3 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sat, 23 Dec 2017 10:39:44 +0000 Subject: [PATCH 6/7] More changes for OS X --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 796febd..05b8b69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,9 @@ before_install: wget https://github.com/Itseez/opencv/archive/3.1.0.zip; unzip -q 3.1.0.zip; cd opencv-3.1.0; - mkdir build; + sudo mkdir build; cd build; + sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON ..; fi before_script: From 1d8c3727675c3cbcb5daf843283f5ab8718c9941 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 27 Dec 2017 08:19:25 +0000 Subject: [PATCH 7/7] Removing OSX build from travis for now. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05b8b69..8c9f66d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ compiler: - gcc os: - - osx - linux before_install: