support for multi threads

sdcb · Jun 14, 2024 · 6a2a4a1 · 6a2a4a1
1 parent 9051cbf
commit 6a2a4a1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/Sdcb.PaddleOCR/PaddleOcrClassifier.cs b/src/Sdcb.PaddleOCR/PaddleOcrClassifier.cs
@@ -98,18 +98,19 @@ public bool ShouldRotate180(Mat src)
         using Mat resized = ResizePadding(src, Shape);
         using Mat normalized = Normalize(resized);
 
-        using (PaddleTensor input = _p.GetInputTensor(_p.InputNames[0]))
+        using PaddlePredictor predictor = _p.Clone();
+        using (PaddleTensor input = predictor.GetInputTensor(predictor.InputNames[0]))
         {
             input.Shape = new[] { 1, 3, normalized.Rows, normalized.Cols };
             float[] data = PaddleOcrDetector.ExtractMat(normalized);
             input.SetData(data);
         }
-        if (!_p.Run())
+        if (!predictor.Run())
         {
             throw new Exception("PaddlePredictor(Classifier) run failed.");
         }
 
-        using (PaddleTensor output = _p.GetOutputTensor(_p.OutputNames[0]))
+        using (PaddleTensor output = predictor.GetOutputTensor(predictor.OutputNames[0]))
         {
             float[] softmax = output.GetData<float>();
             float score = 0;

diff --git a/src/Sdcb.PaddleOCR/PaddleOcrDetector.cs b/src/Sdcb.PaddleOCR/PaddleOcrDetector.cs
@@ -195,20 +195,21 @@ public Mat RunRaw(Mat src, out Size resizedSize)
             normalized = Normalize(padded);
         }
 
+        using PaddlePredictor predictor = _p.Clone();
         using (Mat _ = normalized)
-        using (PaddleTensor input = _p.GetInputTensor(_p.InputNames[0]))
+        using (PaddleTensor input = predictor.GetInputTensor(predictor.InputNames[0]))
         {
             input.Shape = new[] { 1, 3, normalized.Rows, normalized.Cols };
             float[] data = ExtractMat(normalized);
             input.SetData(data);
         }
 
-        if (!_p.Run())
+        if (!predictor.Run())
         {
             throw new Exception("PaddlePredictor(Detector) run failed.");
         }
 
-        using (PaddleTensor output = _p.GetOutputTensor(_p.OutputNames[0]))
+        using (PaddleTensor output = predictor.GetOutputTensor(predictor.OutputNames[0]))
         {
             float[] data = output.GetData<float>();
             int[] shape = output.Shape;

diff --git a/src/Sdcb.PaddleOCR/PaddleOcrRecognizer.cs b/src/Sdcb.PaddleOCR/PaddleOcrRecognizer.cs
@@ -113,6 +113,7 @@ private PaddleOcrRecognizerResult[] RunMulti(Mat[] srcs)
             return 1.0 * size.Width / size.Height * modelHeight;
         }));
 
+        using PaddlePredictor predictor = _p.Clone();
         Mat[] normalizeds = null!;
         try
         {
@@ -131,7 +132,7 @@ private PaddleOcrRecognizerResult[] RunMulti(Mat[] srcs)
                 })
                 .ToArray();
 
-            using (PaddleTensor input = _p.GetInputTensor(_p.InputNames[0]))
+            using (PaddleTensor input = predictor.GetInputTensor(predictor.InputNames[0]))
             {
                 int channel = normalizeds[0].Channels();
                 input.Shape = new[] { normalizeds.Length, channel, modelHeight, maxWidth };
@@ -147,12 +148,12 @@ private PaddleOcrRecognizerResult[] RunMulti(Mat[] srcs)
             }
         }
 
-        if (!_p.Run())
+        if (!predictor.Run())
         {
             throw new Exception($"PaddlePredictor(Recognizer) run failed.");
         }
 
-        using (PaddleTensor output = _p.GetOutputTensor(_p.OutputNames[0]))
+        using (PaddleTensor output = predictor.GetOutputTensor(predictor.OutputNames[0]))
         {
             float[] data = output.GetData<float>();
             int[] shape = output.Shape;

diff --git a/src/Sdcb.PaddleOCR/PaddleOcrTableRecognizer.cs b/src/Sdcb.PaddleOCR/PaddleOcrTableRecognizer.cs
@@ -84,19 +84,20 @@ public TableDetectionResult Run(Mat src)
         Size rawSize = src.Size();
         float[] inputData = TablePreprocess(src);
 
-        using (PaddleTensor input = _p.GetInputTensor(_p.InputNames[0]))
+        using PaddlePredictor predictor = _p.Clone();
+        using (PaddleTensor input = predictor.GetInputTensor(predictor.InputNames[0]))
         {
             input.Shape = new[] { 1, 3, MaxEdgeSize, MaxEdgeSize };
             input.SetData(inputData);
         }
-        if (!_p.Run())
+        if (!predictor.Run())
         {
             throw new Exception("PaddlePredictor(Table) run failed.");
         }
 
-        string[] outputNames = _p.OutputNames;
-        using (PaddleTensor output0 = _p.GetOutputTensor(outputNames[0]))
-        using (PaddleTensor output1 = _p.GetOutputTensor(outputNames[1]))
+        string[] outputNames = predictor.OutputNames;
+        using (PaddleTensor output0 = predictor.GetOutputTensor(outputNames[0]))
+        using (PaddleTensor output1 = predictor.GetOutputTensor(outputNames[1]))
         {
             float[] locations = output0.GetData<float>();
             int[] locationShape = output0.Shape;