From 7f16788c7b17ff28b14d477516893584544d6ddb Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Mon, 25 Jun 2018 16:43:36 +0200
Subject: [PATCH] Removing another OpenBLAS include due to clashes with dlib

---
 lib/local/FaceAnalyser/src/Face_utils.cpp       |  3 ---
 lib/local/LandmarkDetector/include/stdafx.h     | 17 +++++++++++++++++
 .../LandmarkDetector/src/CCNF_patch_expert.cpp  | 12 ------------
 .../LandmarkDetector/src/CEN_patch_expert.cpp   | 12 ------------
 lib/local/LandmarkDetector/src/CNN_utils.cpp    |  2 --
 .../src/LandmarkDetectorModel.cpp               |  2 --
 lib/local/LandmarkDetector/src/PDM.cpp          |  2 --
 7 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/lib/local/FaceAnalyser/src/Face_utils.cpp b/lib/local/FaceAnalyser/src/Face_utils.cpp
index 77cee52a..00d899db 100644
--- a/lib/local/FaceAnalyser/src/Face_utils.cpp
+++ b/lib/local/FaceAnalyser/src/Face_utils.cpp
@@ -39,9 +39,6 @@
 #include <opencv2/imgproc.hpp>
 #include <opencv2/calib3d.hpp>
 
-// OpenBLAS
-#include <f77blas.h>
-
 // For FHOG visualisation
 #include <dlib/opencv.h>
 #include <dlib/image_processing/frontal_face_detector.h>
diff --git a/lib/local/LandmarkDetector/include/stdafx.h b/lib/local/LandmarkDetector/include/stdafx.h
index 120a80e2..8b29a107 100644
--- a/lib/local/LandmarkDetector/include/stdafx.h
+++ b/lib/local/LandmarkDetector/include/stdafx.h
@@ -44,4 +44,21 @@
 #include <filesystem.hpp>
 #include <filesystem/fstream.hpp>
 
+// OpenBLAS stuff
+
+#include <openblas_config.h>
+// Instead of including cblas.h and f77blas.h (the definitions from OpenBLAS and other BLAS libraries differ, declare the required OpenBLAS functionality here)
+#ifdef __cplusplus
+extern "C" {
+	/* Assume C declarations for C++ */
+#endif  /* __cplusplus */
+
+	/*Set the number of threads on runtime.*/
+	void openblas_set_num_threads(int num_threads);
+
+	void sgemm_(char *, char *, blasint *, blasint *, blasint *, float *,
+		float  *, blasint *, float  *, blasint *, float  *, float  *, blasint *);
+}
+
+
 #endif
diff --git a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp
index 354011eb..373b4df6 100644
--- a/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp
+++ b/lib/local/LandmarkDetector/src/CCNF_patch_expert.cpp
@@ -43,18 +43,6 @@
 // Local includes
 #include "LandmarkDetectorUtils.h"
 
-#include <f77blas.h>
-
-// Instead of including cblas.h (the definitions from OpenBLAS and other BLAS libraries differ, declare the required OpenBLAS functionality here)
-#ifdef __cplusplus
-extern "C" {
-	/* Assume C declarations for C++ */
-#endif  /* __cplusplus */
-
-	/*Set the number of threads on runtime.*/
-	void openblas_set_num_threads(int num_threads);
-}
-
 using namespace LandmarkDetector;
 
 // Copy constructors of neuron and patch expert
diff --git a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp
index 329649d1..eeabfac7 100644
--- a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp
+++ b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp
@@ -46,18 +46,6 @@
 // For exponential
 #include <math.h> 
 
-#include <f77blas.h>
-
-// Instead of including cblas.h (the definitions from OpenBLAS and other BLAS libraries differ, declare the required OpenBLAS functionality here)
-#ifdef __cplusplus
-extern "C" {
-	/* Assume C declarations for C++ */
-#endif  /* __cplusplus */
-
-	/*Set the number of threads on runtime.*/
-	void openblas_set_num_threads(int num_threads);
-}
-
 using namespace LandmarkDetector;
 
 // Copy constructor	(do not perform a deep copy of data as it is very large, also there is no real need to stor the copies
diff --git a/lib/local/LandmarkDetector/src/CNN_utils.cpp b/lib/local/LandmarkDetector/src/CNN_utils.cpp
index 02782706..038fe3fa 100644
--- a/lib/local/LandmarkDetector/src/CNN_utils.cpp
+++ b/lib/local/LandmarkDetector/src/CNN_utils.cpp
@@ -35,8 +35,6 @@
 
 #include "CNN_utils.h"
 
-#include <f77blas.h>
-
 using namespace std;
 
 namespace LandmarkDetector
diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp
index 29cd2a72..555edde4 100644
--- a/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp
+++ b/lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp
@@ -47,8 +47,6 @@
 #include <LandmarkDetectorUtils.h>
 #include <RotationHelpers.h>
 
-#include <f77blas.h>
-
 using namespace LandmarkDetector;
 
 //=============================================================================
diff --git a/lib/local/LandmarkDetector/src/PDM.cpp b/lib/local/LandmarkDetector/src/PDM.cpp
index 3ba2b701..ce4e953f 100644
--- a/lib/local/LandmarkDetector/src/PDM.cpp
+++ b/lib/local/LandmarkDetector/src/PDM.cpp
@@ -51,8 +51,6 @@
 
 #include <LandmarkDetectorUtils.h>
 
-#include <f77blas.h>
-
 using namespace LandmarkDetector;
 //===========================================================================