From 2e56628ec75de9ca8a869d009a2e4c878f117f34 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 20 Aug 2018 08:16:44 +0100 Subject: [PATCH] - Do not use AVX instructions by default, switch all project settings to SSE2 - Removing .user project settings which should not be tracked --- .gitignore | 1 + exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj | 6 ++--- exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj | 6 ++--- .../FaceLandmarkVid.vcxproj.user | 22 ------------------- .../FaceLandmarkVidMulti.vcxproj | 6 ++--- .../FeatureExtraction.vcxproj | 6 ++--- .../FeatureExtraction.vcxproj.user | 21 ------------------ .../CameraEnumerator/CameraEnumerator.vcxproj | 6 +++-- lib/local/CppInerop/CppInerop.vcxproj | 6 +++-- lib/local/FaceAnalyser/FaceAnalyser.vcxproj | 6 ++--- lib/local/GazeAnalyser/GazeAnalyser.vcxproj | 6 ++--- .../LandmarkDetector/LandmarkDetector.vcxproj | 6 ++--- lib/local/Utilities/Utilities.vcxproj | 6 +++-- 13 files changed, 34 insertions(+), 70 deletions(-) delete mode 100644 exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user delete mode 100644 exe/FeatureExtraction/FeatureExtraction.vcxproj.user diff --git a/.gitignore b/.gitignore index cc6caadfd..bdef7f667 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ matlab_runners/Action Unit Experiments/AU_predictions/ lib/local/Utilities/Debug/ lib/3rdParty/CameraEnumerator/Debug/ lib/local/CppInerop/Debug/ +*.user diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj index 4b0616468..b2fad9e49 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj @@ -128,7 +128,7 @@ Disabled WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 true @@ -147,7 +147,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions + StreamingSIMDExtensions2 true Speed @@ -169,7 +169,7 @@ WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions + StreamingSIMDExtensions2 true Speed diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj index 7bdab285f..61e1f9dac 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj @@ -130,7 +130,7 @@ WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions + StreamingSIMDExtensions2 true @@ -150,7 +150,7 @@ $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 true @@ -172,7 +172,7 @@ $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 true diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user deleted file mode 100644 index b6d807088..000000000 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj.user +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - WindowsLocalDebugger - - - - - WindowsLocalDebugger - - - - - WindowsLocalDebugger - - - -device 0 - WindowsLocalDebugger - - \ No newline at end of file diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj index 91dfa4803..5ce060030 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj @@ -118,7 +118,7 @@ Level3 Disabled $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 true @@ -133,7 +133,7 @@ true $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 MultiThreadedDLL true Speed @@ -152,7 +152,7 @@ true $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 MultiThreadedDLL true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj b/exe/FeatureExtraction/FeatureExtraction.vcxproj index 78f95ce13..05dc16354 100644 --- a/exe/FeatureExtraction/FeatureExtraction.vcxproj +++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj @@ -129,7 +129,7 @@ WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false - AdvancedVectorExtensions + StreamingSIMDExtensions2 true @@ -149,7 +149,7 @@ $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 MultiThreadedDLL true @@ -172,7 +172,7 @@ $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 MultiThreadedDLL true diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj.user b/exe/FeatureExtraction/FeatureExtraction.vcxproj.user deleted file mode 100644 index 93501d64c..000000000 --- a/exe/FeatureExtraction/FeatureExtraction.vcxproj.user +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - WindowsLocalDebugger - - - - - WindowsLocalDebugger - - - -f ../../samples/default.wmv - WindowsLocalDebugger - - - -f ../../samples/default.wmv -verbose - WindowsLocalDebugger - - \ No newline at end of file diff --git a/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj b/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj index 72134410f..d2166a8d9 100644 --- a/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj +++ b/lib/3rdParty/CameraEnumerator/CameraEnumerator.vcxproj @@ -77,6 +77,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + StreamingSIMDExtensions2 Windows @@ -89,6 +90,7 @@ Level3 Disabled _DEBUG;_LIB;%(PreprocessorDefinitions) + StreamingSIMDExtensions2 Windows @@ -104,7 +106,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows @@ -122,7 +124,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows diff --git a/lib/local/CppInerop/CppInerop.vcxproj b/lib/local/CppInerop/CppInerop.vcxproj index 8679dd33a..4cf8377a4 100644 --- a/lib/local/CppInerop/CppInerop.vcxproj +++ b/lib/local/CppInerop/CppInerop.vcxproj @@ -113,6 +113,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) + StreamingSIMDExtensions2 Windows @@ -127,6 +128,7 @@ Disabled _DEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) + StreamingSIMDExtensions2 Windows @@ -145,7 +147,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows @@ -166,7 +168,7 @@ NDEBUG;_WINDOWS;_USRDLL;CPPINEROP_EXPORTS;%(PreprocessorDefinitions) ./;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\FaceAnalyser\include;$(SolutionDir)lib\local\GazeAnalyser\include;$(SolutionDir)lib\local\Utilities\include;$(SolutionDir)lib\3rdParty\CameraEnumerator;%(AdditionalIncludeDirectories) Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows diff --git a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj index 16e59f162..cab72e828 100644 --- a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj +++ b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj @@ -118,7 +118,7 @@ Disabled false ./include;$(SolutionDir)lib/local/Utilities/include;$(SolutionDir)lib/local/LandmarkDetector/include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 true WIN64;_DEBUG;_LIB;EIGEN_MPL2_ONLY;%(PreprocessorDefinitions) @@ -141,7 +141,7 @@ ./include;$(SolutionDir)lib/local/Utilities/include;$(SolutionDir)lib/local/LandmarkDetector/include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 true Speed @@ -167,7 +167,7 @@ ./include;$(SolutionDir)lib/local/Utilities/include;$(SolutionDir)lib/local/LandmarkDetector/include;%(AdditionalIncludeDirectories) - AdvancedVectorExtensions + StreamingSIMDExtensions2 true WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed diff --git a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj index f7e2281d7..affec1d4a 100644 --- a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj +++ b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj @@ -106,7 +106,7 @@ true ./include;../LandmarkDetector/include;../Utilities/include;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_LIB;EIGEN_MPL2_ONLY;%(PreprocessorDefinitions) - AdvancedVectorExtensions + StreamingSIMDExtensions2 @@ -120,7 +120,7 @@ ./include;../LandmarkDetector/include;../Utilities/include;%(AdditionalIncludeDirectories) true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - AdvancedVectorExtensions + StreamingSIMDExtensions2 Speed @@ -139,7 +139,7 @@ ./include;../LandmarkDetector/include;../Utilities/include;%(AdditionalIncludeDirectories) true WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - AdvancedVectorExtensions + StreamingSIMDExtensions2 Speed diff --git a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj index 7d40dbef8..84ccbb5f0 100644 --- a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj +++ b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj @@ -124,7 +124,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)c NotUsing Level3 ProgramDatabase - AdvancedVectorExtensions + StreamingSIMDExtensions2 false /Zm300 %(AdditionalOptions) true @@ -148,7 +148,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)c Use Level3 ProgramDatabase - AdvancedVectorExtensions + StreamingSIMDExtensions2 Speed false /Zm300 %(AdditionalOptions) @@ -173,7 +173,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)c Use Level3 ProgramDatabase - AdvancedVectorExtensions + StreamingSIMDExtensions2 Speed false /Zm300 %(AdditionalOptions) diff --git a/lib/local/Utilities/Utilities.vcxproj b/lib/local/Utilities/Utilities.vcxproj index a61f4e688..3145ea221 100644 --- a/lib/local/Utilities/Utilities.vcxproj +++ b/lib/local/Utilities/Utilities.vcxproj @@ -99,6 +99,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ./include;%(AdditionalIncludeDirectories) + StreamingSIMDExtensions2 Windows @@ -112,6 +113,7 @@ Disabled _DEBUG;_LIB;%(PreprocessorDefinitions) ./include;%(AdditionalIncludeDirectories) + StreamingSIMDExtensions2 Windows @@ -130,7 +132,7 @@ ./include;%(AdditionalIncludeDirectories) AnySuitable Speed - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows @@ -151,7 +153,7 @@ ./include;%(AdditionalIncludeDirectories) Speed AnySuitable - AdvancedVectorExtensions + StreamingSIMDExtensions2 Windows