diff --git a/.travis.yml b/.travis.yml index efc7d1d6..4007939c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ branches: - develop - feature/code_cleanup - feature/parallel_for + - feature/openblas_update compiler: - gcc diff --git a/appveyor.yml b/appveyor.yml index 45e9ae0d..bfb3d529 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ branches: - master - feature/code_cleanup - feature/parallel_for + - feature/openblas_update max_jobs: 4 configuration: - Release diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj index 814e186f..b50d2b06 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj @@ -59,29 +59,29 @@ - + - + - + - + diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj index dc88e5ff..76102fc9 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj @@ -59,29 +59,29 @@ - + - + - + - + diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj index 72793b84..6be02c90 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj @@ -58,29 +58,29 @@ - + - + - + - + diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj b/exe/FeatureExtraction/FeatureExtraction.vcxproj index 9a5c7e01..e2e53ee6 100644 --- a/exe/FeatureExtraction/FeatureExtraction.vcxproj +++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj @@ -58,29 +58,29 @@ - + - + - + - + diff --git a/lib/3rdParty/OpenBLAS/OpenBLAS_64.props b/lib/3rdParty/OpenBLAS/OpenBLAS_64.props new file mode 100644 index 00000000..4b9bb69f --- /dev/null +++ b/lib/3rdParty/OpenBLAS/OpenBLAS_64.props @@ -0,0 +1,20 @@ + + + + + + + + $(SolutionDir)lib\3rdParty\OpenBLAS\include;%(AdditionalIncludeDirectories) + + + $(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName);%(AdditionalLibraryDirectories) + openblas.lib;%(AdditionalDependencies) + + + + xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)" "$(OutDir)" + + + + \ No newline at end of file diff --git a/lib/3rdParty/OpenBLAS/OpenBLAS.props b/lib/3rdParty/OpenBLAS/OpenBLAS_x86.props similarity index 100% rename from lib/3rdParty/OpenBLAS/OpenBLAS.props rename to lib/3rdParty/OpenBLAS/OpenBLAS_x86.props diff --git a/lib/3rdParty/OpenBLAS/bin/x64/flang.dll b/lib/3rdParty/OpenBLAS/bin/x64/flang.dll new file mode 100644 index 00000000..31456a91 Binary files /dev/null and b/lib/3rdParty/OpenBLAS/bin/x64/flang.dll differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/flangrti.dll b/lib/3rdParty/OpenBLAS/bin/x64/flangrti.dll new file mode 100644 index 00000000..5f2103f7 Binary files /dev/null and b/lib/3rdParty/OpenBLAS/bin/x64/flangrti.dll differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libgcc_s_seh-1.dll b/lib/3rdParty/OpenBLAS/bin/x64/libgcc_s_seh-1.dll deleted file mode 100644 index 500f7a5c..00000000 Binary files a/lib/3rdParty/OpenBLAS/bin/x64/libgcc_s_seh-1.dll and /dev/null differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libgfortran-3.dll b/lib/3rdParty/OpenBLAS/bin/x64/libgfortran-3.dll deleted file mode 100644 index 23136a90..00000000 Binary files a/lib/3rdParty/OpenBLAS/bin/x64/libgfortran-3.dll and /dev/null differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libomp.dll b/lib/3rdParty/OpenBLAS/bin/x64/libomp.dll new file mode 100644 index 00000000..38a1658e Binary files /dev/null and b/lib/3rdParty/OpenBLAS/bin/x64/libomp.dll differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libopenblas.dll b/lib/3rdParty/OpenBLAS/bin/x64/libopenblas.dll deleted file mode 100644 index 6bc5c2d4..00000000 Binary files a/lib/3rdParty/OpenBLAS/bin/x64/libopenblas.dll and /dev/null differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/libquadmath-0.dll b/lib/3rdParty/OpenBLAS/bin/x64/libquadmath-0.dll deleted file mode 100644 index 028a3c34..00000000 Binary files a/lib/3rdParty/OpenBLAS/bin/x64/libquadmath-0.dll and /dev/null differ diff --git a/lib/3rdParty/OpenBLAS/bin/x64/openblas.dll b/lib/3rdParty/OpenBLAS/bin/x64/openblas.dll new file mode 100644 index 00000000..09a28aa8 Binary files /dev/null and b/lib/3rdParty/OpenBLAS/bin/x64/openblas.dll differ diff --git a/lib/3rdParty/OpenBLAS/lib/x64/libopenblas.dll.a b/lib/3rdParty/OpenBLAS/lib/x64/libopenblas.dll.a deleted file mode 100644 index 19e9da2f..00000000 Binary files a/lib/3rdParty/OpenBLAS/lib/x64/libopenblas.dll.a and /dev/null differ diff --git a/lib/3rdParty/OpenBLAS/lib/x64/openblas.lib b/lib/3rdParty/OpenBLAS/lib/x64/openblas.lib new file mode 100644 index 00000000..c477c5f8 Binary files /dev/null and b/lib/3rdParty/OpenBLAS/lib/x64/openblas.lib differ diff --git a/lib/3rdParty/OpenBLAS/readme_2.txt b/lib/3rdParty/OpenBLAS/readme_2.txt index dde99583..a05b7a79 100644 --- a/lib/3rdParty/OpenBLAS/readme_2.txt +++ b/lib/3rdParty/OpenBLAS/readme_2.txt @@ -1,8 +1,8 @@ Using the following OpenBLAS implementation - https://github.com/xianyi/OpenBLAS The pre-compiled library was acquired from (64 bit version): -https://sourceforge.net/projects/openblas/files/v0.2.19/ -File - OpenBLAS-v0.2.19-Win64-int32.zip +Manually building OpenBLAS 0.3.3 from code using Miniconda - https://github.com/xianyi/OpenBLAS/wiki/How-to-use-OpenBLAS-in-Microsoft-Visual-Studio +version - https://github.com/xianyi/OpenBLAS/archive/v0.3.3.zip The pre-compiled library was acquired from (32 bit version): https://sourceforge.net/projects/openblas/files/v0.2.15/ diff --git a/lib/local/CppInerop/CppInerop.vcxproj b/lib/local/CppInerop/CppInerop.vcxproj index 7551cf4a..e5f9d092 100644 --- a/lib/local/CppInerop/CppInerop.vcxproj +++ b/lib/local/CppInerop/CppInerop.vcxproj @@ -64,29 +64,29 @@ - + - + - + - + diff --git a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj index 4a903c50..6c5c774d 100644 --- a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj +++ b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj @@ -57,29 +57,29 @@ - + - + - + - + diff --git a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj index 8e262e47..7c5c45b6 100644 --- a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj +++ b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj @@ -58,26 +58,26 @@ - + - + - + - + diff --git a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj index 4220ddac..8ddfae86 100644 --- a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj +++ b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj @@ -54,29 +54,29 @@ - + - + - + - + diff --git a/lib/local/Utilities/Utilities.vcxproj b/lib/local/Utilities/Utilities.vcxproj index 6f5bfac2..6da57589 100644 --- a/lib/local/Utilities/Utilities.vcxproj +++ b/lib/local/Utilities/Utilities.vcxproj @@ -62,28 +62,28 @@ - + - + - + - +