Merge pull request #2489 from seanwarren/dlib-use-clapack-openblas

[dlib] Use vcpkg version of BLAS and LAPACK
This commit is contained in:
Alexander Karatarakis 2018-01-02 23:22:58 +02:00 committed by GitHub
commit 9dbe454385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions

View File

@ -1,11 +1,8 @@
Source: dlib
Version: 19.8
Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3
Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack
Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
Feature: blas
Description: BLAS support for dlib
Feature: cuda
Build-Depends: cuda
Description: CUDA support for dlib

View File

@ -17,11 +17,6 @@ file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE)
string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}")
file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}")
set(WITH_BLAS OFF)
if("blas" IN_LIST FEATURES)
set(WITH_BLAS ON)
endif()
set(WITH_CUDA OFF)
if("cuda" IN_LIST FEATURES)
set(WITH_CUDA ON)
@ -35,8 +30,8 @@ vcpkg_configure_cmake(
-DDLIB_USE_FFTW=ON
-DDLIB_PNG_SUPPORT=ON
-DDLIB_JPEG_SUPPORT=ON
-DDLIB_USE_BLAS=${WITH_BLAS}
-DDLIB_USE_LAPACK=OFF
-DDLIB_USE_BLAS=ON
-DDLIB_USE_LAPACK=ON
-DDLIB_USE_CUDA=${WITH_CUDA}
-DDLIB_GIF_SUPPORT=OFF
-DDLIB_USE_MKL_FFT=OFF