Parallelize the multi-filtering.

Author: Mysticial

Common/Cpp/Concurrency/AsyncTask.cpp

@@ -4,6 +4,7 @@
  *
  */
 
+#include "SpinPause.h"
 #include "AsyncTask.h"
 
 //#include <iostream>
@@ -29,7 +30,7 @@ AsyncTask::~AsyncTask(){
     }
 
     while (m_state.load(std::memory_order_acquire) != State::SAFE_TO_DESTRUCT){
-        //  pause
+        pause();
     }
 
 //    cout << "Late Finish" << endl;

SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp

@@ -7,11 +7,13 @@
 #include <algorithm>
 #include <map>
 #include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Qt/StringToolsQt.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/Language.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "CommonTools/Images/ImageManip.h"
 #include "CommonTools/Images/ImageFilter.h"
 #include "CommonTools/Images/BinaryImage_FilterRgb32.h"
@@ -218,35 +220,42 @@ int read_number_waterfill_multifilter(
         line_index_str = "Line " + std::to_string(line_index) + ": ";
     }
 
+    SpinLock lock;
     std::map<int, uint8_t> candidates;
-    for (std::pair<uint32_t, uint32_t> filter : filters){
-
-        uint32_t rgb32_min = filter.first;
-        uint32_t rgb32_max = filter.second;
-        std::string ocr_text = read_number_waterfill_no_normalization(
-            logger,
-            image,
-            rgb32_min, rgb32_max,
-            text_inside_range,
-            width_max,
-            true
-        );
-
-        std::string normalized = run_number_normalization(ocr_text);
-        if (normalized.empty()){
-            // logger.log("OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
-            continue;
-        }
+    GlobalThreadPools::normal_inference().run_in_parallel(
+        [&](size_t index){
+            std::pair<uint32_t, uint32_t> filter = filters[index];
+
+            uint32_t rgb32_min = filter.first;
+            uint32_t rgb32_max = filter.second;
+            std::string ocr_text = read_number_waterfill_no_normalization(
+                logger,
+                image,
+                rgb32_min, rgb32_max,
+                text_inside_range,
+                width_max,
+                true
+            );
+
+            std::string normalized = run_number_normalization(ocr_text);
+            if (normalized.empty()){
+                // logger.log("OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
+                return;
+            }
 
-        int candidate = std::atoi(normalized.c_str());
-        logger.log(line_index_str + "OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> " + std::to_string(candidate));
+            int candidate = std::atoi(normalized.c_str());
+            logger.log(line_index_str + "OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> " + std::to_string(candidate));
 
-        if (prioritize_numeric_only_results && is_digits(ocr_text)){
-            candidates[candidate] += 2;
-        }else{
-            candidates[candidate]++;
-        }
-    }
+            uint8_t weight = prioritize_numeric_only_results && is_digits(ocr_text)
+                ? 2
+                : 1;
+
+            WriteSpinLock lg(lock);
+            candidates[candidate] += weight;
+
+        },
+        0, filters.size(), 1
+    );
 
     if (candidates.empty()){
         logger.log(line_index_str + "No valid OCR candidates. Unable to read number.", COLOR_ORANGE);

SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "CommonTools/Images/ImageFilter.h"
 #include "OCR_RawOCR.h"
 #include "OCR_DictionaryMatcher.h"
@@ -35,24 +36,35 @@ StringMatchResult multifiltered_OCR(
     double pixels_inv = 1. / (image.width() * image.height());
 
     //  Run all the filters.
+    SpinLock lock;
     StringMatchResult ret;
+    GlobalThreadPools::normal_inference().run_in_parallel(
+        [&](size_t index){
+            const std::pair<ImageRGB32, size_t>& filtered = filtered_images[index];
+
+            std::string text = ocr_read(language, filtered.first);
+//            cout << text.toStdString() << endl;
+//            filtered.first.save("test" + QString::number(c++) + ".png");
+
+            //  Compute ratio of image that matches text color. Skip if it's out of range.
+            double ratio = filtered.second * pixels_inv;
+//            cout << "ratio = " << ratio << endl;
+            if (ratio < min_text_ratio || ratio > max_text_ratio){
+                return;
+            }
+
+            StringMatchResult current = dictionary.match_substring(language, text, log10p_spread);
+
+            WriteSpinLock lg(lock);
+            ret.exact_match |= current.exact_match;
+            ret.results.insert(current.results.begin(), current.results.end());
+
+        },
+        0, filtered_images.size(), 1
+    );
 //    int c = 0;
-    for (const auto& filtered : filtered_images){
-        std::string text = ocr_read(language, filtered.first);
-//        cout << text.toStdString() << endl;
-//        filtered.first.save("test" + QString::number(c++) + ".png");
-
-        //  Compute ratio of image that matches text color. Skip if it's out of range.
-        double ratio = filtered.second * pixels_inv;
-//        cout << "ratio = " << ratio << endl;
-        if (ratio < min_text_ratio || ratio > max_text_ratio){
-            continue;
-        }
-
-        StringMatchResult current = dictionary.match_substring(language, text, log10p_spread);
-        ret.exact_match |= current.exact_match;
-        ret.results.insert(current.results.begin(), current.results.end());
-    }
+//    for (const auto& filtered : filtered_images){
+//    }
 
 //    ret.log(global_logger_tagged(), -1.5);