pjotrp
/
guix-bioinformatics
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
833 Commits
5 Branches
3.0 MiB
 
 
Tree: c0c6263202
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'c0c6263202'
${ noResults }
guix-bioinformatics/arrayfire-lapack-detection....

278 lines
9.5 KiB
Raw Blame History 

  1. https://sources.debian.org/data/main/a/arrayfire/3.3.2+dfsg1-4/debian/patches/Fix-LAPACKE-detection.patch

  2. 

  3. From: Ghislain Antony Vaillant <ghisvail@gmail.com>

  4. Date: Wed, 2 Mar 2016 10:46:50 +0000

  5. Subject: Fix LAPACKE detection.

  6. 

  7. ---

  8.  CMakeModules/FindLAPACKE.cmake    | 54 +++++++++++++++------------------------

  9.  src/backend/cpu/CMakeLists.txt    | 18 ++++++-------

  10.  src/backend/cuda/CMakeLists.txt   | 11 ++++----

  11.  src/backend/opencl/CMakeLists.txt | 19 +++++++-------

  12.  4 files changed, 45 insertions(+), 57 deletions(-)

  13. 

  14. diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake

  15. index 9251ee9..1a73632 100644

  16. --- a/CMakeModules/FindLAPACKE.cmake

  17. +++ b/CMakeModules/FindLAPACKE.cmake

  18. @@ -4,13 +4,13 @@

  19.  #   FIND_PACKAGE(LAPACKE [REQUIRED] [QUIET] )

  20.  #

  21.  # It sets the following variables:

  22. -#   LAPACK_FOUND               ... true if LAPACKE is found on the system

  23. -#   LAPACK_LIBRARIES           ... full path to LAPACKE library

  24. -#   LAPACK_INCLUDES            ... LAPACKE include directory

  25. -#

  26. +#   LAPACKE_FOUND               ... true if LAPACKE is found on the system

  27. +#   LAPACKE_INCLUDE_DIRS        ... LAPACKE include directories

  28. +#   LAPACKE_LIBRARIES           ... path to LAPACKE libraries

  29. +#   LAPACKE_LIBRARY_DIRS        ... LAPACKE library directories

  30.  

  31.  SET(LAPACKE_ROOT_DIR CACHE STRING

  32. -  "Root directory for custom LAPACK implementation")

  33. +  "Root directory for custom LAPACKE implementation")

  34.  

  35.  IF (NOT INTEL_MKL_ROOT_DIR)

  36.    SET(INTEL_MKL_ROOT_DIR $ENV{INTEL_MKL_ROOT})

  37. @@ -40,29 +40,20 @@ IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT_DIR)

  38.  ENDIF()

  39.  

  40.  IF(PC_LAPACKE_FOUND)

  41. +

  42. +    # Verify sanity of LAPACKE pkg-config file.

  43.      FOREACH(PC_LIB ${PC_LAPACKE_LIBRARIES})

  44.        FIND_LIBRARY(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACKE_LIBRARY_DIRS} )

  45.        IF (NOT ${PC_LIB}_LIBRARY)

  46.          MESSAGE(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACKE_LIBRARY_DIRS}")

  47.        ENDIF (NOT ${PC_LIB}_LIBRARY)

  48. -      LIST(APPEND LAPACKE_LIB ${${PC_LIB}_LIBRARY})

  49.      ENDFOREACH(PC_LIB)

  50.  

  51. -    FIND_PATH(

  52. -        LAPACKE_INCLUDES

  53. -        NAMES "lapacke.h"

  54. -        PATHS

  55. -        ${PC_LAPACKE_INCLUDE_DIRS}

  56. -        ${INCLUDE_INSTALL_DIR}

  57. -        /usr/include

  58. -        /usr/local/include

  59. -        /sw/include

  60. -        /opt/local/include

  61. -        DOC "LAPACKE Include Directory"

  62. -        )

  63. +    set(LAPACKE_LIBRARIES ${PC_LAPACKE_LIBRARIES})

  64. +    set(LAPACKE_LIBRARY_DIRS ${PC_LAPACKE_LIBRARY_DIRS})

  65.  

  66. -    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACKE DEFAULT_MSG LAPACKE_LIB)

  67. -    MARK_AS_ADVANCED(LAPACKE_INCLUDES LAPACKE_LIB)

  68. +    FIND_PATH(LAPACKE_INCLUDE_DIRS NAMES "lapacke.h"

  69. +              PATHS ${PC_LAPACKE_INCLUDE_DIRS})

  70.  

  71.  ELSE(PC_LAPACKE_FOUND)

  72.  

  73. @@ -97,7 +88,6 @@ ELSE(PC_LAPACKE_FOUND)

  74.              LAPACKE_LIB

  75.              NAMES "lapacke" "liblapacke" "openblas" "mkl_rt"

  76.              PATHS

  77. -            ${PC_LAPACKE_LIBRARY_DIRS}

  78.              ${LIB_INSTALL_DIR}

  79.              /opt/intel/mkl/lib/ia32

  80.              /opt/intel/mkl/lib/intel64

  81. @@ -113,7 +103,6 @@ ELSE(PC_LAPACKE_FOUND)

  82.             LAPACK_LIB

  83.              NAMES "lapack" "liblapack" "openblas" "mkl_rt"

  84.              PATHS

  85. -            ${PC_LAPACKE_LIBRARY_DIRS}

  86.              ${LIB_INSTALL_DIR}

  87.              /opt/intel/mkl/lib/ia32

  88.              /opt/intel/mkl/lib/intel64

  89. @@ -129,7 +118,6 @@ ELSE(PC_LAPACKE_FOUND)

  90.              LAPACKE_INCLUDES

  91.              NAMES "lapacke.h" "mkl_lapacke.h"

  92.              PATHS

  93. -            ${PC_LAPACKE_INCLUDE_DIRS}

  94.              ${INCLUDE_INSTALL_DIR}

  95.              /opt/intel/mkl/include

  96.              /usr/include

  97. @@ -141,17 +129,15 @@ ELSE(PC_LAPACKE_FOUND)

  98.              lapacke

  99.              )

  100.      ENDIF(LAPACKE_ROOT_DIR)

  101. +    SET(LAPACKE_INCLUDE_DIRS ${LAPACKE_INCLUDES})

  102. +    SET(LAPACKE_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})

  103. +    MARK_AS_ADVANCED(LAPACKE_INCLUDES LAPACKE_LIB LAPACK_LIB)

  104.  ENDIF(PC_LAPACKE_FOUND)

  105.  

  106. -IF(LAPACKE_LIB AND LAPACK_LIB)

  107. -    SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})

  108. -ENDIF()

  109. -IF(LAPACKE_INCLUDES)

  110. -    SET(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDES})

  111. -ENDIF()

  112. -

  113.  INCLUDE(FindPackageHandleStandardArgs)

  114. -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACK DEFAULT_MSG

  115. -  LAPACK_INCLUDE_DIR LAPACK_LIBRARIES)

  116. -

  117. -MARK_AS_ADVANCED(LAPACK_INCLUDES LAPACK_LIBRARIES)

  118. +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACKE DEFAULT_MSG

  119. +                                  LAPACKE_LIBRARIES

  120. +                                  LAPACKE_INCLUDE_DIRS)

  121. +MARK_AS_ADVANCED(LAPACKE_LIBRARIES

  122. +                 LAPACKE_INCLUDE_DIRS

  123. +                 LAPACKE_LIBRARY_DIRS)

  124. diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt

  125. index ea57269..efe50a0 100644

  126. --- a/src/backend/cpu/CMakeLists.txt

  127. +++ b/src/backend/cpu/CMakeLists.txt

  128. @@ -55,7 +55,7 @@ MESSAGE(STATUS "FFTW Library: ${FFTW_LIBRARIES}")

  129.  

  130.  IF(APPLE)

  131.      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL

  132. -    IF(NOT LAPACK_FOUND)

  133. +    IF(NOT LAPACKE_FOUND)

  134.          # UNSET THE VARIABLES FROM LAPACKE

  135.          UNSET(LAPACKE_LIB CACHE)

  136.          UNSET(LAPACK_LIB CACHE)

  137. @@ -67,11 +67,10 @@ ELSE(APPLE) # Linux and Windows

  138.      FIND_PACKAGE(LAPACKE)

  139.  ENDIF(APPLE)

  140.  

  141. -IF(NOT LAPACK_FOUND)

  142. -    MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")

  143. -ELSE(NOT LAPACK_FOUND)

  144. +IF(NOT LAPACKE_FOUND)

  145. +    MESSAGE(WARNING "LAPACKE not found. Functionality will be disabled")

  146. +ELSE(NOT LAPACKE_FOUND)

  147.      ADD_DEFINITIONS(-DWITH_CPU_LINEAR_ALGEBRA)

  148. -    MESSAGE(STATUS "LAPACK libraries found: ${LAPACK_LIBRARIES}")

  149.  ENDIF()

  150.  

  151.  IF(NOT UNIX)

  152. @@ -99,8 +98,9 @@ INCLUDE_DIRECTORIES(

  153.      ${CBLAS_INCLUDE_DIR}

  154.      )

  155.  

  156. -IF(LAPACK_FOUND)

  157. -    INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIR})

  158. +IF(LAPACKE_FOUND)

  159. +    INCLUDE_DIRECTORIES(${LAPACKE_INCLUDE_DIRS})

  160. +    LINK_DIRECTORIES(${LAPACKE_LIBRARY_DIRS})

  161.  ENDIF()

  162.  

  163.  FILE(GLOB cpu_headers

  164. @@ -213,8 +213,8 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)

  165.    ADD_DEPENDENCIES(afcpu forge)

  166.  ENDIF()

  167.  

  168. -IF(LAPACK_FOUND)

  169. -   TARGET_LINK_LIBRARIES(afcpu  PRIVATE ${LAPACK_LIBRARIES})

  170. +IF(LAPACKE_FOUND)

  171. +   TARGET_LINK_LIBRARIES(afcpu  PRIVATE ${LAPACKE_LIBRARIES})

  172.  ENDIF()

  173.  

  174.  IF(FORGE_FOUND)

  175. diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt

  176. index 4efb427..24c6544 100644

  177. --- a/src/backend/cuda/CMakeLists.txt

  178. +++ b/src/backend/cuda/CMakeLists.txt

  179. @@ -105,7 +105,7 @@ ELSE(CUDA_cusolver_LIBRARY)

  180.          ## Try to use CPU side lapack

  181.          IF(APPLE)

  182.              FIND_PACKAGE(LAPACKE QUIET) # For finding MKL

  183. -            IF(NOT LAPACK_FOUND)

  184. +            IF(NOT LAPACKE_FOUND)

  185.                  # UNSET THE VARIABLES FROM LAPACKE

  186.                  UNSET(LAPACKE_LIB CACHE)

  187.                  UNSET(LAPACK_LIB CACHE)

  188. @@ -117,9 +117,9 @@ ELSE(CUDA_cusolver_LIBRARY)

  189.              FIND_PACKAGE(LAPACKE)

  190.          ENDIF(APPLE)

  191.  

  192. -        IF(NOT LAPACK_FOUND)

  193. +        IF(NOT LAPACKE_FOUND)

  194.              MESSAGE(STATUS "CUDA Version ${CUDA_VERSION_STRING} does not contain cusolver library. Linear Algebra will not be available.")

  195. -        ELSE(NOT LAPACK_FOUND)

  196. +        ELSE(NOT LAPACKE_FOUND)

  197.              MESSAGE(STATUS "CUDA Version ${CUDA_VERSION_STRING} does not contain cusolver library. But CPU LAPACK libraries are available. Will fallback to using host side code.")

  198.              ADD_DEFINITIONS(-DWITH_CPU_LINEAR_ALGEBRA)

  199.              IF(USE_CUDA_MKL) # Manual MKL Setup

  200. @@ -148,7 +148,8 @@ INCLUDE_DIRECTORIES(

  201.      )

  202.  

  203.  IF(CUDA_LAPACK_CPU_FALLBACK)

  204. -  INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIR})

  205. +  INCLUDE_DIRECTORIES(${LAPACKE_INCLUDE_DIRS})

  206. +  LINK_DIRECTORIES(${LAPACKE_LIBRARY_DIRS})

  207.  ENDIF()

  208.  

  209.  FILE(GLOB cuda_headers

  210. @@ -379,7 +380,7 @@ ENDIF()

  211.  IF(CUDA_cusolver_LIBRARY)

  212.      TARGET_LINK_LIBRARIES(afcuda PRIVATE ${CUDA_cusolver_LIBRARY})

  213.  ELSEIF(CUDA_LAPACK_CPU_FALLBACK)

  214. -    TARGET_LINK_LIBRARIES(afcuda PRIVATE ${LAPACK_LIBRARIES})

  215. +    TARGET_LINK_LIBRARIES(afcuda PRIVATE ${LAPACKE_LIBRARIES})

  216.  ENDIF()

  217.  

  218.  SET_TARGET_PROPERTIES(afcuda PROPERTIES

  219. diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt

  220. index 71247ce..ded53bf 100644

  221. --- a/src/backend/opencl/CMakeLists.txt

  222. +++ b/src/backend/opencl/CMakeLists.txt

  223. @@ -12,7 +12,7 @@ ENDIF()

  224.  

  225.  IF(APPLE)

  226.      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL

  227. -    IF(NOT LAPACK_FOUND)

  228. +    IF(NOT LAPACKE_FOUND)

  229.          # UNSET THE VARIABLES FROM LAPACKE

  230.          UNSET(LAPACKE_LIB CACHE)

  231.          UNSET(LAPACK_LIB CACHE)

  232. @@ -24,9 +24,9 @@ ELSE(APPLE) # Linux and Windows

  233.      FIND_PACKAGE(LAPACKE)

  234.  ENDIF(APPLE)

  235.  

  236. -IF(NOT LAPACK_FOUND)

  237. -    MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")

  238. -ELSE(NOT LAPACK_FOUND)

  239. +IF(NOT LAPACKE_FOUND)

  240. +    MESSAGE(WARNING "LAPACKE not found. Functionality will be disabled")

  241. +ELSE(NOT LAPACKE_FOUND)

  242.    ADD_DEFINITIONS(-DWITH_OPENCL_LINEAR_ALGEBRA)

  243.  

  244.    IF(NOT USE_OPENCL_MKL)

  245. @@ -105,8 +105,9 @@ INCLUDE_DIRECTORIES(

  246.      ${BoostCompute_INCLUDE_DIRS}

  247.      ${CBLAS_INCLUDE_DIR}

  248.      )

  249. -IF(LAPACK_FOUND)

  250. -    INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIR})

  251. +IF(LAPACKE_FOUND)

  252. +    INCLUDE_DIRECTORIES(${LAPACKE_INCLUDE_DIRS})

  253. +    LINK_DIRECTORIES(${LAPACKE_LIBRARY_DIRS})

  254.  ENDIF()

  255.  

  256.  FILE(GLOB opencl_headers

  257. @@ -163,7 +164,7 @@ source_group(backend\\opencl\\kernel\\convolve\\Sources FILES ${conv_ker_sources

  258.  source_group(backend\\opencl\\cpu\\Headers FILES ${cpu_headers})

  259.  source_group(backend\\opencl\\cpu\\Sources FILES ${cpu_sources})

  260.  

  261. -IF(LAPACK_FOUND)

  262. +IF(LAPACKE_FOUND)

  263.      FILE(GLOB magma_sources

  264.          "magma/*.cpp")

  265.  

  266. @@ -313,9 +314,9 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)

  267.      ADD_DEPENDENCIES(afopencl forge)

  268.  ENDIF()

  269.  

  270. -IF(LAPACK_FOUND)

  271. +IF(LAPACKE_FOUND)

  272.    TARGET_LINK_LIBRARIES(afopencl

  273. -    PRIVATE ${LAPACK_LIBRARIES}

  274. +    PRIVATE ${LAPACKE_LIBRARIES}

  275.      PRIVATE ${CBLAS_LIBRARIES})

  276.  ENDIF()

  277.