[arrayfire] 39/41: Refresh patch Fix-LAPACKE-detection.patch.

Mon Mar 21 14:56:24 UTC 2016

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit ff9a0efcde70b89d89d95a6f4ffb456903cac5cb
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Mar 21 09:09:18 2016 +0000

    Refresh patch Fix-LAPACKE-detection.patch.
---
 debian/patches/Fix-LAPACKE-detection.patch | 46 ++++++++++++------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/debian/patches/Fix-LAPACKE-detection.patch b/debian/patches/Fix-LAPACKE-detection.patch
index 8680d24..956df3e 100644
--- a/debian/patches/Fix-LAPACKE-detection.patch
+++ b/debian/patches/Fix-LAPACKE-detection.patch
@@ -9,8 +9,6 @@ Subject: Fix LAPACKE detection.
  src/backend/opencl/CMakeLists.txt | 19 +++++++-------
  4 files changed, 45 insertions(+), 57 deletions(-)
 
-diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake
-index 0732cfa..4b7e407 100644
 --- a/CMakeModules/FindLAPACKE.cmake
 +++ b/CMakeModules/FindLAPACKE.cmake
 @@ -4,13 +4,13 @@
@@ -32,7 +30,7 @@ index 0732cfa..4b7e407 100644
  
  IF (NOT INTEL_MKL_ROOT_DIR)
    SET(INTEL_MKL_ROOT_DIR $ENV{INTEL_MKL_ROOT})
-@@ -40,29 +40,20 @@ IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT_DIR)
+@@ -40,29 +40,20 @@
  ENDIF()
  
  IF(PC_LAPACKE_FOUND)
@@ -68,7 +66,7 @@ index 0732cfa..4b7e407 100644
  
  ELSE(PC_LAPACKE_FOUND)
  
-@@ -97,7 +88,6 @@ ELSE(PC_LAPACKE_FOUND)
+@@ -97,7 +88,6 @@
              LAPACKE_LIB
              NAMES "lapacke" "liblapacke" "openblas" "mkl_rt"
              PATHS
@@ -76,7 +74,7 @@ index 0732cfa..4b7e407 100644
              ${LIB_INSTALL_DIR}
              /opt/intel/mkl/lib/ia32
              /opt/intel/mkl/lib/intel64
-@@ -113,7 +103,6 @@ ELSE(PC_LAPACKE_FOUND)
+@@ -113,7 +103,6 @@
             LAPACK_LIB
              NAMES "lapack" "liblapack" "openblas" "mkl_rt"
              PATHS
@@ -84,7 +82,7 @@ index 0732cfa..4b7e407 100644
              ${LIB_INSTALL_DIR}
              /opt/intel/mkl/lib/ia32
              /opt/intel/mkl/lib/intel64
-@@ -129,7 +118,6 @@ ELSE(PC_LAPACKE_FOUND)
+@@ -129,7 +118,6 @@
              LAPACKE_INCLUDES
              NAMES "lapacke.h" "mkl_lapacke.h"
              PATHS
@@ -92,8 +90,8 @@ index 0732cfa..4b7e407 100644
              ${INCLUDE_INSTALL_DIR}
              /opt/intel/mkl/include
              /usr/include
-@@ -139,17 +127,15 @@ ELSE(PC_LAPACKE_FOUND)
-             DOC "LAPACKE Include Directory"
+@@ -141,17 +129,15 @@
+             lapacke
              )
      ENDIF(LAPACKE_ROOT_DIR)
 +    SET(LAPACKE_INCLUDE_DIRS ${LAPACKE_INCLUDES})
@@ -119,11 +117,9 @@ index 0732cfa..4b7e407 100644
 +MARK_AS_ADVANCED(LAPACKE_LIBRARIES
 +                 LAPACKE_INCLUDE_DIRS
 +                 LAPACKE_LIBRARY_DIRS)
-diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt
-index 9387323..3f409b5 100644
 --- a/src/backend/cpu/CMakeLists.txt
 +++ b/src/backend/cpu/CMakeLists.txt
-@@ -40,7 +40,7 @@ MESSAGE(STATUS "FFTW Library: ${FFTW_LIBRARIES}")
+@@ -40,7 +40,7 @@
  
  IF(APPLE)
      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -132,7 +128,7 @@ index 9387323..3f409b5 100644
          # UNSET THE VARIABLES FROM LAPACKE
          UNSET(LAPACKE_LIB CACHE)
          UNSET(LAPACK_LIB CACHE)
-@@ -52,11 +52,10 @@ ELSE(APPLE) # Linux and Windows
+@@ -52,11 +52,10 @@
      FIND_PACKAGE(LAPACKE)
  ENDIF(APPLE)
  
@@ -147,7 +143,7 @@ index 9387323..3f409b5 100644
  ENDIF()
  
  IF(NOT UNIX)
-@@ -84,8 +83,9 @@ INCLUDE_DIRECTORIES(
+@@ -84,8 +83,9 @@
      ${CBLAS_INCLUDE_DIR}
      )
  
@@ -159,7 +155,7 @@ index 9387323..3f409b5 100644
  ENDIF()
  
  FILE(GLOB cpu_headers
-@@ -185,8 +185,8 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
+@@ -196,8 +196,8 @@
    ADD_DEPENDENCIES(afcpu forge)
  ENDIF()
  
@@ -170,11 +166,9 @@ index 9387323..3f409b5 100644
  ENDIF()
  
  IF(FORGE_FOUND)
-diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index ae0690d..5efdac8 100644
 --- a/src/backend/cuda/CMakeLists.txt
 +++ b/src/backend/cuda/CMakeLists.txt
-@@ -103,7 +103,7 @@ ELSE(CUDA_cusolver_LIBRARY)
+@@ -103,7 +103,7 @@
          ## Try to use CPU side lapack
          IF(APPLE)
              FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -183,7 +177,7 @@ index ae0690d..5efdac8 100644
                  # UNSET THE VARIABLES FROM LAPACKE
                  UNSET(LAPACKE_LIB CACHE)
                  UNSET(LAPACK_LIB CACHE)
-@@ -115,9 +115,9 @@ ELSE(CUDA_cusolver_LIBRARY)
+@@ -115,9 +115,9 @@
              FIND_PACKAGE(LAPACKE)
          ENDIF(APPLE)
  
@@ -195,7 +189,7 @@ index ae0690d..5efdac8 100644
              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.")
              ADD_DEFINITIONS(-DWITH_CPU_LINEAR_ALGEBRA)
              IF(USE_CUDA_MKL) # Manual MKL Setup
-@@ -146,7 +146,8 @@ INCLUDE_DIRECTORIES(
+@@ -146,7 +146,8 @@
      )
  
  IF(CUDA_LAPACK_CPU_FALLBACK)
@@ -205,7 +199,7 @@ index ae0690d..5efdac8 100644
  ENDIF()
  
  FILE(GLOB cuda_headers
-@@ -343,7 +344,7 @@ ENDIF()
+@@ -359,7 +360,7 @@
  IF(CUDA_cusolver_LIBRARY)
      TARGET_LINK_LIBRARIES(afcuda PRIVATE ${CUDA_cusolver_LIBRARY})
  ELSEIF(CUDA_LAPACK_CPU_FALLBACK)
@@ -214,11 +208,9 @@ index ae0690d..5efdac8 100644
  ENDIF()
  
  SET_TARGET_PROPERTIES(afcuda PROPERTIES
-diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
-index bbe430d..c1484db 100644
 --- a/src/backend/opencl/CMakeLists.txt
 +++ b/src/backend/opencl/CMakeLists.txt
-@@ -22,7 +22,7 @@ ENDIF()
+@@ -22,7 +22,7 @@
  
  IF(APPLE)
      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -227,7 +219,7 @@ index bbe430d..c1484db 100644
          # UNSET THE VARIABLES FROM LAPACKE
          UNSET(LAPACKE_LIB CACHE)
          UNSET(LAPACK_LIB CACHE)
-@@ -34,9 +34,9 @@ ELSE(APPLE) # Linux and Windows
+@@ -34,9 +34,9 @@
      FIND_PACKAGE(LAPACKE)
  ENDIF(APPLE)
  
@@ -240,7 +232,7 @@ index bbe430d..c1484db 100644
    ADD_DEFINITIONS(-DWITH_OPENCL_LINEAR_ALGEBRA)
  
    IF(NOT USE_OPENCL_MKL)
-@@ -105,8 +105,9 @@ INCLUDE_DIRECTORIES(
+@@ -105,8 +105,9 @@
      ${BoostCompute_INCLUDE_DIRS}
      ${CBLAS_INCLUDE_DIR}
      )
@@ -252,7 +244,7 @@ index bbe430d..c1484db 100644
  ENDIF()
  
  FILE(GLOB opencl_headers
-@@ -153,7 +154,7 @@ source_group(backend\\opencl\\kernel\\convolve\\Sources FILES ${conv_ker_sources
+@@ -164,7 +165,7 @@
  source_group(backend\\opencl\\cpu\\Headers FILES ${cpu_headers})
  source_group(backend\\opencl\\cpu\\Sources FILES ${cpu_sources})
  
@@ -261,7 +253,7 @@ index bbe430d..c1484db 100644
      FILE(GLOB magma_sources
          "magma/*.cpp")
  
-@@ -289,9 +290,9 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
+@@ -315,9 +316,9 @@
      ADD_DEPENDENCIES(afopencl forge)
  ENDIF()
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git

