Added log2() support

Peter Andreas Entschev · Peter Andreas Entschev · commit cb60a03e133b · 2015-05-18T14:39:43.000-04:00
diff --git a/include/af/arith.h b/include/af/arith.h
@@ -555,6 +555,16 @@ namespace af
     */
     AFAPI array log10  (const array &in);
 
+    /**
+       C++ Interface for logarithm base 2
+
+       \param[in] in is input
+       \return the logarithm of input in base 2
+
+       \ingroup explog_func_log2
+    */
+    AFAPI array log2   (const array &in);
+
     /**
        C++ Interface for square root of input
 
@@ -1278,6 +1288,17 @@ extern "C" {
     */
     AFAPI af_err af_log10   (af_array *out, const af_array in);
 
+    /**
+       C Interface for logarithm base 2
+
+       \param[out] out will contain the base 2 logarithm of \p in
+       \param[in] in is input
+       \return \ref AF_SUCCESS if the execution completes properly
+
+       \ingroup explog_func_log2
+    */
+    AFAPI af_err af_log2   (af_array *out, const af_array in);
+
     /**
        C Interface for square root
 
diff --git a/src/api/c/optypes.hpp b/src/api/c/optypes.hpp
@@ -59,6 +59,7 @@ typedef enum {
     af_log_t,
     af_log10_t,
     af_log1p_t,
+    af_log2_t,
 
     af_sqrt_t,
     af_cbrt_t,
diff --git a/src/api/c/unary.cpp b/src/api/c/unary.cpp
@@ -91,6 +91,7 @@ UNARY(erfc)
 UNARY(log)
 UNARY(log10)
 UNARY(log1p)
+UNARY(log2)
 
 UNARY(sqrt)
 UNARY(cbrt)
diff --git a/src/api/cpp/unary.cpp b/src/api/cpp/unary.cpp
@@ -59,6 +59,7 @@ namespace af
     INSTANTIATE(log   )
     INSTANTIATE(log1p )
     INSTANTIATE(log10 )
+    INSTANTIATE(log2  )
 
     INSTANTIATE(sqrt  )
     INSTANTIATE(cbrt  )
diff --git a/src/backend/cpu/unary.hpp b/src/backend/cpu/unary.hpp
@@ -54,6 +54,7 @@ UNARY_FN(erfc)
 UNARY_FN(log)
 UNARY_FN(log10)
 UNARY_FN(log1p)
+UNARY_FN(log2)
 
 UNARY_FN(sqrt)
 UNARY_FN(cbrt)
diff --git a/src/backend/cuda/JIT/exp.cu b/src/backend/cuda/JIT/exp.cu
@@ -27,6 +27,7 @@ MATH(erfc)
 MATH(log)
 MATH(log10)
 MATH(log1p)
+MATH(log2)
 
 MATH(sqrt)
 MATH(cbrt)
diff --git a/src/backend/cuda/unary.hpp b/src/backend/cuda/unary.hpp
@@ -67,6 +67,7 @@ UNARY_FN(lgamma)
 UNARY_FN(log)
 UNARY_FN(log1p)
 UNARY_FN(log10)
+UNARY_FN(log2)
 
 UNARY_FN(sqrt)
 UNARY_FN(cbrt)
diff --git a/src/backend/opencl/unary.hpp b/src/backend/opencl/unary.hpp
@@ -54,6 +54,7 @@ UNARY_FN(lgamma)
 UNARY_FN(log)
 UNARY_FN(log1p)
 UNARY_FN(log10)
+UNARY_FN(log2)
 
 UNARY_FN(sqrt)
 UNARY_FN(cbrt)
diff --git a/test/math.cpp b/test/math.cpp
@@ -31,7 +31,7 @@ const double dbl_err = 1e-10;
         To *h_b = b.host<To>();                                 \
                                                                 \
         for (int i = 0; i < num; i++)                           \
-            ASSERT_NEAR(h_b[i], std::func(h_a[i]), err) <<      \
+            ASSERT_NEAR(h_b[i], func(h_a[i]), err) <<           \
                 "for value: " << h_a[i] << std::endl;           \
         delete[] h_a;                                           \
         delete[] h_b;                                           \
@@ -57,6 +57,7 @@ MATH_TESTS_FLOAT(sqrt)
 MATH_TESTS_FLOAT(exp)
 MATH_TESTS_FLOAT(log)
 MATH_TESTS_FLOAT(log10)
+MATH_TESTS_FLOAT(log2)
 
 MATH_TESTS_LIMITS(float, float, abs, flt_err, -10, 10)
 MATH_TESTS_LIMITS(float, float, ceil, flt_err, -10, 10)
@@ -99,6 +100,7 @@ MATH_TESTS_DOUBLE(sqrt)
 MATH_TESTS_DOUBLE(exp)
 MATH_TESTS_DOUBLE(log)
 MATH_TESTS_DOUBLE(log10)
+MATH_TESTS_DOUBLE(log2)
 
 MATH_TESTS_LIMITS(double, double, abs, dbl_err, -10, 10)
 MATH_TESTS_LIMITS(double, double, ceil, dbl_err, -10, 10)
