[arrayfire] 97/248: Merge remote-tracking branch 'upstream/hotfixes-3.1.3' into devel

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit f9f3e7de99b9bf6e9f6827ccdb4e52339a40032a
Merge: 63807f4 2c3b475
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Oct 7 13:10:39 2015 -0400

    Merge remote-tracking branch 'upstream/hotfixes-3.1.3' into devel
    
    Conflicts:
    	CMakeModules/Version.cmake

 CMakeLists.txt                             |  5 ----
 CMakeModules/FindOpenCL.cmake              | 34 ++++++++++++++++++++++-----
 docs/details/data.dox                      | 25 ++++++++++++++++++++
 examples/CMakeModules/FindOpenCL.cmake     | 34 ++++++++++++++++++++++-----
 src/api/c/imageio.cpp                      |  2 +-
 src/api/c/median.cpp                       |  7 ++++--
 src/backend/cblas.cpp                      | 30 ++++++++++++++++++++++--
 src/backend/cpu/blas.cpp                   | 37 ++++++++++++++++++++++++++----
 src/backend/cpu/math.cpp                   |  3 ---
 src/backend/cpu/math.hpp                   |  3 ---
 src/backend/cpu/platform.cpp               | 10 +++-----
 src/backend/cpu/sift_nonfree.hpp           | 17 +++++++-------
 src/backend/cuda/driver.cpp                |  2 +-
 src/backend/cuda/kernel/sift_nonfree.hpp   | 25 ++++++++++----------
 src/backend/cuda/platform.cpp              | 13 ++++-------
 src/backend/opencl/kernel/sift_nonfree.cl  |  5 ++--
 src/backend/opencl/kernel/sift_nonfree.hpp | 24 +++++++++++++++----
 src/backend/opencl/platform.cpp            | 10 +++-----
 test/data                                  |  2 +-
 test/sift_nonfree.cpp                      | 22 +++++++++++++-----
 20 files changed, 218 insertions(+), 92 deletions(-)

diff --cc src/backend/cblas.cpp
index 6d839e2,bea65b9..4d99d45
--- a/src/backend/cblas.cpp
+++ b/src/backend/cblas.cpp
@@@ -7,11 -7,34 +7,35 @@@
   * http://arrayfire.com/licenses/BSD-3-Clause
  ********************************************************/
  
- #include <blas.hpp>
- 
  #ifdef USE_F77_BLAS
+ 
+ #ifdef AF_CPU
+     #include <blas.hpp>
+ #else
+     #ifdef __APPLE__
+         #include <Accelerate/Accelerate.h>
+     #else
+         #ifdef USE_MKL
+             #include <mkl_cblas.h>
+         #else
+             extern "C" {
+                 #include <cblas.h>
+             }
+         #endif
+     #endif
+ 
+     // TODO: Ask upstream for a more official way to detect it
+     #ifdef OPENBLAS_CONST
+         #define IS_OPENBLAS
+     #endif
+ 
+     #ifndef IS_OPENBLAS
+         typedef int blasint;
+     #endif
+ #endif
+ 
  #define ADD_
 +#include <cblas.h>
  #include <cblas_f77.h>
  
  static char transChar(CBLAS_TRANSPOSE Trans)

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