Commit Graph

31 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
9147dfe2f3 Feature/opencv4 (#706)
* Travis OpenCV4 update, testing Ubuntu with new OpenCV

* Fix to Ubuntu travis

* Another attempt at OpenCV 4.0 for Ubuntu

* And another OpenCV attempt.

* Simplifying the travis script

* Ubuntu OpenCV 4 support.

* Updating to OpenCV 4, for x64 windows.

* Fixes to move to OpenCV 4 on windows.

* Travis fix for OpenCV 4 on OSX

* Renaming a lib.

* Travis opencv4 fix.

* Building OpenCV4 versions using appveyor.

* Attempt mac travis fix.

* Small travis fix.

* Travis fix attempt.

* First iteration in boost removal and upgrade to C++17

* Test with ocv 4.0

* Moving filesystem out of stdafx

* Some more boost testing with cmake.

* More CMAKE options

* More compiler flag changes

* Another attempt at compiler options.

* Another attempt.

* More filesystem stuff.

* Linking to filesystem.

* Cmake fix with target linking.

* Attempting travis with g++-8

* Attempting to setup g++8 on travis linux.

* Another travis change.

* Adding OpenBLAS to travis and removing g++-8

* Fixing typo

* More travis experiments.

* More travis debugging.

* A small directory change.

* Adding some more travis changes.

* travis typo fix.

* Some reordering of travis, for cleaner yml

* Removing `using namespace std` in order to avoid clash with byte and to make the code more consistent.

* Working towards removing std::filesystem requirement, allow boost::filesystem as well.

* Making boost an optional dependency

* Fixing std issue.

* Fixing cmake issue.

* Fixing the precompiled header issue.

* Another cmake boost fix.

* Including missing files.

* Removing unnecessary includes.

* Removing more includes.

* Changes to appveyor build, proper removal of VS2015

* If boost is present, do not need to link to filesystem.

* Removing un-needed link library.

* oops

* Mac attempt at opencv4 travis.

* Upgrading OCV to 4.1 on VS2018

* Downloading OpenCV binaries through a script

* Triger an appveyor build.

* Upgrading VS version.

* Attempting VS2017 build

* Adding win-32 libraries for OpenCV 4.1

* Adding OpenCV 32 bit libraries.
2019-05-28 19:49:17 +01:00
Tadas Baltrusaitis
ae1a8d038f Merging with master. 2018-11-28 20:42:18 +00:00
Tadas Baltrusaitis
91cb3f9c39 Updating OpenBLAS (#594)
Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)
2018-10-25 20:15:11 +01:00
Tadas Baltrusaitis
77eae16732 Removing TBB dependency (#590)
Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_
2018-10-20 10:45:35 +01:00
Tadas Baltrusaitis
be9b57703c A number of changes to bring up master to version 2.0.6 (#581)
- Removed duplicated code and some C++ warnings
- Fixing snapshot function in HeadPoseLive (test on PC)
- C++ code cleanup (https://github.com/TadasBaltrusaitis/OpenFace/issues/533, https://github.com/TadasBaltrusaitis/OpenFace/issues/534)
- Adding a Visual Studio 2017 solution file
- Moving to C++ OpenCV convention (thanks @taoyudong)
- Storing models in additional locations (see wiki and scripts) https://github.com/TadasBaltrusaitis/OpenFace/issues/553
2018-10-06 21:13:18 +01:00
Tadas Baltrusaitis
630aba9006 Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing. 2018-09-18 08:24:16 +01:00
Tadas Baltrusaitis
205f1ce689 Dlib update preparation for OSX and Ubuntu. 2018-06-18 16:28:14 +01:00
Tadas Baltrusaitis
b48f06d42e Changing testing scripts for CI. 2018-05-07 09:27:47 +01:00
Tadas Baltrusaitis
655a76d343 Apveyor script fix. 2018-05-06 22:18:25 +01:00
Tadas Baltrusaitis
394b73efb7 Even more CI simplification. Fixing a warning caused by callig OpenBLAS with a string literal. 2018-05-06 22:07:58 +01:00
Tadas Baltrusaitis
f6a9dfe95a Simplifying travis and appveyor, too heavy to run atm. 2018-05-06 16:17:55 +01:00
Tadas Baltrusaitis
c373db3b7f Travis fix, simplifying appveyor. 2018-05-06 13:37:31 +01:00
Tadas Baltrusaitis
e0ba3345b7 Debugging travis and dlib issue fix for Mac OS and appveyor speed fix. 2018-05-06 11:11:22 +01:00
Tadas Baltrusaitis
a4c6f6fefa Removing un-needed PAW and PDM definitions in FaceAnalyser, appveyor script typo fix. 2018-05-06 10:37:12 +01:00
Tadas Baltrusaitis
838337c760 Moving OpenFace 2.0 to develop branch and getting ready for master. 2018-05-06 08:19:09 +01:00
Tadas Baltrusaitis
43c44bcbe3 Issues in appveyor due to OpenCV. 2017-12-28 17:57:05 +00:00
Tadas Baltrusaitis
39ebc68afd New interface appveyor and travis files 2017-12-13 18:00:05 +00:00
Tadas Baltrusaitis
83809c1ca6 Fixes for travis and appveyor 2017-05-09 10:11:21 -04:00
Tadas Baltrusaitis
305af01326 Auto stash before merge of "develop" and "origin/develop"
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Tadas Baltrusaitis
52c50b4ff3 - Fixing the issue with gaze not tracking properly in video and landmark modes.
- Fixing the simscale/simalign bug
2017-03-08 11:46:50 -05:00
Tadas Baltrusaitis
e88b788aed Fixes with test scripts. 2016-07-31 22:15:29 -04:00
Tadas Baltrusaitis
3fc388cdeb Fixes with -inroot and -outroot 2016-07-31 20:55:29 -04:00
Tadas Baltrusaitis
51ae195124 A number of small fixes, renamings and corrections. 2016-07-31 16:31:17 -04:00
Tadas Baltrusaitis
35f1967176 Fixing regexp. 2016-07-31 13:15:47 -04:00
Tadas Baltrusaitis
ce22058bf3 Making sure features get tested by CI. 2016-07-31 13:12:37 -04:00
Tadas Baltrusaitis
ee15ecbc46 More testing and prettier drawing on images (with anti-aliasing) 2016-07-31 13:11:14 -04:00
Tadas Baltrusaitis
808a189525 Fixing the project configurations to create consistently named executables. 2016-07-30 21:14:38 -04:00
Tadas Baltrusaitis
fdf9973c59 appveyor yml fix. 2016-07-30 16:19:56 -04:00
Tadas Baltrusaitis
818ec6463e Adding appveyor testing. 2016-07-30 16:17:45 -04:00
Tadas Baltrusaitis
63a9adf13b Small fixes to windows and linux/osx CIs. 2016-07-29 13:26:03 -04:00
Tadas Baltrusaitis
242ce8d130 Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows. 2016-07-29 13:04:25 -04:00