- A better way to link to OpenBLAS (using pre-compiled binaries), this leads to faster computation on Windows

- Demo script fixes

lib/3rdParty/OpenBLAS/OpenBLAS.props

@@ -8,15 +8,15 @@
       <AdditionalIncludeDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName)\$(PlatformToolset);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libopenblas.lib;libopenblas.exp;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libopenblas.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>
       </Command>
     </PreBuildEvent>
     <PreLinkEvent>
-      <Command>xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)\$(PlatformToolset)\libopenblas.dll" "$(OutDir)"</Command>
+      <Command>xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)" "$(OutDir)"</Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemGroup />

matlab_runners/Demos/run_demo_images.m

@@ -21,10 +21,13 @@ verbose = true;
 %model = 'model/main_clm_wild.txt';
 
 % Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_dclm_general.txt';
+%model = 'model/main_clnf_general.txt';
 % Trained on in-the-wild
 %model = 'model/main_clnf_wild.txt';
 
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
 command = executable;
 
 command = cat(2, command, [' -fdir "' in_dir '"']);

matlab_runners/Demos/run_demo_video_multi.m

@@ -22,10 +22,13 @@ verbose = true;
 %model = 'model/main_clm_wild.txt';
 
 % Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_clnf_general.txt';
+% model = 'model/main_clnf_general.txt';
 % Trained on in-the-wild
 %model = 'model/main_clnf_wild.txt';
 
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
 command = executable;
 command = cat(2, command, [' -mloc "', model, '"']);
 % add all videos to single argument list (so as not to load the model anew

matlab_runners/Demos/run_demo_videos.m

@@ -23,10 +23,13 @@ verbose = true;
 %model = 'model/main_clm_wild.txt';
 
 % Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_dclm_general.txt';
+% model = 'model/main_clnf_general.txt';
 % Trained on in-the-wild
 %model = 'model/main_clnf_wild.txt';
 
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
 command = executable;
 command = cat(2, command, [' -mloc "', model, '"']);
 % add all videos to single argument list (so as not to load the model anew