[arrayfire] 338/408: Merge remote-tracking branch 'upstream/devel' into svd
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Sep 21 19:12:25 UTC 2015
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 c265948712c61999a482c6a421ae1b38dc44258d
Merge: eb66094 f52389e
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date: Tue Aug 25 02:28:25 2015 -0400
Merge remote-tracking branch 'upstream/devel' into svd
CMakeLists.txt | 26 +
CMakeModules/Version.cmake | 19 +-
CMakeModules/build_boost_compute.cmake | 4 +-
CMakeModules/version.h.in | 3 +-
COPYRIGHT.md | 12 +-
LICENSES/OpenSIFT License.txt | 57 +
docs/details/image.dox | 52 +-
docs/details/util.dox | 148 +
docs/details/vision.dox | 29 +
docs/pages/using_on_linux.md | 2 +-
include/af/algorithm.h | 17 +-
include/af/arith.h | 5 +-
include/af/array.h | 42 +-
include/af/cuda.h | 8 +
include/af/data.h | 23 +-
include/af/defines.h | 32 +
include/af/device.h | 4 +
include/af/graphics.h | 2 +
include/af/image.h | 247 +-
include/af/index.h | 4 +-
include/af/signal.h | 40 +
include/af/util.h | 158 +-
include/af/vision.h | 115 +-
include/arrayfire.h | 3 +
src/api/c/assign.cpp | 2 +-
src/api/c/dog.cpp | 1 +
src/api/c/imageio.cpp | 336 +-
src/api/c/print.cpp | 107 +-
src/api/c/sift.cpp | 90 +
src/api/c/stream.cpp | 360 +
src/api/c/transpose.cpp | 16 +-
src/api/c/unwrap.cpp | 31 +-
src/api/c/wrap.cpp | 78 +
src/api/cpp/array.cpp | 28 +-
src/api/cpp/dog.cpp | 2 +-
src/api/cpp/imageio.cpp | 19 +
src/api/cpp/sift.cpp | 34 +
src/api/cpp/unwrap.cpp | 5 +-
src/api/cpp/util.cpp | 41 +-
src/api/cpp/{unwrap.cpp => wrap.cpp} | 13 +-
src/backend/cpu/platform.cpp | 177 +-
src/backend/cpu/sift.cpp | 62 +
src/backend/cpu/sift.hpp | 26 +
src/backend/cpu/sift_nonfree.hpp | 1033 ++
src/backend/cpu/unwrap.cpp | 44 +-
src/backend/cpu/unwrap.hpp | 3 +-
src/backend/cpu/wrap.cpp | 122 +
src/backend/cpu/{unwrap.hpp => wrap.hpp} | 11 +-
src/backend/cuda/kernel/atomics.hpp | 59 +
src/backend/cuda/kernel/orb.hpp | 40 +-
src/backend/cuda/kernel/sift_nonfree.hpp | 1370 +++
src/backend/cuda/kernel/unwrap.hpp | 103 +-
src/backend/cuda/kernel/wrap.hpp | 113 +
src/backend/cuda/sift.cu | 89 +
src/backend/cuda/sift.hpp | 26 +
src/backend/cuda/unwrap.cu | 26 +-
src/backend/cuda/unwrap.hpp | 3 +-
src/backend/cuda/wrap.cu | 57 +
src/backend/cuda/{unwrap.hpp => wrap.hpp} | 11 +-
src/backend/opencl/CMakeLists.txt | 6 +-
src/{api/cpp/dog.cpp => backend/opencl/cache.hpp} | 23 +-
src/backend/opencl/cl.hpp | 10802 ++++++++++---------
src/backend/opencl/convolve_separable.cpp | 44 +-
src/backend/opencl/jit.cpp | 8 +-
src/backend/opencl/kernel/approx.hpp | 11 +-
src/backend/opencl/kernel/approx1.cl | 9 +-
src/backend/opencl/kernel/approx2.cl | 10 +-
src/backend/opencl/kernel/convolve/conv2_impl.hpp | 117 +-
src/backend/opencl/kernel/convolve_separable.cpp | 131 +
src/backend/opencl/kernel/convolve_separable.hpp | 79 +-
src/backend/opencl/kernel/fast.hpp | 98 +-
src/backend/opencl/kernel/gradient.cl | 3 +-
src/backend/opencl/kernel/gradient.hpp | 7 +-
src/backend/opencl/kernel/harris.hpp | 47 +-
src/backend/opencl/kernel/ireduce.hpp | 177 +-
src/backend/opencl/kernel/nearest_neighbour.hpp | 55 +-
src/backend/opencl/kernel/orb.hpp | 8 +-
src/backend/opencl/kernel/reduce.hpp | 235 +-
src/backend/opencl/kernel/rotate.hpp | 5 +
src/backend/opencl/kernel/scan_dim.hpp | 207 +-
src/backend/opencl/kernel/scan_first.hpp | 196 +-
src/backend/opencl/kernel/set.hpp | 67 -
src/backend/opencl/kernel/sift_nonfree.cl | 806 ++
src/backend/opencl/kernel/sift_nonfree.hpp | 776 ++
src/backend/opencl/kernel/transform.hpp | 7 +-
src/backend/opencl/kernel/transform_interp.cl | 4 +-
src/backend/opencl/kernel/unwrap.cl | 55 +-
src/backend/opencl/kernel/unwrap.hpp | 91 +-
src/backend/opencl/kernel/where.hpp | 7 +-
src/backend/opencl/kernel/wrap.cl | 74 +
src/backend/opencl/kernel/wrap.hpp | 112 +
src/backend/opencl/nearest_neighbour.cpp | 54 +-
src/backend/opencl/platform.cpp | 25 +-
src/backend/opencl/scan.cpp | 12 +-
src/backend/opencl/sift.cpp | 82 +
src/backend/opencl/sift.hpp | 26 +
.../opencl/{kernel/set.cl => sort_by_key/b8.cpp} | 14 +-
.../opencl/{kernel/set.cl => sort_by_key/f32.cpp} | 14 +-
.../opencl/{kernel/set.cl => sort_by_key/f64.cpp} | 14 +-
.../{sort_by_key.cpp => sort_by_key/impl.hpp} | 34 +-
.../opencl/{kernel/set.cl => sort_by_key/s32.cpp} | 14 +-
.../opencl/{kernel/set.cl => sort_by_key/u32.cpp} | 14 +-
.../opencl/{kernel/set.cl => sort_by_key/u8.cpp} | 14 +-
src/backend/opencl/traits.hpp | 10 -
src/backend/opencl/unwrap.cpp | 24 +-
src/backend/opencl/unwrap.hpp | 3 +-
src/backend/opencl/wrap.cpp | 57 +
src/backend/opencl/{unwrap.hpp => wrap.hpp} | 12 +-
test/CMakeLists.txt | 2 +-
test/array.cpp | 16 +
test/data | 2 +-
test/dog.cpp | 1 +
test/getting_started.cpp | 8 +-
test/imageio.cpp | 64 +
test/sift_nonfree.cpp | 336 +
test/transpose.cpp | 18 +-
test/unwrap.cpp | 38 +-
test/wrap.cpp | 179 +
118 files changed, 14348 insertions(+), 6606 deletions(-)
diff --cc src/backend/opencl/cl.hpp
index d16dca3,5c9be5c..ce56c66
--- a/src/backend/opencl/cl.hpp
+++ b/src/backend/opencl/cl.hpp
@@@ -12447,11 -12898,9 +12902,10 @@@ public
#undef __DEFAULT_BEING_INITIALIZED
#undef __DEFAULT_INITIALIZED
- } // namespace cl
+ #undef CL_HPP_RVALUE_REFERENCES_SUPPORTED
+ #undef CL_HPP_NOEXCEPT
- #ifdef _WIN32
- #pragma pop_macro("max")
- #endif // _WIN32
+ } // namespace cl
#endif // CL_HPP_
+#pragma GCC diagnostic pop
--
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