[arrayfire] 07/248: Merge branch 'devel' into stats_tests

[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 7f422f559421de6048d4297bd096e0c3499552bd
Merge: a736988 1a2b405
Author: pradeep <pradeep at arrayfire.com>
Date:   Mon Jul 13 15:34:16 2015 -0400

    Merge branch 'devel' into stats_tests

 CMakeModules/Version.cmake                        |  2 +
 CMakeModules/build_clFFT.cmake                    |  1 +
 CMakeModules/version.h.in                         |  1 +
 examples/machine_learning/deep_belief_net.cpp     |  6 --
 examples/machine_learning/logistic_regression.cpp |  6 --
 examples/machine_learning/neural_network.cpp      |  6 --
 examples/machine_learning/perceptron.cpp          |  6 --
 examples/machine_learning/rbm.cpp                 |  6 --
 include/af/arith.h                                | 19 +++++++
 include/af/index.h                                | 34 +++++++++++
 src/api/c/optypes.hpp                             |  2 +
 src/api/c/unary.cpp                               |  1 +
 src/api/cpp/index.cpp                             | 25 ++++++++
 src/api/cpp/unary.cpp                             |  1 +
 src/backend/cpu/CMakeLists.txt                    |  4 +-
 src/backend/cpu/memory.cpp                        |  4 ++
 src/backend/cpu/unary.hpp                         |  7 +++
 src/backend/cuda/JIT/exp.cu                       | 11 ++++
 src/backend/cuda/err_cuda.hpp                     | 33 ++++++-----
 src/backend/cuda/unary.hpp                        |  1 +
 src/backend/opencl/CMakeLists.txt                 |  4 +-
 src/backend/opencl/err_opencl.hpp                 | 22 +++++---
 src/backend/opencl/kernel/jit.cl                  |  1 +
 src/backend/opencl/unary.hpp                      |  1 +
 test/CMakeLists.txt                               |  7 ++-
 test/index.cpp                                    | 10 ++++
 test/manual_memory_test.cpp                       | 69 +++++++++++++++++++++++
 test/math.cpp                                     |  7 +++
 28 files changed, 238 insertions(+), 59 deletions(-)

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