[arrayfire] 03/08: Refresh patch queue.

Wed May 4 13:38:53 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 c2460a33273cff1c68b499f34505c9afeb506b3c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Apr 26 18:51:52 2016 +0100

    Refresh patch queue.
---
 debian/patches/Enable-support-for-GNU-Hurd.patch |  4 ++--
 debian/patches/Fix-LAPACKE-detection.patch       | 30 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/Enable-support-for-GNU-Hurd.patch b/debian/patches/Enable-support-for-GNU-Hurd.patch
index 2b4d2ec..a12063b 100644
--- a/debian/patches/Enable-support-for-GNU-Hurd.patch
+++ b/debian/patches/Enable-support-for-GNU-Hurd.patch
@@ -7,14 +7,14 @@ Subject: Enable support for GNU/Hurd.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/backend/host_memory.cpp b/src/backend/host_memory.cpp
-index 9b4f1e5..e96340e 100644
+index b81d4fc..e96340e 100644
 --- a/src/backend/host_memory.cpp
 +++ b/src/backend/host_memory.cpp
 @@ -16,7 +16,7 @@
  #include <sys/types.h>
  #include <sys/param.h>
  
--#if defined(BSD)
+-#if defined(BSD) && !defined(__gnu_hurd__)
 +#if defined(BSD) && !defined(__GNU__)
  #include <sys/sysctl.h>
  #endif
diff --git a/debian/patches/Fix-LAPACKE-detection.patch b/debian/patches/Fix-LAPACKE-detection.patch
index 1e642f9..0af8687 100644
--- a/debian/patches/Fix-LAPACKE-detection.patch
+++ b/debian/patches/Fix-LAPACKE-detection.patch
@@ -120,10 +120,10 @@ index 9251ee9..1a73632 100644
 +                 LAPACKE_INCLUDE_DIRS
 +                 LAPACKE_LIBRARY_DIRS)
 diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt
-index f7857ec..348e699 100644
+index ea57269..efe50a0 100644
 --- a/src/backend/cpu/CMakeLists.txt
 +++ b/src/backend/cpu/CMakeLists.txt
-@@ -40,7 +40,7 @@ MESSAGE(STATUS "FFTW Library: ${FFTW_LIBRARIES}")
+@@ -55,7 +55,7 @@ MESSAGE(STATUS "FFTW Library: ${FFTW_LIBRARIES}")
  
  IF(APPLE)
      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -132,7 +132,7 @@ index f7857ec..348e699 100644
          # UNSET THE VARIABLES FROM LAPACKE
          UNSET(LAPACKE_LIB CACHE)
          UNSET(LAPACK_LIB CACHE)
-@@ -52,11 +52,10 @@ ELSE(APPLE) # Linux and Windows
+@@ -67,11 +67,10 @@ ELSE(APPLE) # Linux and Windows
      FIND_PACKAGE(LAPACKE)
  ENDIF(APPLE)
  
@@ -147,7 +147,7 @@ index f7857ec..348e699 100644
  ENDIF()
  
  IF(NOT UNIX)
-@@ -84,8 +83,9 @@ INCLUDE_DIRECTORIES(
+@@ -99,8 +98,9 @@ INCLUDE_DIRECTORIES(
      ${CBLAS_INCLUDE_DIR}
      )
  
@@ -159,7 +159,7 @@ index f7857ec..348e699 100644
  ENDIF()
  
  FILE(GLOB cpu_headers
-@@ -196,8 +196,8 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
+@@ -213,8 +213,8 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
    ADD_DEPENDENCIES(afcpu forge)
  ENDIF()
  
@@ -171,10 +171,10 @@ index f7857ec..348e699 100644
  
  IF(FORGE_FOUND)
 diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index ab29899..4260b18 100644
+index 4efb427..24c6544 100644
 --- a/src/backend/cuda/CMakeLists.txt
 +++ b/src/backend/cuda/CMakeLists.txt
-@@ -103,7 +103,7 @@ ELSE(CUDA_cusolver_LIBRARY)
+@@ -105,7 +105,7 @@ ELSE(CUDA_cusolver_LIBRARY)
          ## Try to use CPU side lapack
          IF(APPLE)
              FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -183,7 +183,7 @@ index ab29899..4260b18 100644
                  # UNSET THE VARIABLES FROM LAPACKE
                  UNSET(LAPACKE_LIB CACHE)
                  UNSET(LAPACK_LIB CACHE)
-@@ -115,9 +115,9 @@ ELSE(CUDA_cusolver_LIBRARY)
+@@ -117,9 +117,9 @@ ELSE(CUDA_cusolver_LIBRARY)
              FIND_PACKAGE(LAPACKE)
          ENDIF(APPLE)
  
@@ -195,7 +195,7 @@ index ab29899..4260b18 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(
+@@ -148,7 +148,8 @@ INCLUDE_DIRECTORIES(
      )
  
  IF(CUDA_LAPACK_CPU_FALLBACK)
@@ -205,7 +205,7 @@ index ab29899..4260b18 100644
  ENDIF()
  
  FILE(GLOB cuda_headers
-@@ -359,7 +360,7 @@ ENDIF()
+@@ -379,7 +380,7 @@ ENDIF()
  IF(CUDA_cusolver_LIBRARY)
      TARGET_LINK_LIBRARIES(afcuda PRIVATE ${CUDA_cusolver_LIBRARY})
  ELSEIF(CUDA_LAPACK_CPU_FALLBACK)
@@ -215,10 +215,10 @@ index ab29899..4260b18 100644
  
  SET_TARGET_PROPERTIES(afcuda PROPERTIES
 diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
-index 2cb8ddf..e4041ed 100644
+index 71247ce..ded53bf 100644
 --- a/src/backend/opencl/CMakeLists.txt
 +++ b/src/backend/opencl/CMakeLists.txt
-@@ -22,7 +22,7 @@ ENDIF()
+@@ -12,7 +12,7 @@ ENDIF()
  
  IF(APPLE)
      FIND_PACKAGE(LAPACKE QUIET) # For finding MKL
@@ -227,7 +227,7 @@ index 2cb8ddf..e4041ed 100644
          # UNSET THE VARIABLES FROM LAPACKE
          UNSET(LAPACKE_LIB CACHE)
          UNSET(LAPACK_LIB CACHE)
-@@ -34,9 +34,9 @@ ELSE(APPLE) # Linux and Windows
+@@ -24,9 +24,9 @@ ELSE(APPLE) # Linux and Windows
      FIND_PACKAGE(LAPACKE)
  ENDIF(APPLE)
  
@@ -252,7 +252,7 @@ index 2cb8ddf..e4041ed 100644
  ENDIF()
  
  FILE(GLOB opencl_headers
-@@ -164,7 +165,7 @@ source_group(backend\\opencl\\kernel\\convolve\\Sources FILES ${conv_ker_sources
+@@ -163,7 +164,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})
  
@@ -261,7 +261,7 @@ index 2cb8ddf..e4041ed 100644
      FILE(GLOB magma_sources
          "magma/*.cpp")
  
-@@ -315,9 +316,9 @@ IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
+@@ -313,9 +314,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

