[arrayfire] 01/06: Refresh Fix-LAPACKE-detection.patch.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Apr 14 10:45:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository arrayfire.
commit 2813e1c4edc05ddeccce211a574467c529d2b84a
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Apr 8 14:29:46 2016 +0100
Refresh Fix-LAPACKE-detection.patch.
---
debian/patches/Fix-LAPACKE-detection.patch | 44 ++++++++++++++++++------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/debian/patches/Fix-LAPACKE-detection.patch b/debian/patches/Fix-LAPACKE-detection.patch
index 956df3e..1e642f9 100644
--- a/debian/patches/Fix-LAPACKE-detection.patch
+++ b/debian/patches/Fix-LAPACKE-detection.patch
@@ -9,6 +9,8 @@ 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 9251ee9..1a73632 100644
--- a/CMakeModules/FindLAPACKE.cmake
+++ b/CMakeModules/FindLAPACKE.cmake
@@ -4,13 +4,13 @@
@@ -30,7 +32,7 @@ Subject: Fix LAPACKE detection.
IF (NOT INTEL_MKL_ROOT_DIR)
SET(INTEL_MKL_ROOT_DIR $ENV{INTEL_MKL_ROOT})
-@@ -40,29 +40,20 @@
+@@ -40,29 +40,20 @@ IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT_DIR)
ENDIF()
IF(PC_LAPACKE_FOUND)
@@ -66,7 +68,7 @@ Subject: Fix LAPACKE detection.
ELSE(PC_LAPACKE_FOUND)
-@@ -97,7 +88,6 @@
+@@ -97,7 +88,6 @@ ELSE(PC_LAPACKE_FOUND)
LAPACKE_LIB
NAMES "lapacke" "liblapacke" "openblas" "mkl_rt"
PATHS
@@ -74,7 +76,7 @@ Subject: Fix LAPACKE detection.
${LIB_INSTALL_DIR}
/opt/intel/mkl/lib/ia32
/opt/intel/mkl/lib/intel64
-@@ -113,7 +103,6 @@
+@@ -113,7 +103,6 @@ ELSE(PC_LAPACKE_FOUND)
LAPACK_LIB
NAMES "lapack" "liblapack" "openblas" "mkl_rt"
PATHS
@@ -82,7 +84,7 @@ Subject: Fix LAPACKE detection.
${LIB_INSTALL_DIR}
/opt/intel/mkl/lib/ia32
/opt/intel/mkl/lib/intel64
-@@ -129,7 +118,6 @@
+@@ -129,7 +118,6 @@ ELSE(PC_LAPACKE_FOUND)
LAPACKE_INCLUDES
NAMES "lapacke.h" "mkl_lapacke.h"
PATHS
@@ -90,7 +92,7 @@ Subject: Fix LAPACKE detection.
${INCLUDE_INSTALL_DIR}
/opt/intel/mkl/include
/usr/include
-@@ -141,17 +129,15 @@
+@@ -141,17 +129,15 @@ ELSE(PC_LAPACKE_FOUND)
lapacke
)
ENDIF(LAPACKE_ROOT_DIR)
@@ -117,9 +119,11 @@ Subject: Fix LAPACKE detection.
+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 f7857ec..348e699 100644
--- a/src/backend/cpu/CMakeLists.txt
+++ b/src/backend/cpu/CMakeLists.txt
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ MESSAGE(STATUS "FFTW Library: ${FFTW_LIBRARIES}")
IF(APPLE)
FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -128,7 +132,7 @@ Subject: Fix LAPACKE detection.
# UNSET THE VARIABLES FROM LAPACKE
UNSET(LAPACKE_LIB CACHE)
UNSET(LAPACK_LIB CACHE)
-@@ -52,11 +52,10 @@
+@@ -52,11 +52,10 @@ ELSE(APPLE) # Linux and Windows
FIND_PACKAGE(LAPACKE)
ENDIF(APPLE)
@@ -143,7 +147,7 @@ Subject: Fix LAPACKE detection.
ENDIF()
IF(NOT UNIX)
-@@ -84,8 +83,9 @@
+@@ -84,8 +83,9 @@ INCLUDE_DIRECTORIES(
${CBLAS_INCLUDE_DIR}
)
@@ -155,7 +159,7 @@ Subject: Fix LAPACKE detection.
ENDIF()
FILE(GLOB cpu_headers
-@@ -196,8 +196,8 @@
+@@ -196,8 +196,8 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
ADD_DEPENDENCIES(afcpu forge)
ENDIF()
@@ -166,9 +170,11 @@ Subject: Fix LAPACKE detection.
ENDIF()
IF(FORGE_FOUND)
+diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
+index ab29899..4260b18 100644
--- a/src/backend/cuda/CMakeLists.txt
+++ b/src/backend/cuda/CMakeLists.txt
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ ELSE(CUDA_cusolver_LIBRARY)
## Try to use CPU side lapack
IF(APPLE)
FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -177,7 +183,7 @@ Subject: Fix LAPACKE detection.
# UNSET THE VARIABLES FROM LAPACKE
UNSET(LAPACKE_LIB CACHE)
UNSET(LAPACK_LIB CACHE)
-@@ -115,9 +115,9 @@
+@@ -115,9 +115,9 @@ ELSE(CUDA_cusolver_LIBRARY)
FIND_PACKAGE(LAPACKE)
ENDIF(APPLE)
@@ -189,7 +195,7 @@ Subject: Fix LAPACKE detection.
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 @@
+@@ -146,7 +146,8 @@ INCLUDE_DIRECTORIES(
)
IF(CUDA_LAPACK_CPU_FALLBACK)
@@ -199,7 +205,7 @@ Subject: Fix LAPACKE detection.
ENDIF()
FILE(GLOB cuda_headers
-@@ -359,7 +360,7 @@
+@@ -359,7 +360,7 @@ ENDIF()
IF(CUDA_cusolver_LIBRARY)
TARGET_LINK_LIBRARIES(afcuda PRIVATE ${CUDA_cusolver_LIBRARY})
ELSEIF(CUDA_LAPACK_CPU_FALLBACK)
@@ -208,9 +214,11 @@ Subject: Fix LAPACKE detection.
ENDIF()
SET_TARGET_PROPERTIES(afcuda PROPERTIES
+diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
+index 2cb8ddf..e4041ed 100644
--- a/src/backend/opencl/CMakeLists.txt
+++ b/src/backend/opencl/CMakeLists.txt
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,7 @@ ENDIF()
IF(APPLE)
FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -219,7 +227,7 @@ Subject: Fix LAPACKE detection.
# UNSET THE VARIABLES FROM LAPACKE
UNSET(LAPACKE_LIB CACHE)
UNSET(LAPACK_LIB CACHE)
-@@ -34,9 +34,9 @@
+@@ -34,9 +34,9 @@ ELSE(APPLE) # Linux and Windows
FIND_PACKAGE(LAPACKE)
ENDIF(APPLE)
@@ -232,7 +240,7 @@ Subject: Fix LAPACKE detection.
ADD_DEFINITIONS(-DWITH_OPENCL_LINEAR_ALGEBRA)
IF(NOT USE_OPENCL_MKL)
-@@ -105,8 +105,9 @@
+@@ -105,8 +105,9 @@ INCLUDE_DIRECTORIES(
${BoostCompute_INCLUDE_DIRS}
${CBLAS_INCLUDE_DIR}
)
@@ -244,7 +252,7 @@ Subject: Fix LAPACKE detection.
ENDIF()
FILE(GLOB opencl_headers
-@@ -164,7 +165,7 @@
+@@ -164,7 +165,7 @@ source_group(backend\\opencl\\kernel\\convolve\\Sources FILES ${conv_ker_sources
source_group(backend\\opencl\\cpu\\Headers FILES ${cpu_headers})
source_group(backend\\opencl\\cpu\\Sources FILES ${cpu_sources})
@@ -253,7 +261,7 @@ Subject: Fix LAPACKE detection.
FILE(GLOB magma_sources
"magma/*.cpp")
-@@ -315,9 +316,9 @@
+@@ -315,9 +316,9 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
ADD_DEPENDENCIES(afopencl forge)
ENDIF()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list