[arrayfire] 38/248: Added missing functions hapi wrapper

[Ghislain Vaillant]

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 15b0221583c7f205833f6b396700b5beb451bb73
Author: pradeep <pradeep at arrayfire.com>
Date:   Wed Sep 2 18:01:55 2015 -0400

    Added missing functions hapi wrapper
---
 src/api/cpp/features.cpp |  1 -
 src/api/hapi/arith.cpp   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/hapi/signal.cpp  | 26 ++++++++++++++--------
 3 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/src/api/cpp/features.cpp b/src/api/cpp/features.cpp
index be9e160..9cf2369 100644
--- a/src/api/cpp/features.cpp
+++ b/src/api/cpp/features.cpp
@@ -9,7 +9,6 @@
 
 #include <af/features.h>
 #include <af/array.h>
-#include <handle.hpp>
 #include "error.hpp"
 
 namespace af
diff --git a/src/api/hapi/arith.cpp b/src/api/hapi/arith.cpp
index a15f830..a4d3f30 100644
--- a/src/api/hapi/arith.cpp
+++ b/src/api/hapi/arith.cpp
@@ -28,6 +28,7 @@ BINARY_HAPI_DEF(af_mod)
 BINARY_HAPI_DEF(af_pow)
 BINARY_HAPI_DEF(af_root)
 BINARY_HAPI_DEF(af_atan2)
+BINARY_HAPI_DEF(af_cplx2)
 BINARY_HAPI_DEF(af_eq)
 BINARY_HAPI_DEF(af_neq)
 BINARY_HAPI_DEF(af_gt)
@@ -41,3 +42,58 @@ BINARY_HAPI_DEF(af_bitor)
 BINARY_HAPI_DEF(af_bitxor)
 BINARY_HAPI_DEF(af_bitshiftl)
 BINARY_HAPI_DEF(af_bitshiftr)
+BINARY_HAPI_DEF(af_hypot)
+
+af_err af_cast(af_array *out, const af_array in, const af_dtype type)
+{
+    return CALL(out, in, type);
+}
+
+#define UNARY_HAPI_DEF(af_func) \
+af_err af_func(af_array* out, const af_array in) \
+{ \
+    return CALL(out, in); \
+}
+
+UNARY_HAPI_DEF(af_abs)
+UNARY_HAPI_DEF(af_arg)
+UNARY_HAPI_DEF(af_sign)
+UNARY_HAPI_DEF(af_round)
+UNARY_HAPI_DEF(af_trunc)
+UNARY_HAPI_DEF(af_floor)
+UNARY_HAPI_DEF(af_ceil)
+UNARY_HAPI_DEF(af_sin)
+UNARY_HAPI_DEF(af_cos)
+UNARY_HAPI_DEF(af_tan)
+UNARY_HAPI_DEF(af_asin)
+UNARY_HAPI_DEF(af_acos)
+UNARY_HAPI_DEF(af_atan)
+UNARY_HAPI_DEF(af_cplx)
+UNARY_HAPI_DEF(af_real)
+UNARY_HAPI_DEF(af_imag)
+UNARY_HAPI_DEF(af_conjg)
+UNARY_HAPI_DEF(af_sinh)
+UNARY_HAPI_DEF(af_cosh)
+UNARY_HAPI_DEF(af_tanh)
+UNARY_HAPI_DEF(af_asinh)
+UNARY_HAPI_DEF(af_acosh)
+UNARY_HAPI_DEF(af_atanh)
+UNARY_HAPI_DEF(af_pow2)
+UNARY_HAPI_DEF(af_exp)
+UNARY_HAPI_DEF(af_sigmoid)
+UNARY_HAPI_DEF(af_expm1)
+UNARY_HAPI_DEF(af_erf)
+UNARY_HAPI_DEF(af_erfc)
+UNARY_HAPI_DEF(af_log)
+UNARY_HAPI_DEF(af_log1p)
+UNARY_HAPI_DEF(af_log10)
+UNARY_HAPI_DEF(af_log2)
+UNARY_HAPI_DEF(af_sqrt)
+UNARY_HAPI_DEF(af_cbrt)
+UNARY_HAPI_DEF(af_factorial)
+UNARY_HAPI_DEF(af_tgamma)
+UNARY_HAPI_DEF(af_lgamma)
+UNARY_HAPI_DEF(af_iszero)
+UNARY_HAPI_DEF(af_isinf)
+UNARY_HAPI_DEF(af_isnan)
+UNARY_HAPI_DEF(af_not)
diff --git a/src/api/hapi/signal.cpp b/src/api/hapi/signal.cpp
index a4e6e9c..46ab5f3 100644
--- a/src/api/hapi/signal.cpp
+++ b/src/api/hapi/signal.cpp
@@ -11,14 +11,15 @@
 #include <af/signal.h>
 #include "symbol_manager.hpp"
 
-#define APPROX_HAPI_DEF(af_func)\
-af_err af_func(af_array *out, const af_array in, const af_array pos, const af_interp_type method, const float offGrid) \
-{\
-    return CALL(out, in, pos, method, offGrid);\
+af_err af_approx1(af_array *out, const af_array in, const af_array pos, const af_interp_type method, const float offGrid)
+{
+    return CALL(out, in, pos, method, offGrid);
 }
 
-APPROX_HAPI_DEF(af_approx1)
-APPROX_HAPI_DEF(af_approx2)
+af_err af_approx2(af_array *out, const af_array in, const af_array pos0, const af_array pos1, const af_interp_type method, const float offGrid)
+{
+    return CALL(out, in, pos0, pos1, method, offGrid);
+}
 
 #define FFT_HAPI_DEF(af_func)\
 af_err af_func(af_array in, const double norm_factor)\
@@ -97,9 +98,16 @@ af_err af_func(af_array *out, const af_array signal, const af_array filter, cons
 CONV_HAPI_DEF(af_convolve1)
 CONV_HAPI_DEF(af_convolve2)
 CONV_HAPI_DEF(af_convolve3)
-CONV_HAPI_DEF(af_fft_convolve1)
-CONV_HAPI_DEF(af_fft_convolve2)
-CONV_HAPI_DEF(af_fft_convolve3)
+
+#define FFT_CONV_HAPI_DEF(af_func)\
+af_err af_func(af_array *out, const af_array signal, const af_array filter, const af_conv_mode mode)\
+{\
+    return CALL(out, signal, filter, mode);\
+}
+
+FFT_CONV_HAPI_DEF(af_fft_convolve1)
+FFT_CONV_HAPI_DEF(af_fft_convolve2)
+FFT_CONV_HAPI_DEF(af_fft_convolve3)
 
 af_err af_convolve2_sep(af_array *out, const af_array col_filter, const af_array row_filter, const af_array signal, const af_conv_mode mode)
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git