[arrayfire] 51/79: Merge remote-tracking branch 'upstream/hotfixes-3.0.1' into devel

[Ghislain Vaillant]

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

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

commit b3ae296273b5095fbedc80c9627a3950fe30ab0d
Merge: c7e20cd 901ce18
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Jun 10 12:26:07 2015 -0400

    Merge remote-tracking branch 'upstream/hotfixes-3.0.1' into devel

 CMakeModules/CUDACheckCompute.cmake                | 40 +++++-----
 CMakeModules/cuda_compute_capability.c             | 52 -------------
 CMakeModules/cuda_compute_capability.cpp           | 58 ++++++++++++++
 CPack.txt                                          | 11 +--
 README.md                                          |  8 +-
 docs/CMakeLists.txt                                |  1 +
 docs/details/image.dox                             | 29 -------
 docs/details/vision.dox                            | 61 +++++++++++++++
 docs/pages/using_with_linux.md                     |  6 +-
 examples/graphics/fractal.cpp                      | 13 ++--
 include/af/defines.h                               |  4 -
 include/af/image.h                                 | 36 ---------
 include/af/vision.h                                | 36 +++++++++
 include/arrayfire.h                                |  3 +
 src/api/c/match_template.cpp                       |  2 +-
 src/api/c/norm.cpp                                 |  4 +-
 src/api/cpp/array.cpp                              |  5 +-
 src/api/cpp/matchTemplate.cpp                      |  2 +-
 src/backend/ArrayInfo.hpp                          |  1 +
 src/backend/cpu/fftconvolve.cpp                    | 29 +++----
 src/backend/cpu/math.cpp                           |  1 +
 src/backend/cuda/CMakeLists.txt                    | 89 ++++++++++------------
 src/backend/cuda/fftconvolve.cu                    | 22 +++---
 src/backend/cuda/math.hpp                          |  1 +
 .../cpp/matchTemplate.cpp => backend/defines.hpp}  | 25 +++---
 src/backend/lapacke.cpp                            |  1 +
 src/backend/opencl/fftconvolve.cpp                 | 25 +++---
 src/backend/opencl/magma/magma_blas.h              |  1 +
 src/backend/opencl/platform.cpp                    |  1 +
 src/backend/opencl/traits.hpp                      |  1 +
 test/CMakeLists.txt                                |  2 +-
 test/array.cpp                                     |  2 +-
 test/constant.cpp                                  |  2 +-
 test/convolve.cpp                                  |  2 +-
 test/diagonal.cpp                                  |  6 +-
 test/fftconvolve.cpp                               | 63 +++++++++++++++
 test/getting_started.cpp                           |  2 +-
 test/matrix_manipulation.cpp                       |  2 +-
 test/median.cpp                                    |  2 +-
 39 files changed, 379 insertions(+), 272 deletions(-)


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