From 85c603a85c077c712b026f5eabead62b0dcd9600 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 12 Jun 2017 20:32:59 -0400 Subject: [PATCH] OpenBLAS fix attempt. --- exe/FaceLandmarkVid/FaceLandmarkVid.cpp | 2 -- exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp | 1 - exe/FeatureExtraction/FeatureExtraction.cpp | 2 -- lib/local/LandmarkDetector/src/CEN_patch_expert.cpp | 8 ++++++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp index a60826ae..056bfd4e 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.cpp +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.cpp @@ -182,8 +182,6 @@ void visualise_tracking(cv::Mat& captured_image, cv::Mat_& depth_image, c int main (int argc, char **argv) { - openblas_set_num_threads(1); - vector arguments = get_arguments(argc, argv); // Some initial parameters that can be overriden from command line diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp index dac2b594..47889790 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp @@ -129,7 +129,6 @@ void NonOverlapingDetections(const vector& clnf_models, int main (int argc, char **argv) { - openblas_set_num_threads(1); vector arguments = get_arguments(argc, argv); diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp index 53343409..ca1901c6 100644 --- a/exe/FeatureExtraction/FeatureExtraction.cpp +++ b/exe/FeatureExtraction/FeatureExtraction.cpp @@ -246,8 +246,6 @@ void post_process_output_file(FaceAnalysis::FaceAnalyser& face_analyser, string int main (int argc, char **argv) { - openblas_set_num_threads(1); - vector arguments = get_arguments(argc, argv); // Search paths diff --git a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp index 031298ca..8085285c 100644 --- a/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp +++ b/lib/local/LandmarkDetector/src/CEN_patch_expert.cpp @@ -90,6 +90,14 @@ CEN_patch_expert::CEN_patch_expert(const CEN_patch_expert& other) : confidence(o void CEN_patch_expert::Read(ifstream &stream) { + // Setting up OpenBLAS + #if OS_UNIX + + #else + openblas_set_num_threads(1); + #endif + + // Sanity check int read_type;