ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-17 04:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/opencv4 (#706)

Browse Source 
* 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.
This commit is contained in:
Tadas Baltrusaitis
2019-05-28 19:49:17 +01:00
committed by GitHub
parent 330383fef7
commit 9147dfe2f3
2762 changed files with 37401 additions and 353002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h
View File

@@ -44,8 +44,6 @@
// Local includes
#include "PAW.h"
using namespace std;
namespace LandmarkDetector
{
//===========================================================================
@@ -60,31 +58,31 @@ class DetectionValidator
public:
// The orientations of each of the landmark detection validator
vector<cv::Vec3d> orientations;
std::vector<cv::Vec3d> orientations;
// Piecewise affine warps to the reference shape (per orientation)
vector<PAW> paws;
std::vector<PAW> paws;
//==========================================
// Convolutional Neural Network
// CNN layers for each view
// view -> layer
vector<vector<vector<vector<cv::Mat_<float> > > > > cnn_convolutional_layers;
vector<vector<cv::Mat_<float> > > cnn_convolutional_layers_weights;
vector<vector<cv::Mat_<float> > > cnn_convolutional_layers_im2col_precomp;
std::vector<std::vector<std::vector<std::vector<cv::Mat_<float> > > > > cnn_convolutional_layers;
std::vector<std::vector<cv::Mat_<float> > > cnn_convolutional_layers_weights;
std::vector<std::vector<cv::Mat_<float> > > cnn_convolutional_layers_im2col_precomp;
vector< vector<int> > cnn_subsampling_layers;
vector< vector<cv::Mat_<float> > > cnn_fully_connected_layers_weights;
vector< vector<cv::Mat_<float> > > cnn_fully_connected_layers_biases;
std::vector< std::vector<int> > cnn_subsampling_layers;
std::vector< std::vector<cv::Mat_<float> > > cnn_fully_connected_layers_weights;
std::vector< std::vector<cv::Mat_<float> > > cnn_fully_connected_layers_biases;
// NEW CNN: 0 - convolutional, 1 - max pooling (2x2 stride 2), 2 - fully connected, 3 - relu, 4 - sigmoid
vector<vector<int> > cnn_layer_types;
std::vector<std::vector<int> > cnn_layer_types;
//==========================================
// Normalisation for face validation
vector<cv::Mat_<float> > mean_images;
vector<cv::Mat_<float> > standard_deviations;
std::vector<cv::Mat_<float> > mean_images;
std::vector<cv::Mat_<float> > standard_deviations;
// Default constructor
DetectionValidator(){;}
@@ -96,7 +94,7 @@ public:
float Check(const cv::Vec3d& orientation, const cv::Mat_<uchar>& intensity_img, cv::Mat_<float>& detected_landmarks);
// Reading in the model
void Read(string location);
void Read(std::string location);
// Getting the closest view center based on orientation
int GetViewId(const cv::Vec3d& orientation) const;