[arrayfire] 01/08: Merge tag 'v3.3.2' into upstream/latest
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed May 4 13:38:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository arrayfire.
commit b6183497598566cf51faf3be5f643fd7a38f6338
Merge: a966cd3 f65dd97
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Apr 26 18:32:09 2016 +0100
Merge tag 'v3.3.2' into upstream/latest
CMakeModules/CPackConfig.cmake | 35 +-
CMakeModules/Version.cmake | 2 +-
CMakeModules/osx_install/OSXInstaller.cmake | 1 +
CMakeModules/osx_install/cpu_scripts/postinstall | 17 +-
CMakeModules/osx_install/cuda_scripts/postinstall | 17 +-
.../osx_install/opencl_scripts/postinstall | 17 +-
CMakeModules/osx_install/readme.html | 1 +
docs/details/data.dox | 4 +-
docs/pages/release_notes.md | 45 ++-
docs/pages/using_on_osx.md | 185 ++++++----
examples/CMakeLists.txt | 21 ++
include/af/algorithm.h | 12 -
include/af/data.h | 32 +-
include/af/defines.h | 4 -
include/af/opencl.h | 16 +-
src/api/c/binary.cpp | 5 +-
src/api/c/imageio.cpp | 2 +
src/api/c/median.cpp | 13 +-
src/api/c/moddims.cpp | 1 -
src/api/c/rgb_gray.cpp | 24 +-
src/api/c/sort.cpp | 22 +-
src/api/cpp/binary.cpp | 12 +-
src/backend/cpu/Array.hpp | 1 +
src/backend/cpu/CMakeLists.txt | 25 +-
src/backend/cpu/kernel/sort.hpp | 2 +-
src/backend/cpu/kernel/sort_by_key.hpp | 67 +---
.../{opencl => cpu/kernel}/sort_by_key/b8.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/f32.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/f64.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/s16.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/s32.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/s64.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/u16.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/u32.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/u64.cpp | 7 +-
.../{opencl => cpu/kernel}/sort_by_key/u8.cpp | 7 +-
src/backend/cpu/kernel/sort_by_key_impl.hpp | 172 ++++++++++
src/backend/cpu/kernel/sort_helper.hpp | 60 ++++
src/backend/cpu/kernel/sort_index.hpp | 71 ----
src/backend/cpu/platform.cpp | 11 +-
src/backend/cpu/sort.cpp | 63 +++-
src/backend/cpu/sort_by_key.cpp | 34 +-
src/backend/cpu/sort_index.cpp | 36 +-
src/backend/cuda/Array.hpp | 1 +
src/backend/cuda/CMakeLists.txt | 22 +-
src/backend/cuda/kernel/harris.hpp | 7 +-
src/backend/cuda/kernel/iota.hpp | 9 +-
src/backend/cuda/kernel/orb.hpp | 7 +-
src/backend/cuda/kernel/range.hpp | 14 +-
src/backend/cuda/kernel/sort.hpp | 95 +++++-
src/backend/cuda/kernel/sort_by_key.hpp | 37 +-
.../cuda/{ => kernel}/sort_by_key/ascd_f32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_f64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_s16.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_s32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_s64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_s8.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_u16.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_u32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_u64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/ascd_u8.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_f32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_f64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_s16.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_s32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_s64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_s8.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_u16.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_u32.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_u64.cu | 5 +-
.../cuda/{ => kernel}/sort_by_key/desc_u8.cu | 5 +-
src/backend/cuda/kernel/sort_by_key_impl.hpp | 215 ++++++++++++
src/backend/cuda/kernel/sort_index.hpp | 59 ----
src/backend/cuda/platform.cpp | 12 +-
src/backend/cuda/sort.cu | 22 +-
src/backend/cuda/sort_by_key.cu | 86 +++++
src/backend/cuda/sort_by_key_impl.hpp | 49 ---
src/backend/cuda/sort_index.cu | 35 +-
src/backend/host_memory.cpp | 2 +-
src/backend/opencl/Array.hpp | 1 +
src/backend/opencl/CMakeLists.txt | 34 +-
src/backend/opencl/kernel/harris.hpp | 7 +-
src/backend/opencl/kernel/iota.hpp | 9 +-
src/backend/opencl/kernel/orb.hpp | 7 +-
src/backend/opencl/kernel/range.hpp | 14 +-
src/backend/opencl/kernel/sort.hpp | 110 +++++-
src/backend/opencl/kernel/sort_by_key.hpp | 74 +---
src/backend/opencl/{ => kernel}/sort_by_key/b8.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/f32.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/f64.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/s16.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/s32.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/s64.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/u16.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/u32.cpp | 5 +-
.../opencl/{ => kernel}/sort_by_key/u64.cpp | 5 +-
src/backend/opencl/{ => kernel}/sort_by_key/u8.cpp | 5 +-
src/backend/opencl/kernel/sort_by_key_impl.hpp | 373 +++++++++++++++++++++
src/backend/opencl/kernel/sort_helper.hpp | 48 +++
src/backend/opencl/kernel/sort_index.hpp | 99 ------
src/backend/opencl/kernel/sort_pair.cl | 43 +++
src/backend/opencl/platform.cpp | 50 ++-
src/backend/opencl/sort.cpp | 23 +-
src/backend/opencl/sort_by_key.cpp | 90 +++++
src/backend/opencl/sort_by_key/impl.hpp | 57 ----
src/backend/opencl/sort_index.cpp | 40 ++-
src/backend/opencl/traits.hpp | 1 +
test/CMakeLists.txt | 25 ++
test/gray_rgb.cpp | 105 ++++++
test/median.cpp | 156 ++++++---
test/sort.cpp | 83 ++++-
test/sort_by_key.cpp | 106 +++++-
test/sort_index.cpp | 108 +++++-
113 files changed, 2667 insertions(+), 918 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