[arrayfire] 124/284: Merge remote-tracking branch 'arrayfire/master' into devel
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.
commit 2ae82739739d80bbb47d6726c76cb8aabd884902
Merge: 951533c 7507b61
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date: Wed Dec 30 15:23:14 2015 -0500
Merge remote-tracking branch 'arrayfire/master' into devel
CMakeLists.txt | 3 +
CMakeModules/FindLAPACKE.cmake | 6 +-
CMakeModules/MinBuildTime.cmake | 93 +++++++++++++++++++++++
CMakeModules/build_clBLAS.cmake | 6 +-
CMakeModules/build_clFFT.cmake | 6 +-
CMakeModules/build_forge.cmake | 2 +-
docs/arrayfire.css | 5 ++
docs/details/backend.dox | 9 +++
docs/pages/release_notes.md | 75 ++++++++++++++++++
examples/graphics/plot3.cpp | 4 +-
include/af/arith.h | 2 +-
include/af/array.h | 2 +-
include/af/data.h | 12 +--
include/af/macros.h | 61 +++++++++++++++
src/api/c/colorspace.cpp | 63 ++++++++-------
src/api/c/err_common.cpp | 84 +++++++++++---------
src/api/c/err_common.hpp | 122 ++++++++++++++++++++----------
src/api/c/graphics_common.hpp | 6 +-
src/api/c/hist.cpp | 2 +-
src/api/c/image.cpp | 18 ++---
src/api/c/imageio.cpp | 17 ++---
src/api/c/imageio2.cpp | 8 +-
src/api/c/plot.cpp | 2 +-
src/api/c/plot3.cpp | 2 +-
src/api/c/print.cpp | 24 ++++--
src/api/c/surface.cpp | 2 +-
src/api/cpp/array.cpp | 10 +--
src/api/cpp/error.hpp | 12 ++-
src/api/cpp/gfor.cpp | 2 +-
src/api/cpp/seq.cpp | 4 +-
src/api/cpp/where.cpp | 2 +-
src/api/unified/data.cpp | 6 +-
src/api/unified/symbol_manager.cpp | 47 ++++++++++--
src/api/unified/symbol_manager.hpp | 2 +-
src/backend/cpu/err_cpu.hpp | 5 +-
src/backend/cpu/random.cpp | 2 +-
src/backend/cuda/err_cuda.hpp | 3 +-
src/backend/cuda/platform.cpp | 25 ++++--
src/backend/defines.hpp | 24 +++++-
src/backend/opencl/err_opencl.hpp | 5 +-
src/backend/opencl/magma/labrd.cpp | 119 +++++++++++++++--------------
src/backend/opencl/magma/magma_cpu_blas.h | 31 +++++---
test/CMakeLists.txt | 38 +++++++---
test/backend.cpp | 66 ++++++++++++++++
test/bilateral.cpp | 1 +
test/cholesky_dense.cpp | 1 +
test/fast.cpp | 2 +
test/gloh_nonfree.cpp | 2 +
test/harris.cpp | 2 +
test/homography.cpp | 3 +
test/imageio.cpp | 12 +++
test/info.cpp | 25 +-----
test/inverse_dense.cpp | 1 +
test/lu_dense.cpp | 3 +
test/meanshift.cpp | 2 +
test/medfilt.cpp | 1 +
test/morph.cpp | 2 +
test/orb.cpp | 2 +
test/qr_dense.cpp | 2 +
test/rank_dense.cpp | 7 ++
test/sift_nonfree.cpp | 2 +
test/solve_dense.cpp | 6 ++
test/susan.cpp | 1 +
test/svd_dense.cpp | 1 +
test/testHelpers.hpp | 33 ++++++++
65 files changed, 852 insertions(+), 298 deletions(-)
diff --cc src/api/c/graphics_common.hpp
index 8c7607f,082c0c7..53d4629
--- a/src/api/c/graphics_common.hpp
+++ b/src/api/c/graphics_common.hpp
@@@ -26,11 -26,10 +26,11 @@@ GLenum glErrorSkip(const char *msg, con
GLenum glErrorCheck(const char *msg, const char* file, int line);
GLenum glForceErrorCheck(const char *msg, const char* file, int line);
- #define CheckGL(msg) glErrorCheck (msg, __FILE__, __LINE__)
- #define ForceCheckGL(msg) glForceErrorCheck(msg, __FILE__, __LINE__)
- #define CheckGLSkip(msg) glErrorSkip (msg, __FILE__, __LINE__)
+ #define CheckGL(msg) glErrorCheck (msg, __AF_FILENAME__, __LINE__)
+ #define ForceCheckGL(msg) glForceErrorCheck(msg, __AF_FILENAME__, __LINE__)
+ #define CheckGLSkip(msg) glErrorSkip (msg, __AF_FILENAME__, __LINE__)
+fg::MarkerType getFGMarker(const af_marker_type af_marker);
namespace graphics
{
diff --cc src/api/c/plot.cpp
index a2c026b,26b58a8..273d922
--- a/src/api/c/plot.cpp
+++ b/src/api/c/plot.cpp
@@@ -99,25 -101,7 +99,25 @@@ af_err plotWrapper(const af_window wind
}
CATCHALL;
return AF_SUCCESS;
+}
+
+#endif // WITH_GRAPHICS
+
+af_err af_draw_plot(const af_window wind, const af_array X, const af_array Y, const af_cell* const props)
+{
+#if defined(WITH_GRAPHICS)
+ return plotWrapper(wind, X, Y, props);
+#else
+ return AF_ERR_NO_GFX;
+#endif
+}
+
+af_err af_draw_scatter(const af_window wind, const af_array X, const af_array Y, const af_marker_type af_marker, const af_cell* const props)
+{
+#if defined(WITH_GRAPHICS)
+ fg::MarkerType fg_marker = getFGMarker(af_marker);
+ return plotWrapper(wind, X, Y, props, fg::FG_SCATTER, fg_marker);
#else
- return AF_ERR_NO_GFX;
+ AF_RETURN_ERROR("ArrayFire compiled without graphics support", AF_ERR_NO_GFX);
#endif
}
diff --cc src/api/c/plot3.cpp
index d21a399,1ef30e6..4e87424
--- a/src/api/c/plot3.cpp
+++ b/src/api/c/plot3.cpp
@@@ -105,25 -107,7 +105,25 @@@ af_err plot3Wrapper(const af_window win
}
CATCHALL;
return AF_SUCCESS;
+}
+
+#endif // WITH_GRAPHICS
+
+af_err af_draw_plot3(const af_window wind, const af_array P, const af_cell* const props)
+{
+#if defined(WITH_GRAPHICS)
+ return plot3Wrapper(wind, P, props);
+#else
+ return AF_ERR_NO_GFX;
+#endif
+}
+
+af_err af_draw_scatter3(const af_window wind, const af_array P, const af_marker_type af_marker, const af_cell* const props)
+{
+#if defined(WITH_GRAPHICS)
+ fg::MarkerType fg_marker = getFGMarker(af_marker);
+ return plot3Wrapper(wind, P, props, fg::FG_SCATTER, fg_marker);
#else
- return AF_ERR_NO_GFX;
+ AF_RETURN_ERROR("ArrayFire compiled without graphics support", AF_ERR_NO_GFX);
#endif
}
diff --cc test/CMakeLists.txt
index 6a41432,44192ed..d341164
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -185,8 -187,8 +187,9 @@@ ELSE(
MESSAGE(STATUS "TESTS: CUDA backend is OFF. CUDA was not found")
ENDIF()
+ # OpenCL Backend
IF (${OpenCL_FOUND})
+ INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIRS})
IF(${ArrayFire_OpenCL_FOUND}) # variable defined by FIND(ArrayFire ...)
MESSAGE(STATUS "TESTS: OpenCL backend is ON.")
CREATE_TESTS(opencl ${ArrayFire_OpenCL_LIBRARIES} "${GTEST_LIBRARIES}" "${OpenCL_LIBRARIES}")
--
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