[arrayfire] 01/04: Merge branch 'master' into debian/sid

[Ghislain Vaillant]

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

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

commit eb1b99416f69638a8b45263c5ac2f2b58bffec2e
Merge: 621a107 d86f4f5
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jun 18 15:36:51 2015 +0100

    Merge branch 'master' into debian/sid

 .gitmodules                                        |   2 +-
 CMakeLists.txt                                     |  12 +-
 CMakeModules/CUDACheckCompute.cmake                |  48 +++----
 CMakeModules/FindForge.cmake                       |  15 +-
 CMakeModules/FindGLEWmx.cmake                      |   8 +-
 CMakeModules/FindGLFW.cmake                        |  60 --------
 CMakeModules/Version.cmake                         |   2 +-
 CMakeModules/build_forge.cmake                     |  16 +--
 CMakeModules/cuda_compute_capability.c             |  52 -------
 CMakeModules/cuda_compute_capability.cpp           |  58 ++++++++
 CMakeModules/osx_install/InstallTool.cmake         |   9 ++
 CMakeModules/osx_install/OSXInstaller.cmake        | 111 ++++++++++++++
 CMakeModules/osx_install/cpu_scripts/postinstall   |  24 ++++
 CMakeModules/osx_install/cuda_scripts/postinstall  |  23 +++
 CMakeModules/osx_install/distribution.dist         |  39 +++++
 .../osx_install/opencl_scripts/postinstall         |  23 +++
 CMakeModules/osx_install/readme.html               |  22 +++
 CMakeModules/osx_install/welcome.html              |  27 ++++
 CPack.txt => CPack.cmake                           |  25 ++--
 README.md                                          |  11 +-
 docs/CMakeLists.txt                                |   1 +
 docs/details/image.dox                             |  29 ----
 docs/details/vision.dox                            |  61 ++++++++
 docs/layout.xml                                    |   5 +-
 docs/pages/release_notes.md                        |  25 ++++
 .../{using_with_linux.md => using_on_linux.md}     |   6 +-
 .../pages/{using_with_linux.md => using_on_osx.md} |  72 ++--------
 ...sing_with_ms_windows.md => using_on_windows.md} |   9 +-
 examples/CMakeLists.txt                            |  10 +-
 examples/graphics/fractal.cpp                      |  13 +-
 examples/graphics/histogram.cpp                    |   2 +-
 examples/machine_learning/deep_belief_net.cpp      |   4 +-
 examples/machine_learning/neural_network.cpp       |   2 +-
 examples/machine_learning/rbm.cpp                  |   2 +-
 include/af/defines.h                               |   4 -
 include/af/image.h                                 |  36 -----
 include/af/vision.h                                |  36 +++++
 include/arrayfire.h                                |   3 +
 src/api/c/graphics_common.cpp                      |  20 +--
 src/api/c/graphics_common.hpp                      |   8 +-
 src/api/c/image.cpp                                |  25 +++-
 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/CMakeLists.txt                     |  25 ++--
 src/backend/cpu/fftconvolve.cpp                    |  29 ++--
 src/backend/cpu/math.cpp                           |   1 +
 src/backend/cuda/CMakeLists.txt                    | 159 +++++++++++++--------
 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/CMakeLists.txt                  |  47 ++----
 src/backend/opencl/fftconvolve.cpp                 |  25 ++--
 src/backend/opencl/magma/magma_blas.h              |   1 +
 src/backend/opencl/platform.cpp                    |   2 +-
 src/backend/opencl/traits.hpp                      |   1 +
 test/CMakeLists.txt                                |  15 +-
 test/array.cpp                                     |   2 +-
 src/api/cpp/matchTemplate.cpp => test/basic_c.c    |  17 +--
 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 +-
 69 files changed, 880 insertions(+), 546 deletions(-)

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