[arrayfire] 40/408: Merge remote-tracking branch 'upstream/devel' into nearestNeighbour

[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 7f9b423d78c7a7a2f6cb170ed1af058445ccf8c3
Merge: f3d4660 d6bf32e
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Jun 24 17:40:45 2015 -0400

    Merge remote-tracking branch 'upstream/devel' into nearestNeighbour

 docs/details/image.dox                | 105 +++++++++++++++++++++
 examples/image_processing/filters.cpp |   6 +-
 include/af/array.h                    |  19 +++-
 include/af/defines.h                  |   3 +-
 include/af/device.h                   |  30 +++++-
 include/af/image.h                    |  62 +++++++++++++
 include/af/index.h                    |  18 ++++
 src/api/c/blas.cpp                    |   4 +-
 src/api/c/device.cpp                  |  73 +++++++++++++++
 src/api/c/dog.cpp                     |  69 ++++++++++++++
 src/api/c/index.cpp                   |   1 -
 src/api/c/resize.cpp                  |   5 +-
 src/api/c/unwrap.cpp                  |  63 +++++++++++++
 src/api/cpp/array.cpp                 |  10 +-
 src/api/cpp/dog.cpp                   |  24 +++++
 src/api/cpp/index.cpp                 |  18 ++++
 src/api/cpp/unwrap.cpp                |  24 +++++
 src/backend/ArrayInfo.hpp             |   5 +-
 src/backend/cpu/Array.cpp             |  28 +++---
 src/backend/cpu/Array.hpp             |  53 +++++++++--
 src/backend/cpu/blas.cpp              |   2 +
 src/backend/cpu/memory.cpp            |  42 +++++----
 src/backend/cpu/memory.hpp            |   3 +-
 src/backend/cpu/resize.cpp            |  30 ++++++
 src/backend/cpu/unwrap.cpp            | 116 +++++++++++++++++++++++
 src/backend/cpu/unwrap.hpp            |  18 ++++
 src/backend/cuda/Array.cpp            |  27 +++---
 src/backend/cuda/Array.hpp            |  46 +++++++++-
 src/backend/cuda/blas.cpp             |  12 +++
 src/backend/cuda/kernel/resize.hpp    |  25 +++++
 src/backend/cuda/kernel/unwrap.hpp    | 108 ++++++++++++++++++++++
 src/backend/cuda/memory.cpp           |  53 +++++++----
 src/backend/cuda/memory.hpp           |   3 +-
 src/backend/cuda/resize.cu            |   3 +
 src/backend/cuda/unwrap.cu            |  63 +++++++++++++
 src/backend/cuda/unwrap.hpp           |  18 ++++
 src/backend/dim4.cpp                  |   3 +
 src/backend/opencl/Array.cpp          |  33 ++++---
 src/backend/opencl/Array.hpp          |  45 ++++++++-
 src/backend/opencl/blas.cpp           |  15 +++
 src/backend/opencl/kernel/resize.cl   |  21 +++++
 src/backend/opencl/kernel/resize.hpp  |   3 +-
 src/backend/opencl/kernel/unwrap.cl   |  86 +++++++++++++++++
 src/backend/opencl/kernel/unwrap.hpp  |  94 +++++++++++++++++++
 src/backend/opencl/memory.cpp         |  46 ++++++----
 src/backend/opencl/memory.hpp         |   4 +-
 src/backend/opencl/resize.cpp         |   3 +
 src/backend/opencl/unwrap.cpp         |  64 +++++++++++++
 src/backend/opencl/unwrap.hpp         |  18 ++++
 test/assign.cpp                       |  38 +++++++-
 test/dog.cpp                          |  75 +++++++++++++++
 test/memory.cpp                       | 123 +++++++++++++++++++------
 test/memory_lock.cpp                  |  95 +++++++++++++++++++
 test/unwrap.cpp                       | 167 ++++++++++++++++++++++++++++++++++
 54 files changed, 1964 insertions(+), 158 deletions(-)

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