Quellcode durchsuchen

增加onnx、ncnn文件夹用于支持多推理引擎

lilith.lu vor 1 Jahr
Ursprung
Commit
a11377adbe

+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrAngClsC.cpp → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrAngClsC.cpp


+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrAngClsC.h → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrAngClsC.h


+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrCrnnRegC.cpp → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrCrnnRegC.cpp


+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrCrnnRegC.h → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrCrnnRegC.h


+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrDetect.cpp → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrDetect.cpp


+ 0 - 0
IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/InferNetOnnxPaddleOcrDetect.h → IDCardRecogntion/SourceCode/Algorithm/cpp/InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrDetect.h


+ 3 - 3
IDCardRecogntion/SourceCode/Algorithm/cpp/OCRProcessCore/PaddleOCR/PaddleOCRProcessCore.h

@@ -5,9 +5,9 @@
 #define __PaddleOCRProcessCore_H__
 
 // OCR模型
-#include "InferNet/PaddleOCR/InferNetOnnxPaddleOcrDetect.h"
-#include "InferNet/PaddleOCR/InferNetOnnxPaddleOcrCrnnRegC.h"
-#include "InferNet/PaddleOCR/InferNetOnnxPaddleOcrAngClsC.h"
+#include "InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrDetect.h"
+#include "InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrCrnnRegC.h"
+#include "InferNet/PaddleOCR/Onnx/InferNetOnnxPaddleOcrAngClsC.h"
 
 #include "InferNet/TextBlock.h"
 #include "OCRProcessCore/OCRResult.h"

+ 14 - 8
IDCardRecogntion/SourceCode/IDCardRecognition.sln

@@ -64,14 +64,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InferNet", "InferNet", "{8C
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PaddleOCR", "PaddleOCR", "{BA558D8A-C6C3-4537-8EB6-143AD0AF8512}"
-	ProjectSection(SolutionItems) = preProject
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp
-		Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h = Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PaddleOCR", "PaddleOCR", "{11F57294-1072-4076-A3B3-1F115BA3F983}"
 	ProjectSection(SolutionItems) = preProject
@@ -113,6 +105,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IDInfoExtractionDemo", "Tes
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImgProcessUtilsCvCore", "UtilsLibs\ImgProcessUtilsCvCore\ImgProcessUtilsCvCore.vcxproj", "{76892CE4-BC13-4853-B4C4-ADA5901A1E9A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Onnx", "Onnx", "{3DE1414B-6444-42B2-BE5D-C1B9075E45BB}"
+	ProjectSection(SolutionItems) = preProject
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp
+		Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h = Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ncnn", "Ncnn", "{B2621DC7-994A-40BF-9332-3688B4DD253B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -218,6 +222,8 @@ Global
 		{66F44F9F-860F-4F24-8634-AEFD38F50A1D} = {CC0864B7-AE72-4195-9DEF-60D9468B2416}
 		{F8975946-7E75-44B0-A67F-5599FE428230} = {4688A76B-B1FE-4601-8890-372CC949DB59}
 		{76892CE4-BC13-4853-B4C4-ADA5901A1E9A} = {51B9DEA5-6646-4D93-84F5-E8256DA42188}
+		{3DE1414B-6444-42B2-BE5D-C1B9075E45BB} = {BA558D8A-C6C3-4537-8EB6-143AD0AF8512}
+		{B2621DC7-994A-40BF-9332-3688B4DD253B} = {BA558D8A-C6C3-4537-8EB6-143AD0AF8512}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D87860A1-F4CA-436A-BBF9-85A89246E99F}

+ 8 - 8
IDCardRecogntion/SourceCode/Mobile/android/IDCardRecognitionSo.vcxproj

@@ -51,7 +51,7 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\Algorithm\cpp\;..\..\Algorithm\cpp\InferNet\;..\..\Algorithm\cpp\InferNet\PaddleOCR\;..\..\Algorithm\cpp\OCRProcessCore\;..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Algorithm\cpp\;..\..\Algorithm\cpp\InferNet\;..\..\Algorithm\cpp\InferNet\PaddleOCR\;..\..\Algorithm\cpp\OCRProcessCore\;..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\;..\..\Algorithm\cpp\InferNet\PaddleOCR\Ncnn;..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Enabled</ExceptionHandling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
@@ -69,7 +69,7 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\Algorithm\cpp\;..\..\Algorithm\cpp\InferNet\;..\..\Algorithm\cpp\InferNet\PaddleOCR\;..\..\Algorithm\cpp\OCRProcessCore\;..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Algorithm\cpp\;..\..\Algorithm\cpp\InferNet\;..\..\Algorithm\cpp\InferNet\PaddleOCR\;..\..\Algorithm\cpp\OCRProcessCore\;..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\;..\..\Algorithm\cpp\InferNet\PaddleOCR\Ncnn;..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Enabled</ExceptionHandling>
       <PreprocessorDefinitions>__ANDROID__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -86,9 +86,9 @@
     <ClInclude Include="..\..\Algorithm\cpp\IDCardAnalyser.h" />
     <ClInclude Include="..\..\Algorithm\cpp\IDCardRecognition.h" />
     <ClInclude Include="..\..\Algorithm\cpp\IDCardRecogResult.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h" />
     <ClInclude Include="..\..\Algorithm\cpp\InferNet\TextBlock.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\OCRBase.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.h" />
@@ -100,9 +100,9 @@
   <ItemGroup>
     <ClCompile Include="..\..\Algorithm\cpp\IDCardAnalyser.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\IDCardRecognition.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\OCRBase.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.cpp" />

+ 6 - 6
IDCardRecogntion/SourceCode/Mobile/android/IDCardRecognitionSo.vcxproj.filters

@@ -3,27 +3,27 @@
   <ItemGroup>
     <ClInclude Include="IDCardRecognitionSo.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h" />
     <ClInclude Include="..\..\Algorithm\cpp\IDCardAnalyser.h" />
     <ClInclude Include="..\..\Algorithm\cpp\IDCardRecognition.h" />
     <ClInclude Include="..\..\Algorithm\cpp\IDCardRecogResult.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h" />
-    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h" />
     <ClInclude Include="..\..\Algorithm\cpp\InferNet\TextBlock.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\OCRBase.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\OCRResult.h" />
     <ClInclude Include="..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h" />
+    <ClInclude Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="IDCardRecognitionSo.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\IDCardAnalyser.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\IDCardRecognition.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
-    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\OCRBase.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.cpp" />
     <ClCompile Include="..\..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
+    <ClCompile Include="..\..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp" />
   </ItemGroup>
 </Project>

+ 8 - 8
IDCardRecogntion/SourceCode/PC/IDCardRecognitionLibs.vcxproj

@@ -62,7 +62,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\Algorithm\cpp\;..\Algorithm\cpp\InferNet\PaddleOCR\;..\Algorithm\cpp\InferNet\;..\Algorithm\cpp\OCRProcessCore\PaddleOCR;..\Algorithm\cpp\OCRProcessCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Algorithm\cpp\;..\Algorithm\cpp\InferNet\PaddleOCR\;..\Algorithm\cpp\InferNet\;..\Algorithm\cpp\OCRProcessCore\PaddleOCR;..\Algorithm\cpp\OCRProcessCore;..\Algorithm\cpp\InferNet\PaddleOCR\Ncnn;..\Algorithm\cpp\InferNet\PaddleOCR\Onnx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -81,7 +81,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\Algorithm\cpp\;..\Algorithm\cpp\InferNet\PaddleOCR\;..\Algorithm\cpp\InferNet\;..\Algorithm\cpp\OCRProcessCore\PaddleOCR;..\Algorithm\cpp\OCRProcessCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Algorithm\cpp\;..\Algorithm\cpp\InferNet\PaddleOCR\;..\Algorithm\cpp\InferNet\;..\Algorithm\cpp\OCRProcessCore\PaddleOCR;..\Algorithm\cpp\OCRProcessCore;..\Algorithm\cpp\InferNet\PaddleOCR\Onnx;..\Algorithm\cpp\InferNet\PaddleOCR\Ncnn;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -97,9 +97,9 @@
   <ItemGroup>
     <ClCompile Include="..\Algorithm\cpp\IDCardAnalyser.cpp" />
     <ClCompile Include="..\Algorithm\cpp\IDCardRecognition.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp" />
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\OCRBase.cpp" />
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.cpp" />
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.cpp" />
@@ -109,9 +109,9 @@
     <ClInclude Include="..\Algorithm\cpp\IDCardAnalyser.h" />
     <ClInclude Include="..\Algorithm\cpp\IDCardRecognition.h" />
     <ClInclude Include="..\Algorithm\cpp\IDCardRecogResult.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h" />
     <ClInclude Include="..\Algorithm\cpp\InferNet\TextBlock.h" />
     <ClInclude Include="..\Algorithm\cpp\OCRProcessCore\OCRBase.h" />
     <ClInclude Include="..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.h" />

+ 6 - 6
IDCardRecogntion/SourceCode/PC/IDCardRecognitionLibs.vcxproj.filters

@@ -7,9 +7,9 @@
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\OCRBase.cpp" />
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.cpp" />
     <ClCompile Include="..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
-    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.cpp" />
+    <ClCompile Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="IIDCardRecognition.h" />
@@ -20,9 +20,9 @@
     <ClInclude Include="..\Algorithm\cpp\OCRProcessCore\OCRProcessCore.h" />
     <ClInclude Include="..\Algorithm\cpp\OCRProcessCore\OCRResult.h" />
     <ClInclude Include="..\Algorithm\cpp\OCRProcessCore\PaddleOCR\PaddleOCRProcessCore.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrAngClsC.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrCrnnRegC.h" />
-    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\InferNetOnnxPaddleOcrDetect.h" />
     <ClInclude Include="..\Algorithm\cpp\InferNet\TextBlock.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrAngClsC.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrCrnnRegC.h" />
+    <ClInclude Include="..\Algorithm\cpp\InferNet\PaddleOCR\Onnx\InferNetOnnxPaddleOcrDetect.h" />
   </ItemGroup>
 </Project>