w

Author: nihui

src/expression.cpp

@@ -379,35 +379,23 @@ std::vector<int> eval_list_expression(const std::string& expr, const std::vector
             }
             else if (t == "acosh")
             {
-#if NCNN_SIMPLEMATH
-                NCNN_LOGE("acosh not implemented in simplemath!");
-#else
                 r = acoshf(a);
-#endif
             }
             else if (t == "asin")
             {
                 r = asinf(a);
             }
             else if (t == "asinh")
             {
-#if NCNN_SIMPLEMATH
-                NCNN_LOGE("asinh not implemented in simplemath!");
-#else
                 r = asinhf(a);
-#endif
             }
             else if (t == "atan")
             {
                 r = atanf(a);
             }
             else if (t == "atanh")
             {
-#if NCNN_SIMPLEMATH
-                NCNN_LOGE("atanh not implemented in simplemath!");
-#else
                 r = atanhf(a);
-#endif
             }
             else if (t == "cos")
             {

src/simplemath.cpp

@@ -320,26 +320,41 @@ float atan2f(float y, float x)
     }
 }
 
-float sinhf(float v)
+float sinhf(float x)
 {
-    return 0.5 * (expf(v) - expf(-v));
+    return 0.5 * (expf(x) - expf(-x));
 }
 
-float coshf(float v)
+float coshf(float x)
 {
-    return 0.5 * (expf(v) + expf(-v));
+    return 0.5 * (expf(x) + expf(-x));
 }
 
-float tanhf(float v)
+float tanhf(float x)
 {
-    if (v >= 8 || v <= -8)
+    if (x >= 8 || x <= -8)
     {
-        return copysignf(1, v);
+        return copysignf(1, x);
     }
-    float exp2v = expf(2 * v);
+    float exp2v = expf(2 * x);
     return (exp2v - 1) / (exp2v + 1);
 }
 
+float asinhf(float x)
+{
+    return logf(x + sqrtf(x * x + 1));
+}
+
+float acoshf(float x)
+{
+    return logf(x + sqrtf(x * x - 1));
+}
+
+float atanhf(float x)
+{
+    return 0.5f * logf((1 + x) / (1 - x));
+}
+
 /*
 * ====================================================
 * power functions

src/simplemath.h

@@ -55,6 +55,9 @@ NCNN_EXPORT float atan2f(float, float);
 NCNN_EXPORT float sinhf(float);
 NCNN_EXPORT float coshf(float);
 NCNN_EXPORT float tanhf(float);
+NCNN_EXPORT float asinhf(float);
+NCNN_EXPORT float acoshf(float);
+NCNN_EXPORT float atanhf(float);
 
 /*
 * ====================================================