[arrayfire] 150/248: Merge branch 'syurkevi-surface_plot' into devel
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:18 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 33de00a5d3bc5409354e0642413717230bdc9136
Merge: 97bed15 9436f10
Author: pradeep <pradeep at arrayfire.com>
Date: Thu Oct 29 15:03:32 2015 -0400
Merge branch 'syurkevi-surface_plot' into devel
Fixes #1066
CMakeModules/build_forge.cmake | 2 +-
examples/graphics/plot3.cpp | 58 ++++++++++
examples/graphics/surface.cpp | 55 +++++++++
include/af/graphics.h | 69 +++++++++++
src/api/c/graphics_common.cpp | 56 +++++++--
src/api/c/graphics_common.hpp | 18 ++-
src/api/c/hist.cpp | 3 +-
src/api/c/image.cpp | 4 +-
src/api/c/plot.cpp | 3 +-
src/api/c/plot3.cpp | 111 ++++++++++++++++++
src/api/c/surface.cpp | 133 ++++++++++++++++++++++
src/api/cpp/graphics.cpp | 21 ++++
src/api/unified/graphics.cpp | 10 ++
src/backend/cpu/plot3.cpp | 48 ++++++++
src/backend/{opencl/plot.hpp => cpu/plot3.hpp} | 5 +-
src/backend/cpu/surface.cpp | 48 ++++++++
src/backend/{opencl/plot.hpp => cpu/surface.hpp} | 5 +-
src/backend/cuda/interopManager.cu | 34 ++++++
src/backend/cuda/interopManager.hpp | 2 +
src/backend/cuda/plot3.cu | 59 ++++++++++
src/backend/{opencl/plot.hpp => cuda/plot3.hpp} | 5 +-
src/backend/cuda/surface.cu | 59 ++++++++++
src/backend/{opencl/plot.hpp => cuda/surface.hpp} | 5 +-
src/backend/opencl/interopManager.cpp | 24 ++++
src/backend/opencl/interopManager.hpp | 2 +
src/backend/opencl/plot.hpp | 1 -
src/backend/opencl/plot3.cpp | 70 ++++++++++++
src/backend/opencl/{plot.hpp => plot3.hpp} | 3 +-
src/backend/opencl/surface.cpp | 73 ++++++++++++
src/backend/opencl/{plot.hpp => surface.hpp} | 2 +-
30 files changed, 952 insertions(+), 36 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