Commit Graph

759 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
fece4572f0 Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop 2019-07-11 21:30:04 +01:00
Tadas Baltrusaitis
de43686842 New model results and packaging. 2019-07-11 21:27:32 +01:00
Tadas Baltrusaitis
ccd018ae65 Changing how filesystem includes are handled to support systems that have boost installed. (#738) 2019-07-08 17:09:21 +01:00
Mike McDermott
b802889ef0 - Use staged container builds to improve caching and reduce size (#727)
* - Use staged container builds to improve caching and reduce size
- Image size reduced from 8 GB to 1.6ish
- Switched from Make to Ninja for faster builds that do not hog processor
- Removed unneded dependencies
- Added to .dockerignore
- Readme for docker stuff

- Staged Builds
    - Docker's overlay FS means that `rm`ing files does not reduce size
    - Once build artifacts are build, the build dependencies are no longer needed
    - Both of these can be solved by building in a temporary image and copying
    only the needed libraries in
    - Leverages DESTDIR to generate a directory structure that can be just
    copied onto the `/` of the filesystem
    - Similarly, the data files (like models) can be downloaded ahead of time
    into their own image and copied in. This saves on network IO.
    - Anything in a RUN directive that is non-deterministic (e.g. downloading
    a file from a link, the content of that link changes) does not cause a cache
    miss, so if you need to update something RUN uses, either modify the
    dockerfile or build with `--no-cache` to force a rebuild
- Switch to Ninja
    - cmake can generate many types of build systems
    - Ninja builds faster than GNU Make
    - `make -j` has a tendency to lock up my system when building locally
    - Do not need to tell ninja how many jobs to run
- .dockerignore
    - Paths in .dockerignore are basically invisible to dockerd, so when dockerd
    zips up the build context, all of the cruft can be ignored
    - it is beneficial to docker build speed to add any large, unnecssary files
    and directories to .dockerignore.
    - Just remember they cannot be seen by dockerd

* removing cruft and some format fixes

* updated dockerfile to opencv 4.1.0
2019-07-04 08:13:48 +01:00
Tadas Baltrusaitis
397a58d2e8 Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop 2019-07-03 20:54:57 +01:00
Tadas Baltrusaitis
c71c8d4d78 Changing OpenCV library source (for some reason dropbox is not linking directly to the x64 dll's) 2019-07-03 20:54:26 +01:00
Tadas Baltrusaitis
264b84e005 Feature/install script fixes (#735)
Updating ./install.sh by removing old dependencies and making sure it works on fresh installs of Ubuntu 16.04 and Ubuntu 18.04
2019-07-03 07:53:46 +01:00
Tadas Baltrusaitis
5f1f91b4ad Simplifying the update script. 2019-06-29 21:45:50 +01:00
Sarfaraz Ghulam Iraqui
dc44e0f433 add missing header (#724)
Missing header in cmake.
2019-06-18 07:52:01 +01:00
Tadas Baltrusaitis
5c4f1fe9c5 Updates to travis and install scripts. 2019-06-14 17:00:47 +01:00
Tadas Baltrusaitis
d815fe6357 Changes for GCC with OSX. 2019-06-13 07:57:35 +01:00
Tadas Baltrusaitis
6fa6623e1c Fixing overlap detection in FaceLandmarkVidMulti:
- correct intersection over union
- added overlap detection after all models are tracked
2019-06-05 17:35:29 +01:00
Tadas Baltrusaitis
d0964565b3 Results. 2019-05-29 22:36:28 +01:00
Tadas Baltrusaitis
d37ec688ed Fixing output image bug, when processing data through the GUI. 2019-05-29 17:49:32 +01:00
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
330383fef7 Adding support for converting Bitmap to RawImage that can be passed to OpenFace in C# (#697) 2019-05-12 15:20:15 +01:00
Ömer Faruk Karakaya
82cd66ca2c Updated Dockerfile (#692)
* Updated Dockerfile 

The current one seems outdated, which has no dlib and no cmake 3.2 support

* Removing unnecessary installs
2019-05-08 20:34:50 +01:00
Tadas Baltrusaitis
09b6e51184 Merge branch 'feature/VS2017_changes' into develop 2019-01-19 14:27:28 +00:00
Tadas Baltrusaitis
adc4caf034 Better support for VS2015 and VS2017 projects
Adding appveyor for 2017
2019-01-16 15:22:32 +00:00
Tadas Baltrusaitis
caaefae7d3 Develop (#619)
* Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing.

* Fixing the screenshot functionality.

* Feature/code cleanup (#573)

* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion

* Adding Visual Studio 2017 solution

* Feature/code cleanup (#580)

- name of revision
- better scripts for model download (not only in Dropbox also OneDrive)

* Update the OpenCV constants to the corresponding ones in cpp namespace. (#578)

Updating OpenCV macros.

* Slight change in packaging code (use a shared download script).

* Removing TBB dependency (#590)

Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_

* Updating OpenBLAS (#594)

Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)

* Ability to specify output image formats and removing unused quiet parameter.

* Update Windows download script (#608) (#610)

- Automatically choose correct path to the model files so that it works for both, source code compilation and binary use
- Use absolute paths in the system exists methods

* Updating version.

* Packaging code update.
OpenFace_2.1.0
2018-11-29 19:49:47 +00:00
Tadas Baltrusaitis
d38ede2e35 Packaging code update. 2018-11-29 19:46:59 +00:00
Tadas Baltrusaitis
85c1f3dbf4 Updating version. 2018-11-28 20:43:59 +00:00
Tadas Baltrusaitis
ae1a8d038f Merging with master. 2018-11-28 20:42:18 +00:00
Jan S
c179c1a790 Update Windows download script (#608) (#610)
- Automatically choose correct path to the model files so that it works for both, source code compilation and binary use
- Use absolute paths in the system exists methods
2018-11-19 06:44:06 +00:00
Tadas Baltrusaitis
126b34f181 Ability to specify output image formats and removing unused quiet parameter. 2018-11-04 13:10:28 +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
OpenFace_2.0.6
2018-10-06 21:13:18 +01:00
Tadas Baltrusaitis
40af2cb623 Merge branch 'master' into develop 2018-10-06 12:21:18 +01:00
Tadas Baltrusaitis
10c9ae2d4d Slight change in packaging code (use a shared download script). 2018-10-06 12:18:37 +01:00
Yudong Tao
9c2e5d6cba Update the OpenCV constants to the corresponding ones in cpp namespace. (#578)
Updating OpenCV macros.
2018-10-05 16:53:06 +01:00
Tadas Baltrusaitis
aa6af6f1f2 Feature/code cleanup (#580)
- name of revision
- better scripts for model download (not only in Dropbox also OneDrive)
2018-10-03 19:53:32 +01:00
Tadas Baltrusaitis
a2d0fee1bd Adding Visual Studio 2017 solution 2018-09-25 07:57:57 +01:00
Tadas Baltrusaitis
a274365998 Feature/code cleanup (#573)
* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion
2018-09-24 08:10:09 +01:00
Tadas Baltrusaitis
795c707314 Update README.md 2018-09-24 08:03:55 +01:00
Tadas Baltrusaitis
e3545343ca Fixing the screenshot functionality. 2018-09-18 19:51:37 +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
118a6b320e Update issue templates
Bug report template
2018-08-29 08:34:06 +03:00
Tadas Baltrusaitis
6aed4e5e19 Fixing issue with -bboxdir searching in the wrong location. OpenFace_2.0.5 2018-08-20 19:44:11 +01:00
Tadas Baltrusaitis
44f35af28b Merge remote-tracking branch 'origin/feature/avx-fixes' into develop 2018-08-20 15:34:11 +01:00
Tadas Baltrusaitis
2e56628ec7 - Do not use AVX instructions by default, switch all project settings to SSE2
- Removing .user project settings which should not be tracked
2018-08-20 08:16:44 +01:00
Tadas Baltrusaitis
0bfc42544b Not calling waitKey if no output is shown. 2018-08-20 08:08:50 +01:00
Tadas Baltrusaitis
b058d54fc3 Merge remote-tracking branch 'origin/feature/travis_fixes' into develop 2018-08-10 17:07:55 +01:00
Bernhard
674d0743f8 fixed double/float mismatch 2018-08-10 17:06:03 +01:00
Tadas Baltrusaitis
212601f366 Do not install boost on OS X travis as it is already there 2018-08-03 21:16:01 +01:00
Tadas Baltrusaitis
791a33bdb0 Merge branch 'master' into develop 2018-08-03 20:44:38 +01:00
Tadas Baltrusaitis
3e5fa5cc71 Better memory management of images between C++ and C#, fixed the OpenFaceDemo crash. 2018-08-03 11:06:40 +01:00
Tadas Baltrusaitis
65b2b7c7aa Making sure visualization image is set even when no face is detected. 2018-08-03 10:20:56 +01:00
Amir Zadeh
a11ca5b503 Update readme.txt 2018-07-30 15:14:10 -04:00
Amir Zadeh
bfe932235b Update readme.txt 2018-07-30 15:11:58 -04:00