[arrayfire] 106/248: Merge branch 'devel' into gloh
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:10 UTC 2015
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 e7facc8884c8fad07a78a763682187dee32ddd8d
Merge: eaa14d5 f9f3e7d
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date: Wed Oct 7 16:18:17 2015 -0400
Merge branch 'devel' into gloh
ArrayFireConfig.cmake.in | 30 +-
CMakeLists.txt | 7 +
CMakeModules/Version.cmake | 4 +-
docs/details/backend.dox | 32 ++
docs/details/data.dox | 25 ++
docs/details/index.dox | 6 +
docs/layout.xml | 1 +
docs/pages/getting_started.md | 2 +
docs/pages/unified_backend.md | 213 ++++++++++
docs/pages/using_on_linux.md | 23 +-
docs/pages/using_on_osx.md | 23 +-
docs/pages/using_on_windows.md | 12 +-
examples/CMakeLists.txt | 15 +
examples/CMakeModules/FindOpenCL.cmake | 34 +-
examples/unified/basic.cpp | 78 ++++
include/af/array.h | 44 +-
include/af/backend.h | 56 +++
include/af/cuda.h | 28 ++
include/af/defines.h | 23 +-
include/af/index.h | 62 +++
include/af/macros.h | 24 ++
include/af/opencl.h | 461 +++++++++++----------
include/af/statistics.h | 28 +-
include/af/traits.hpp | 20 +
include/af/util.h | 4 +-
include/arrayfire.h | 9 +
src/api/c/approx.cpp | 30 +-
src/api/c/assign.cpp | 6 +
src/api/c/bilateral.cpp | 2 +
src/api/c/binary.cpp | 8 +
src/api/c/cast.cpp | 2 +
src/api/c/convolve.cpp | 4 +
src/api/c/corrcoef.cpp | 2 +
src/api/c/covariance.cpp | 12 +-
src/api/c/data.cpp | 40 +-
src/api/c/device.cpp | 33 ++
src/api/c/diff.cpp | 4 +
src/api/c/dog.cpp | 12 +-
src/api/c/err_common.cpp | 6 +-
src/api/c/fast.cpp | 2 +
src/api/c/fftconvolve.cpp | 2 +
src/api/c/filters.cpp | 2 +
src/api/c/flip.cpp | 2 +
src/api/c/handle.hpp | 3 +
src/api/c/histeq.cpp | 2 +
src/api/c/histogram.cpp | 2 +
src/api/c/imageio.cpp | 38 +-
src/api/c/implicit.cpp | 6 +
src/api/c/index.cpp | 16 +-
src/api/c/join.cpp | 4 +
src/api/c/match_template.cpp | 2 +
src/api/c/mean.cpp | 131 +++---
src/api/c/meanshift.cpp | 2 +
src/api/c/median.cpp | 11 +-
src/api/c/moddims.cpp | 2 +
src/api/c/morph.cpp | 4 +
src/api/c/nearest_neighbour.cpp | 13 +-
src/api/c/print.cpp | 6 +
src/api/c/reduce.cpp | 16 +
src/api/c/regions.cpp | 2 +
src/api/c/reorder.cpp | 2 +
src/api/c/replace.cpp | 4 +
src/api/c/resize.cpp | 2 +
src/api/c/rgb_gray.cpp | 2 +
src/api/c/rotate.cpp | 2 +
src/api/c/sat.cpp | 2 +
src/api/c/scan.cpp | 2 +
src/api/c/select.cpp | 6 +
src/api/c/set.cpp | 6 +
src/api/c/shift.cpp | 2 +
src/api/c/sobel.cpp | 2 +
src/api/c/sort.cpp | 8 +
src/api/c/stats.h | 45 +-
src/api/c/stdev.cpp | 24 +-
src/api/c/stream.cpp | 4 +
src/api/c/susan.cpp | 2 +
src/api/c/tile.cpp | 2 +
src/api/c/transform.cpp | 2 +
src/api/c/transpose.cpp | 4 +
src/api/c/type_util.cpp | 10 +-
src/api/c/unwrap.cpp | 2 +
src/api/c/util.cpp | 81 ++++
src/api/c/var.cpp | 18 +-
src/api/c/where.cpp | 2 +
src/api/c/wrap.cpp | 2 +
src/api/cpp/array.cpp | 24 +-
src/api/cpp/corrcoef.cpp | 4 +
src/api/cpp/data.cpp | 2 +
src/api/cpp/device.cpp | 21 +-
src/api/cpp/features.cpp | 1 -
src/api/cpp/mean.cpp | 4 +
src/api/cpp/median.cpp | 6 +-
src/api/cpp/reduce.cpp | 6 +
src/api/cpp/seq.cpp | 4 +-
src/api/cpp/stdev.cpp | 4 +
src/api/cpp/timing.cpp | 8 +-
src/api/cpp/var.cpp | 2 +
src/api/unified/CMakeLists.txt | 72 ++++
src/api/unified/algorithm.cpp | 135 ++++++
src/api/unified/arith.cpp | 99 +++++
src/api/unified/array.cpp | 96 +++++
src/api/unified/blas.cpp | 36 ++
src/api/unified/data.cpp | 162 ++++++++
src/api/unified/device.cpp | 124 ++++++
src/api/unified/features.cpp | 44 ++
src/api/unified/graphics.cpp | 68 +++
src/api/unified/image.cpp | 209 ++++++++++
src/api/unified/index.cpp | 49 +++
src/api/unified/lapack.cpp | 84 ++++
src/api/unified/signal.cpp | 125 ++++++
src/api/unified/statistics.cpp | 82 ++++
src/api/unified/symbol_manager.cpp | 185 +++++++++
src/api/unified/symbol_manager.hpp | 75 ++++
src/api/unified/util.cpp | 58 +++
src/api/unified/vision.cpp | 63 +++
src/backend/ArrayInfo.cpp | 45 ++
src/backend/cblas.cpp | 31 +-
src/backend/cpu/Array.cpp | 2 +
src/backend/cpu/approx.cpp | 206 ++++-----
src/backend/cpu/assign.cpp | 2 +
src/backend/cpu/bilateral.cpp | 2 +
src/backend/cpu/blas.cpp | 37 +-
src/backend/cpu/convolve.cpp | 2 +
src/backend/cpu/copy.cpp | 54 ++-
src/backend/cpu/diagonal.cpp | 2 +
src/backend/cpu/diff.cpp | 2 +
src/backend/cpu/fast.cpp | 2 +
src/backend/cpu/fftconvolve.cpp | 4 +
src/backend/cpu/hist_graphics.cpp | 2 +
src/backend/cpu/histogram.cpp | 2 +
src/backend/cpu/identity.cpp | 4 +-
src/backend/cpu/image.cpp | 2 +
src/backend/cpu/index.cpp | 2 +
src/backend/cpu/iota.cpp | 2 +
src/backend/cpu/ireduce.cpp | 4 +
src/backend/cpu/join.cpp | 4 +
src/backend/cpu/lookup.cpp | 4 +
src/backend/cpu/match_template.cpp | 2 +
src/backend/cpu/meanshift.cpp | 2 +
src/backend/cpu/medfilt.cpp | 2 +
src/backend/cpu/memory.cpp | 2 +
src/backend/cpu/morph.cpp | 2 +
src/backend/cpu/nearest_neighbour.cpp | 13 +-
src/backend/cpu/plot.cpp | 2 +
src/backend/cpu/random.cpp | 2 +
src/backend/cpu/range.cpp | 2 +
src/backend/cpu/reduce.cpp | 38 +-
src/backend/cpu/regions.cpp | 2 +
src/backend/cpu/reorder.cpp | 2 +
src/backend/cpu/resize.cpp | 2 +
src/backend/cpu/rotate.cpp | 2 +
src/backend/cpu/scan.cpp | 2 +
src/backend/cpu/select.cpp | 2 +
src/backend/cpu/set.cpp | 2 +
src/backend/cpu/shift.cpp | 2 +
src/backend/cpu/sift_nonfree.hpp | 8 +-
src/backend/cpu/sobel.cpp | 2 +
src/backend/cpu/sort.cpp | 2 +
src/backend/cpu/sort_by_key.cpp | 5 +
src/backend/cpu/sort_index.cpp | 2 +
src/backend/cpu/susan.cpp | 2 +
src/backend/cpu/tile.cpp | 2 +
src/backend/cpu/transform.cpp | 2 +
src/backend/cpu/transpose.cpp | 2 +
src/backend/cpu/triangle.cpp | 2 +
src/backend/cpu/types.hpp | 1 +
src/backend/cpu/unwrap.cpp | 2 +
src/backend/cpu/where.cpp | 2 +
src/backend/cpu/wrap.cpp | 2 +
src/backend/cuda/Array.cpp | 2 +
src/backend/cuda/JIT/arith.cu | 2 +
src/backend/cuda/JIT/cast.cu | 20 +-
src/backend/cuda/JIT/exp.cu | 4 +
src/backend/cuda/JIT/hyper.cu | 2 +
src/backend/cuda/JIT/logic.cu | 8 +
src/backend/cuda/JIT/numeric.cu | 42 +-
src/backend/cuda/JIT/trig.cu | 4 +
src/backend/cuda/JIT/types.h | 1 +
src/backend/cuda/all.cu | 2 +
src/backend/cuda/any.cu | 2 +
src/backend/cuda/assign.cu | 8 +-
src/backend/cuda/bilateral.cu | 2 +
src/backend/cuda/convolve.cpp | 2 +
src/backend/cuda/copy.cu | 38 +-
src/backend/cuda/count.cu | 2 +
src/backend/cuda/diagonal.cu | 2 +
src/backend/cuda/diff.cu | 2 +
src/backend/cuda/dilate.cu | 2 +
src/backend/cuda/dilate3d.cu | 2 +
src/backend/cuda/erode.cu | 2 +
src/backend/cuda/erode3d.cu | 2 +
src/backend/cuda/fast.cu | 2 +
src/backend/cuda/fast_pyramid.cu | 2 +
src/backend/cuda/fftconvolve.cu | 2 +
src/backend/cuda/histogram.cu | 2 +
src/backend/cuda/identity.cu | 2 +
src/backend/cuda/index.cu | 6 +-
src/backend/cuda/iota.cu | 2 +
src/backend/cuda/ireduce.cu | 4 +
src/backend/cuda/jit.cpp | 2 +
src/backend/cuda/join.cu | 22 +-
src/backend/cuda/kernel/approx.hpp | 121 +++---
src/backend/cuda/kernel/convolve.cu | 14 +-
src/backend/cuda/kernel/convolve_separable.cu | 10 +-
src/backend/cuda/kernel/fast.hpp | 20 +
src/backend/cuda/kernel/memcopy.hpp | 2 +
src/backend/cuda/kernel/nearest_neighbour.hpp | 9 +
src/backend/cuda/kernel/shared.hpp | 2 +
src/backend/cuda/kernel/sift_nonfree.hpp | 14 +-
src/backend/cuda/lookup.cu | 4 +
src/backend/cuda/match_template.cu | 2 +
src/backend/cuda/math.hpp | 7 +
src/backend/cuda/max.cu | 2 +
src/backend/cuda/meanshift.cu | 2 +
src/backend/cuda/medfilt.cu | 2 +
src/backend/cuda/memory.cpp | 2 +
src/backend/cuda/min.cu | 2 +
src/backend/cuda/nearest_neighbour.cu | 2 +
src/backend/cuda/platform.cpp | 18 +
src/backend/cuda/platform.hpp | 2 +
src/backend/cuda/product.cu | 4 +-
src/backend/cuda/random.cu | 2 +
src/backend/cuda/range.cu | 2 +
src/backend/cuda/regions.cu | 2 +
src/backend/cuda/reorder.cu | 2 +
src/backend/cuda/resize.cu | 2 +
src/backend/cuda/rotate.cu | 2 +
src/backend/cuda/scan.cu | 2 +
src/backend/cuda/select.cu | 2 +
src/backend/cuda/set.cu | 2 +
src/backend/cuda/shift.cu | 2 +
src/backend/cuda/sobel.cu | 2 +
src/backend/cuda/sort.cu | 2 +
.../cuda/{dilate.cu => sort_by_key/ascd_s16.cu} | 11 +-
.../cuda/{dilate.cu => sort_by_key/ascd_u16.cu} | 11 +-
.../cuda/{dilate.cu => sort_by_key/desc_s16.cu} | 11 +-
.../cuda/{dilate.cu => sort_by_key/desc_u16.cu} | 11 +-
src/backend/cuda/sort_by_key_impl.hpp | 2 +
src/backend/cuda/sort_index.cu | 2 +
src/backend/cuda/sum.cu | 10 +
src/backend/cuda/susan.cu | 2 +
src/backend/cuda/tile.cu | 2 +
src/backend/cuda/transform.cu | 2 +
src/backend/cuda/transpose.cu | 2 +
src/backend/cuda/transpose_inplace.cu | 2 +
src/backend/cuda/triangle.cu | 2 +
src/backend/cuda/types.cpp | 8 +
src/backend/cuda/types.hpp | 3 +-
src/backend/cuda/unwrap.cu | 2 +
src/backend/cuda/where.cu | 2 +
src/backend/cuda/wrap.cu | 2 +
src/backend/defines.hpp | 4 +
src/backend/dim4.cpp | 46 +-
src/backend/opencl/Array.cpp | 2 +
src/backend/opencl/all.cpp | 2 +
src/backend/opencl/any.cpp | 2 +
src/backend/opencl/assign.cpp | 6 +-
src/backend/opencl/bilateral.cpp | 2 +
src/backend/opencl/convolve.cpp | 2 +
src/backend/opencl/convolve_separable.cpp | 2 +
src/backend/opencl/copy.cpp | 24 +-
src/backend/opencl/count.cpp | 2 +
src/backend/opencl/diagonal.cpp | 2 +
src/backend/opencl/diff.cpp | 2 +
src/backend/opencl/dilate.cpp | 2 +
src/backend/opencl/dilate3d.cpp | 2 +
src/backend/opencl/erode.cpp | 2 +
src/backend/opencl/erode3d.cpp | 2 +
src/backend/opencl/fast.cpp | 2 +
src/backend/opencl/fftconvolve.cpp | 2 +
src/backend/opencl/histogram.cpp | 2 +
src/backend/opencl/identity.cpp | 2 +
src/backend/opencl/index.cpp | 6 +-
src/backend/opencl/iota.cpp | 2 +
src/backend/opencl/ireduce.cpp | 4 +
src/backend/opencl/join.cpp | 4 +
src/backend/opencl/kernel/approx.hpp | 19 +-
src/backend/opencl/kernel/approx1.cl | 44 +-
src/backend/opencl/kernel/approx2.cl | 59 +--
src/backend/opencl/kernel/convolve/conv1.cpp | 2 +
.../{dilate.cpp => kernel/convolve/conv2_s16.cpp} | 15 +-
.../{dilate.cpp => kernel/convolve/conv2_u16.cpp} | 15 +-
src/backend/opencl/kernel/convolve/conv3.cpp | 2 +
src/backend/opencl/kernel/convolve_separable.cpp | 2 +
src/backend/opencl/kernel/fast.hpp | 2 +-
src/backend/opencl/kernel/sift_nonfree.hpp | 20 +-
src/backend/opencl/lookup.cpp | 4 +
src/backend/opencl/match_template.cpp | 2 +
src/backend/opencl/max.cpp | 2 +
src/backend/opencl/meanshift.cpp | 2 +
src/backend/opencl/medfilt.cpp | 2 +
src/backend/opencl/memory.cpp | 2 +
src/backend/opencl/min.cpp | 2 +
src/backend/opencl/nearest_neighbour.cpp | 2 +
src/backend/opencl/platform.cpp | 18 +
src/backend/opencl/platform.hpp | 2 +
src/backend/opencl/product.cpp | 2 +
src/backend/opencl/random.cpp | 2 +
src/backend/opencl/range.cpp | 2 +
src/backend/opencl/regions.cpp | 2 +
src/backend/opencl/reorder.cpp | 2 +
src/backend/opencl/resize.cpp | 2 +
src/backend/opencl/rotate.cpp | 2 +
src/backend/opencl/scan.cpp | 2 +
src/backend/opencl/select.cpp | 2 +
src/backend/opencl/set.cpp | 2 +
src/backend/opencl/shift.cpp | 2 +
src/backend/opencl/sobel.cpp | 2 +
src/backend/opencl/sort.cpp | 2 +
src/backend/opencl/sort_by_key/impl.hpp | 2 +
.../opencl/{dilate.cpp => sort_by_key/s16.cpp} | 12 +-
.../opencl/{dilate.cpp => sort_by_key/u16.cpp} | 12 +-
src/backend/opencl/sort_index.cpp | 2 +
src/backend/opencl/sum.cpp | 10 +
src/backend/opencl/susan.cpp | 2 +
src/backend/opencl/tile.cpp | 2 +
src/backend/opencl/transform.cpp | 2 +
src/backend/opencl/transpose.cpp | 2 +
src/backend/opencl/transpose_inplace.cpp | 2 +
src/backend/opencl/triangle.cpp | 2 +
src/backend/opencl/types.cpp | 2 +
src/backend/opencl/types.hpp | 1 +
src/backend/opencl/unwrap.cpp | 2 +
src/backend/opencl/where.cpp | 2 +
src/backend/opencl/wrap.cpp | 2 +
test/CMakeLists.txt | 21 +-
test/approx1.cpp | 46 ++
test/approx2.cpp | 52 +++
test/array.cpp | 22 +-
test/assign.cpp | 2 +-
test/bilateral.cpp | 2 +-
test/constant.cpp | 2 +-
test/convolve.cpp | 2 +-
test/corrcoef.cpp | 95 +++++
test/covariance.cpp | 135 ++++++
test/data | 2 +-
test/diff1.cpp | 2 +-
test/diff2.cpp | 2 +-
test/dog.cpp | 6 +-
test/fast.cpp | 2 +-
test/hamming.cpp | 4 +-
test/histogram.cpp | 2 +-
test/index.cpp | 4 +-
test/iota.cpp | 2 +-
test/join.cpp | 2 +-
test/match_template.cpp | 2 +-
test/mean.cpp | 206 ++++++---
test/meanshift.cpp | 2 +-
test/medfilt.cpp | 2 +-
test/median.cpp | 2 +
test/moddims.cpp | 2 +-
test/morph.cpp | 2 +-
test/nearest_neighbour.cpp | 14 +-
test/random.cpp | 2 +-
test/range.cpp | 2 +-
test/reduce.cpp | 14 +-
test/regions.cpp | 2 +-
test/reorder.cpp | 2 +-
test/replace.cpp | 2 +-
test/resize.cpp | 2 +-
test/rotate.cpp | 2 +-
test/rotate_linear.cpp | 2 +-
test/sat.cpp | 2 +-
test/scan.cpp | 4 +-
test/select.cpp | 2 +-
test/shift.cpp | 2 +-
test/sift_nonfree.cpp | 18 +-
test/sobel.cpp | 2 +-
test/sort.cpp | 2 +-
test/sort_by_key.cpp | 7 +-
test/sort_index.cpp | 7 +-
test/stdev.cpp | 207 +++++++++
test/susan.cpp | 2 +-
test/testHelpers.hpp | 41 +-
test/tile.cpp | 2 +-
test/translate.cpp | 2 +-
test/transpose.cpp | 2 +-
test/transpose_inplace.cpp | 2 +-
test/triangle.cpp | 2 +-
test/unwrap.cpp | 2 +-
test/var.cpp | 16 +-
test/where.cpp | 2 +-
test/wrap.cpp | 2 +-
test/write.cpp | 2 +-
384 files changed, 5268 insertions(+), 1034 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list