Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated OpenFaceConfig.cmake #730

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Updated OpenFaceConfig.cmake #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4bbb7f
Fixed OpenFaceConfig.cmake. Set_and_check doesn't give false error an…
marynelv Jun 30, 2019
8a5d8b3
Update OpenFaceConfig.cmake.in
marynelv Jun 30, 2019
1c5a1a2
Updated dependencies versions.
marynelv Jun 30, 2019
b71ffca
added setters to FaceAnalyserParameters
marynelv Jul 4, 2019
76d627c
Updated name in readme
marynelv Jul 9, 2019
a749a7a
Updated name in readme
marynelv Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions cmake/OpenFaceConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@

include(CMakeFindDependencyMacro)

find_dependency(dlib 18.18)
find_dependency(OpenCV 3.3)
find_dependency(dlib 19.13)
find_dependency(OpenCV 3.4)
find_dependency(Boost)
find_dependency(BLAS)
find_dependency(TBB)

include("${CMAKE_CURRENT_LIST_DIR}/OpenFaceTargets.cmake")

set_and_check(OpenFace_INCLUDE_DIRS "@PACKAGE_OPENFACE_INCLUDE_DIRS@;
${dlib_INCLUDE_DIRS};
${Boost_INCLUDE_DIRS};
${Boost_INCLUDE_DIRS}/boost;")
set_and_check(OpenFace_INCLUDE_DIRS ${PACKAGE_PREFIX_DIR}/include/OpenFace)
list(APPEND OpenFace_INCLUDE_DIRS ${dlib_INCLUDE_DIRS})
list(APPEND OpenFace_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
list(APPEND OpenFace_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}/boost)

set(OpenFace_LIBRARIES @OpenFace_LIBRARIES@)
10 changes: 6 additions & 4 deletions lib/local/FaceAnalyser/include/FaceAnalyserParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
// reports and manuals, must cite at least one of the following works:
//
// OpenFace 2.0: Facial Behavior Analysis Toolkit
// Tadas Baltru�aitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency
// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency
// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018
//
// Convolutional experts constrained local model for facial landmark detection.
// A. Zadeh, T. Baltru�aitis, and Louis-Philippe Morency,
// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency,
// in Computer Vision and Pattern Recognition Workshops, 2017.
//
// Rendering of Eyes for Eye-Shape Registration and Gaze Estimation
// Erroll Wood, Tadas Baltru�aitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling
// Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling
// in IEEE International. Conference on Computer Vision (ICCV), 2015
//
// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection
// Tadas Baltru�aitis, Marwa Mahmoud, and Peter Robinson
// Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson
// in Facial Expression Recognition and Analysis Challenge,
// IEEE International Conference on Automatic Face and Gesture Recognition, 2015
marynelv marked this conversation as resolved.
Show resolved Hide resolved
//
Expand Down Expand Up @@ -65,6 +65,8 @@ struct FaceAnalyserParameters

// Use getters and setters for these as they might need to reload models and make sure the scale and size ratio makes sense
void setAlignedOutput(int output_size, double scale=-1, bool masked = true);
// Set the model location
void setModelLoc(const string& location);
// This will also change the model location
void OptimizeForVideos();
void OptimizeForImages();
Expand Down
12 changes: 8 additions & 4 deletions lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
// reports and manuals, must cite at least one of the following works:
//
// OpenFace 2.0: Facial Behavior Analysis Toolkit
// Tadas Baltru�aitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency
// Tadas Baltrušaitis, Amir Zadeh, Yao Chong Lim, and Louis-Philippe Morency
// in IEEE International Conference on Automatic Face and Gesture Recognition, 2018
//
// Convolutional experts constrained local model for facial landmark detection.
// A. Zadeh, T. Baltru�aitis, and Louis-Philippe Morency,
// A. Zadeh, T. Baltrušaitis, and Louis-Philippe Morency,
// in Computer Vision and Pattern Recognition Workshops, 2017.
//
// Rendering of Eyes for Eye-Shape Registration and Gaze Estimation
// Erroll Wood, Tadas Baltru�aitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling
// Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling
// in IEEE International. Conference on Computer Vision (ICCV), 2015
//
// Cross-dataset learning and person-specific normalisation for automatic Action Unit detection
// Tadas Baltru�aitis, Marwa Mahmoud, and Peter Robinson
// Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson
// in Facial Expression Recognition and Analysis Challenge,
// IEEE International Conference on Automatic Face and Gesture Recognition, 2015
//
Expand Down Expand Up @@ -266,3 +266,7 @@ void FaceAnalyserParameters::OptimizeForImages()
}
}

void FaceAnalyserParameters::setModelLoc(const string& location)
{
this->model_location = location;
}