w

Author: nihui

src/expression.cpp

@@ -61,6 +61,38 @@ int count_expression_blobs(const std::string& expr)
     return count;
 }
 
+struct typed_value
+{
+    int type; // 0=i 1=f
+    union
+    {
+        int i;
+        float f;
+    };
+
+    typed_value()
+        : type(0), i(0)
+    {
+    }
+    typed_value(int _i)
+        : type(0), i(_i)
+    {
+    }
+    typed_value(float _f)
+        : type(1), f(_f)
+    {
+    }
+
+    int to_int()
+    {
+        if (type == 0)
+            return i;
+
+        // trunc by default
+        return (int)f;
+    }
+};
+
 std::vector<int> eval_list_expression(const std::string& expr, const std::vector<Mat>& blobs)
 {
     // /(0w,2),*(0h,2),0c
@@ -115,38 +147,6 @@ std::vector<int> eval_list_expression(const std::string& expr, const std::vector
 
     //      / 0w 2 * 0h 2 0c
 
-    struct typed_value
-    {
-        int type; // 0=i 1=f
-        union
-        {
-            int i;
-            float f;
-        };
-
-        typed_value()
-            : type(0), i(0)
-        {
-        }
-        typed_value(int _i)
-            : type(0), i(_i)
-        {
-        }
-        typed_value(float _f)
-            : type(1), f(_f)
-        {
-        }
-
-        int to_int()
-        {
-            if (type == 0)
-                return i;
-
-            // trunc by default
-            return (int)f;
-        }
-    };
-
     // scan and stack
     std::stack<typed_value> exprstack;
     for (int i = (int)tokens.size() - 1; i >= 0; i--)
@@ -379,23 +379,35 @@ 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

@@ -136,6 +136,12 @@ float frac(float x)
     return x - floor(x);
 }
 
+float fmodf(float x, float y)
+{
+    float m = frac(fabsf(x / y)) * fabsf(y);
+    return (x < 0) ? -m : m;
+}
+
 /*
 * ====================================================
 * trigonometric functions
@@ -314,6 +320,16 @@ float atan2f(float y, float x)
     }
 }
 
+float sinhf(float v)
+{
+    return 0.5 * (expf(v) - expf(-v));
+}
+
+float coshf(float v)
+{
+    return 0.5 * (expf(v) + expf(-v));
+}
+
 float tanhf(float v)
 {
     if (v >= 8 || v <= -8)

src/simplemath.h

@@ -39,6 +39,7 @@ NCNN_EXPORT float ceilf(float);
 NCNN_EXPORT float fmaxf(float, float);
 NCNN_EXPORT float truncf(float);
 NCNN_EXPORT float frac(float);
+NCNN_EXPORT float fmodf(float, float);
 /*
 * ====================================================
 * trigonometric functions
@@ -51,6 +52,8 @@ NCNN_EXPORT float asinf(float);
 NCNN_EXPORT float acosf(float);
 NCNN_EXPORT float atanf(float);
 NCNN_EXPORT float atan2f(float, float);
+NCNN_EXPORT float sinhf(float);
+NCNN_EXPORT float coshf(float);
 NCNN_EXPORT float tanhf(float);
 
 /*

tests/test_expression.cpp

@@ -50,7 +50,25 @@ static int test_eval_list_expression(const std::string& expr, std::vector<ncnn::
     va_end(ap);
 
     std::vector<int> list = ncnn::eval_list_expression(expr, blobs);
-    if (list != true_list)
+
+    bool failed = false;
+    if (list.size() != true_list.size())
+    {
+        failed = true;
+    }
+    else
+    {
+        for (size_t i = 0; i < list.size(); i++)
+        {
+            if (list[i] != true_list[i])
+            {
+                failed = true;
+                break;
+            }
+        }
+    }
+
+    if (failed)
     {
         fprintf(stderr, "test_eval_list_expression failed expr=%s got [", expr.c_str());
         for (size_t i = 0; i < list.size(); i++)