[arrayfire] 35/248: Merge branch 'devel' into heterogeneous_api

[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 be34055bb6964f72369200641a1bc76eca5b9209
Merge: 9f36a1d 5db4b02
Author: pradeep <pradeep at arrayfire.com>
Date:   Wed Sep 2 15:07:14 2015 -0400

    Merge branch 'devel' into heterogeneous_api

 src/api/c/approx.cpp                 |  30 ++++--
 src/backend/cpu/approx.cpp           | 198 ++++++++++++++++++-----------------
 src/backend/cuda/kernel/approx.hpp   | 121 +++++++++++----------
 src/backend/opencl/kernel/approx.hpp |  19 ++--
 src/backend/opencl/kernel/approx1.cl |  44 ++++----
 src/backend/opencl/kernel/approx2.cl |  59 ++++++-----
 test/approx1.cpp                     |  46 ++++++++
 test/approx2.cpp                     |  52 +++++++++
 8 files changed, 359 insertions(+), 210 deletions(-)

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