[arrayfire] 52/408: Merge pull request #853 from shehzan10/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 87ca992c5400afe6937190ea695457f2d837f157
Merge: 6f3e9f8 8540fa0
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Fri Jun 26 13:39:57 2015 -0400

    Merge pull request #853 from shehzan10/nearestNeighbour
    
    FEAT: Nearest Neighbour and complex dot

 docs/details/vision.dox                            |  20 ++
 include/af/blas.h                                  |  11 ++
 include/af/defines.h                               |   1 +
 include/af/vision.h                                |  61 ++++++
 src/api/c/blas.cpp                                 |  16 +-
 src/api/c/hamming.cpp                              |  54 +-----
 src/api/c/nearest_neighbour.cpp                    |  90 +++++++++
 src/api/cpp/hamming.cpp                            |   2 +-
 src/api/cpp/{hamming.cpp => nearest_neighbour.cpp} |   9 +-
 src/backend/cpu/blas.cpp                           |  43 +++-
 src/backend/cpu/hamming.cpp                        | 103 ----------
 src/backend/cpu/nearest_neighbour.cpp              | 175 +++++++++++++++++
 .../cpu/{hamming.hpp => nearest_neighbour.hpp}     |   9 +-
 src/backend/cuda/blas.cpp                          | 100 +++++++---
 src/backend/cuda/hamming.cu                        |  62 ------
 .../kernel/{hamming.hpp => nearest_neighbour.hpp}  | 157 ++++++++++-----
 src/backend/cuda/math.hpp                          |   4 +
 src/backend/cuda/nearest_neighbour.cu              |  79 ++++++++
 .../cuda/{hamming.hpp => nearest_neighbour.hpp}    |   9 +-
 src/backend/opencl/blas.cpp                        |  81 +++++---
 src/backend/opencl/hamming.cpp                     | 143 --------------
 .../kernel/{hamming.cl => nearest_neighbour.cl}    |  66 +++++--
 .../kernel/{hamming.hpp => nearest_neighbour.hpp}  |  57 ++++--
 src/backend/opencl/nearest_neighbour.cpp           | 165 ++++++++++++++++
 .../opencl/{hamming.hpp => nearest_neighbour.hpp}  |   9 +-
 test/data                                          |   2 +-
 test/dot.cpp                                       | 185 ++++++++++++++++++
 test/nearest_neighbour.cpp                         | 216 +++++++++++++++++++++
 28 files changed, 1391 insertions(+), 538 deletions(-)


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