Another attempt at OS X and blas/dlib fix.

This commit is contained in:
Tadas Baltrusaitis
2018-05-08 19:44:34 +01:00
parent 536d96e29a
commit 67ad47912d
7 changed files with 28 additions and 4 deletions

View File

@@ -33,6 +33,11 @@
///////////////////////////////////////////////////////////////////////////////
// FaceLandmarkImg.cpp : Defines the entry point for the console application for detecting landmarks in images.
// OpenBLAS
#include <cblas.h>
#include <f77blas.h>
// dlib
#include <dlib/image_processing/frontal_face_detector.h>
#include "LandmarkCoreIncludes.h"

View File

@@ -39,6 +39,10 @@
#include <opencv2/imgproc.hpp>
#include <opencv2/calib3d.hpp>
// OpenBLAS
#include <cblas.h>
#include <f77blas.h>
// For FHOG visualisation
#include <dlib/opencv.h>
#include <dlib/image_processing/frontal_face_detector.h>

View File

@@ -39,6 +39,10 @@
#include <opencv2/core/core.hpp>
#include <opencv2/objdetect.hpp>
// OpenBLAS
#include <cblas.h>
#include <f77blas.h>
// dlib dependencies for face detection
#include <dlib/image_processing/frontal_face_detector.h>
#include <dlib/opencv.h>

View File

@@ -23,14 +23,14 @@
#include <opencv2/imgcodecs.hpp>
#include <opencv2/highgui/highgui.hpp>
// dlib dependencies for face detection
#include <dlib/image_processing/frontal_face_detector.h>
#include <dlib/opencv.h>
// OpenBLAS
#include <cblas.h>
#include <f77blas.h>
// dlib dependencies for face detection
#include <dlib/image_processing/frontal_face_detector.h>
#include <dlib/opencv.h>
// C++ stuff
#include <stdio.h>

View File

@@ -1,5 +1,8 @@
include_directories(${BOOST_INCLUDE_DIR})
#OpenBlas library
include_directories(../../3rdParty/OpenBLAS/include)
SET(SOURCE
src/ImageCapture.cpp
src/RecorderCSV.cpp

View File

@@ -63,6 +63,7 @@
<Import Project="..\..\3rdParty\dlib\dlib.props" />
<Import Project="..\..\3rdParty\tbb\tbb_d.props" />
<Import Project="..\..\3rdParty\OpenCV3.4\openCV3.4.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -70,6 +71,7 @@
<Import Project="..\..\3rdParty\dlib\dlib.props" />
<Import Project="..\..\3rdParty\tbb\tbb.props" />
<Import Project="..\..\3rdParty\OpenCV3.4\openCV3.4.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -77,6 +79,7 @@
<Import Project="..\..\3rdParty\dlib\dlib.props" />
<Import Project="..\..\3rdParty\tbb\tbb_d.props" />
<Import Project="..\..\3rdParty\OpenCV3.4\openCV3.4.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -84,6 +87,7 @@
<Import Project="..\..\3rdParty\dlib\dlib.props" />
<Import Project="..\..\3rdParty\tbb\tbb.props" />
<Import Project="..\..\3rdParty\OpenCV3.4\openCV3.4.props" />
<Import Project="..\..\3rdParty\OpenBLAS\OpenBLAS.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />

View File

@@ -34,6 +34,10 @@
#include "VisualizationUtils.h"
#include "RotationHelpers.h"
// OpenBLAS
#include <cblas.h>
#include <f77blas.h>
// For FHOG visualisation
#include <dlib/opencv.h>
#include <dlib/image_processing/frontal_face_detector.h>