Merge pull request tesseract-ocr#2475 from stweil/std

Add dot product implementation using std::inner_product
danrufus · May 31, 2019 · ee2d717 · ee2d717
2 parents 7b87389 + fefd521
commit ee2d717
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/arch/simddetect.cpp b/src/arch/simddetect.cpp
@@ -15,6 +15,7 @@
 // limitations under the License.
 ///////////////////////////////////////////////////////////////////////
 
+#include <numeric>           // for std::inner_product
 #include "simddetect.h"
 #include "dotproduct.h"
 #include "dotproductavx.h"
@@ -69,6 +70,11 @@ static double DotProductGeneric(const double* u, const double* v, int n) {
   return total;
 }
 
+// Compute dot product using std::inner_product.
+static double DotProductStdInnerProduct(const double* u, const double* v, int n) {
+  return std::inner_product(u, u + n, v, 0.0);
+}
+
 static void SetDotProduct(DotProductFunction f, const IntSimdMatrix* m = nullptr) {
   DotProduct = f;
   IntSimdMatrix::intSimdMatrix = m;
@@ -185,6 +191,10 @@ void SIMDDetect::Update() {
     SetDotProduct(DotProductSSE, &IntSimdMatrix::intSimdMatrixSSE);
     dotproduct_method = "sse";
 #endif
+  } else if (!strcmp(dotproduct.string(), "std::inner_product")) {
+    // std::inner_product selected by config variable.
+    SetDotProduct(DotProductStdInnerProduct);
+    dotproduct_method = "std::inner_product";
   } else {
     // Unsupported value of config variable.
     tprintf("Warning, ignoring unsupported config variable value: dotproduct=%s\n",
@@ -196,7 +206,7 @@ void SIMDDetect::Update() {
 #if defined(SSE4_1)
             " sse"
 #endif
-            ".\n");
+            " std::inner_product.\n");
   }
 
   dotproduct.set_value(dotproduct_method);