Develop (TadasBaltrusaitis#619)

* Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing. * Fixing the screenshot functionality. * Feature/code cleanup (TadasBaltrusaitis#573) * Header guard cleanup (making sure naming is compliant with C++ standards and consistent). * Removing un-needed nullptr checks. * Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag) * Reverting Mat deletion * Adding Visual Studio 2017 solution * Feature/code cleanup (TadasBaltrusaitis#580) - name of revision - better scripts for model download (not only in Dropbox also OneDrive) * Update the OpenCV constants to the corresponding ones in cpp namespace. (TadasBaltrusaitis#578) Updating OpenCV macros. * Slight change in packaging code (use a shared download script). * Removing TBB dependency (TadasBaltrusaitis#590) Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_ * Updating OpenBLAS (TadasBaltrusaitis#594) Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines) * Ability to specify output image formats and removing unused quiet parameter. * Update Windows download script (TadasBaltrusaitis#608) (TadasBaltrusaitis#610) - Automatically choose correct path to the model files so that it works for both, source code compilation and binary use - Use absolute paths in the system exists methods * Updating version. * Packaging code update.
ratgen · Nov 29, 2018 · 65c8f0b · 65c8f0b
1 parent c0df9ab
commit 65c8f0b
Show file tree

Hide file tree

Showing 195 changed files with 383 additions and 45,833 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ branches:
   only:
     - master
     - develop
-    - feature/code_cleanup
 compiler:
   - gcc
 
@@ -46,7 +45,7 @@ before_install:
   - if [ "$CXX" = "g++" ]; then
       if [ ${TRAVIS_OS_NAME} = linux ]; then
         $CXX --version;
-        sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
+        sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D WITH_TBB=ON -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
         sudo make -j4;
         sudo make install;
         cd ../..;

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,25 +48,6 @@ else()
     MESSAGE(FATAL_ERROR "Boost not found in the system.")
 endif()
 
-# Try finding TBB in default location
-find_package( TBB CONFIG )
-
-# If not found, use FindTBB.cmake
-if ("${TBB_LIBRARIES}" STREQUAL "")
-	MESSAGE("TBB not found in CONFIG, searching with FindTBB.cmake.") 
-    find_package( TBB REQUIRED )
-	if ("${TBB_LIBRARIES}" STREQUAL "")
-		MESSAGE(FATAL_ERROR "TBB not found")
-	endif()
-else()
-	MESSAGE("TBB found in CONFIG: ${TBB_LIBRARIES}") 
-endif()
-
-MESSAGE("TBB information:")
-MESSAGE("  TBB_VERSION: ${TBB_VERSION}")
-MESSAGE("  TBB_INCLUDE_DIRS: ${TBB_INCLUDE_DIRS}")
-MESSAGE("  TBB_LIBRARIES: ${TBB_LIBRARIES}")
-
 # Move LandmarkDetector model
 file(GLOB files "lib/local/LandmarkDetector/model/*.txt")
 foreach(file ${files})

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OpenFace 2.0.6: an open source facial behavior analysis toolkit
+# OpenFace 2.1.0: an open source facial behavior analysis toolkit
 
 [![Build Status](https://travis-ci.org/TadasBaltrusaitis/OpenFace.svg?branch=master)](https://travis-ci.org/TadasBaltrusaitis/OpenFace)
 [![Build status](https://ci.appveyor.com/api/projects/status/8msiklxfbhlnsmxp/branch/master?svg=true)](https://ci.appveyor.com/project/TadasBaltrusaitis/openface/branch/master)
@@ -100,6 +100,6 @@ I did my best to make sure that the code runs out of the box but there are alway
 
 Copyright can be found in the Copyright.txt
 
-You have to respect boost, TBB, dlib, OpenBLAS, and OpenCV licenses.
+You have to respect boost, dlib, OpenBLAS, and OpenCV licenses.
 
 Furthermore you have to respect the licenses of the datasets used for model training - https://github.com/TadasBaltrusaitis/OpenFace/wiki/Datasets
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,6 @@ branches:
   only:
   - develop
   - master
-  - feature/code_cleanup
 max_jobs: 4  
 configuration:
 - Release

diff --git a/download_models.ps1 b/download_models.ps1
@@ -1,61 +1,73 @@
-# Download the models from the cloud (stored in Dropbox, OneDrive, and Google Drive
+# Download the models from the cloud (stored in Dropbox, OneDrive, and Google Drive)
+
+# Determine correct path to the model files
+if([System.IO.Directory]::Exists( (Join-Path (Get-Location) 'lib') ))
+{
+    # If the lib folder exists, code is compiled from source
+    $modelPath = "lib/local/LandmarkDetector/"
+}
+else
+{
+    # Otherwise, binaries are used
+    $modelPath = ""
+}
 
 # Start with 0.25 scale models
-$destination = "lib/local/LandmarkDetector/model/patch_experts/cen_patches_0.25_of.dat"
+$destination = $modelPath + "model/patch_experts/cen_patches_0.25_of.dat"
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://www.dropbox.com/s/7na5qsjzz8yfoer/cen_patches_0.25_of.dat?dl=1"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://onedrive.live.com/download?cid=2E2ADA578BFF6E6E&resid=2E2ADA578BFF6E6E%2153072&authkey=AKqoZtcN0PSIZH4"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
 # 0.35 scale models
-$destination = "lib/local/LandmarkDetector/model/patch_experts/cen_patches_0.35_of.dat"
+$destination = $modelPath + "model/patch_experts/cen_patches_0.35_of.dat"
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://www.dropbox.com/s/k7bj804cyiu474t/cen_patches_0.35_of.dat?dl=1"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://onedrive.live.com/download?cid=2E2ADA578BFF6E6E&resid=2E2ADA578BFF6E6E%2153079&authkey=ANpDR1n3ckL_0gs"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
 
 # 0.5 scale models
-$destination = "lib/local/LandmarkDetector/model/patch_experts/cen_patches_0.50_of.dat"
+$destination = $modelPath + "model/patch_experts/cen_patches_0.50_of.dat"
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://www.dropbox.com/s/ixt4vkbmxgab1iu/cen_patches_0.50_of.dat?dl=1"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://onedrive.live.com/download?cid=2E2ADA578BFF6E6E&resid=2E2ADA578BFF6E6E%2153074&authkey=AGi-e30AfRc_zvs"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
 # 1.0 scale models
-$destination = "lib/local/LandmarkDetector/model/patch_experts/cen_patches_1.00_of.dat"
+$destination = $modelPath + "model/patch_experts/cen_patches_1.00_of.dat"
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://www.dropbox.com/s/2t5t1sdpshzfhpj/cen_patches_1.00_of.dat?dl=1"
 	Invoke-WebRequest $source -OutFile $destination
 }
 
-if(!([System.IO.File]::Exists($destination)))
+if(!([System.IO.File]::Exists( (Join-Path (Get-Location) $destination) )))
 {
 	$source = "https://onedrive.live.com/download?cid=2E2ADA578BFF6E6E&resid=2E2ADA578BFF6E6E%2153070&authkey=AD6KjtYipphwBPc"
 	Invoke-WebRequest $source -OutFile $destination

diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.cpp b/exe/FaceLandmarkImg/FaceLandmarkImg.cpp
@@ -38,8 +38,6 @@
 
 #include "LandmarkCoreIncludes.h"
 
-#include <tbb/tbb.h>
-
 #include <FaceAnalyser.h>
 #include <GazeEstimation.h>
 

diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj
@@ -59,33 +59,29 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.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" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj
@@ -59,33 +59,29 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.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" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
@@ -263,13 +263,11 @@ int main(int argc, char **argv)
 
 			}
 
-			// Keep only non overlapping detections (also convert to a concurrent vector
+			// Keep only non overlapping detections (so as not to start tracking where the face is already tracked)
 			NonOverlapingDetections(face_models, face_detections);
-
-			vector<tbb::atomic<bool> > face_detections_used(face_detections.size());
+			std::vector<bool> face_detections_used(face_detections.size(), false);
 
 			// Go through every model and update the tracking
-			//tbb::parallel_for(0, (int)face_models.size(), [&](int model) {
 			for (unsigned int model = 0; model < face_models.size(); ++model)
 			{
 
@@ -288,9 +286,10 @@ int main(int argc, char **argv)
 
 					for (size_t detection_ind = 0; detection_ind < face_detections.size(); ++detection_ind)
 					{
-						// if it was not taken by another tracker take it (if it is false swap it to true and enter detection, this makes it parallel safe)
-						if (face_detections_used[detection_ind].compare_and_swap(true, false) == false)
+						// if it was not taken by another tracker take it
+						if (!face_detections_used[detection_ind])
 						{
+							face_detections_used[detection_ind] = true;
 
 							// Reinitialise the model
 							face_models[model].Reset();
@@ -314,7 +313,6 @@ int main(int argc, char **argv)
 					detection_success = LandmarkDetector::DetectLandmarksInVideo(rgb_image, face_models[model], det_parameters[model], grayscale_image);
 				}
 			}
-			//});
 
 			// Keeping track of FPS
 			fps_tracker.AddFrame();

diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj
@@ -58,33 +58,29 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.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" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj b/exe/FeatureExtraction/FeatureExtraction.vcxproj
@@ -58,33 +58,29 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
     <Import Project="..\..\lib\3rdParty\boost\boost_d.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb_d.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.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" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\lib\3rdParty\boost\boost.props" />
     <Import Project="..\..\lib\3rdParty\dlib\dlib.props" />
-    <Import Project="..\..\lib\3rdParty\tbb\tbb.props" />
-    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS.props" />
     <Import Project="..\..\lib\3rdParty\OpenCV3.4\openCV3.4.props" />
+    <Import Project="..\..\lib\3rdParty\OpenBLAS\OpenBLAS_64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/exe/releases/package_windows_executables.m b/exe/releases/package_windows_executables.m
@@ -1,5 +1,5 @@
 clear;
-version = '2.0.6';
+version = '2.1.0';
 
 out_x86 = sprintf('OpenFace_%s_win_x86', version);
 out_x64 = sprintf('OpenFace_%s_win_x64', version);

diff --git a/lib/3rdParty/OpenBLAS/OpenBLAS_64.props b/lib/3rdParty/OpenBLAS/OpenBLAS_64.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>openblas.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PreBuildEvent />
+    <PreLinkEvent>
+      <Command>xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)" "$(OutDir)"</Command>
+    </PreLinkEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/lib/3rdParty/OpenBLAS/OpenBLAS.props → lib/3rdParty/OpenBLAS/OpenBLAS_x86.props b/lib/3rdParty/OpenBLAS/OpenBLAS.props → lib/3rdParty/OpenBLAS/OpenBLAS_x86.props
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/flang.dll b/lib/3rdParty/OpenBLAS/bin/x64/flang.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/flangrti.dll b/lib/3rdParty/OpenBLAS/bin/x64/flangrti.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libgcc_s_seh-1.dll b/lib/3rdParty/OpenBLAS/bin/x64/libgcc_s_seh-1.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libgfortran-3.dll b/lib/3rdParty/OpenBLAS/bin/x64/libgfortran-3.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libomp.dll b/lib/3rdParty/OpenBLAS/bin/x64/libomp.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libopenblas.dll b/lib/3rdParty/OpenBLAS/bin/x64/libopenblas.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libquadmath-0.dll b/lib/3rdParty/OpenBLAS/bin/x64/libquadmath-0.dll
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/openblas.dll b/lib/3rdParty/OpenBLAS/bin/x64/openblas.dll
diff --git a/lib/3rdParty/OpenBLAS/lib/x64/libopenblas.dll.a b/lib/3rdParty/OpenBLAS/lib/x64/libopenblas.dll.a
diff --git a/lib/3rdParty/OpenBLAS/lib/x64/openblas.lib b/lib/3rdParty/OpenBLAS/lib/x64/openblas.lib
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ branches: @@
       only:
       - develop
       - master
-      - feature/code_cleanup
     max_jobs: 4
     configuration:
     - Release
@@ Expand Down @@