Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev 3.03 : Implement OpenCL #178

Merged
merged 31 commits into from
Dec 19, 2015
Merged

Dev 3.03 : Implement OpenCL #178

merged 31 commits into from
Dec 19, 2015

Conversation

edynamic90
Copy link

Hello,

Do you have implement OpenCL API (tesseract compilation -enable-opencl=true) in current version ?

(I use currently tesseract on parallel process (.net) and with this example:

One for loop 1 to N with 10 threads tesseract on Intel Xeon Processor , it's very slow (1 hours for 100 documents)

Example

Parallel.foreach (0 to N email with attachment)
{
Parallel.foreach process.tesseract(attachment)
}

if no : Do you will implement it on 3.0.3 ?

Thank you

charlesw and others added 29 commits January 14, 2014 21:03
@charlesw
Updated tesseract to 3.03 (prerelease)
fe2b5ce 
Notes:
* x86 only (no x64 build yet)
* based on rev 987
* Highly likely that tesseract and leptonica have different VS Runtimes
(tesseract was compiled with VS 2013, while leptonica VS 2012) this will
be fixed when I generate the x64 builds.
* Confirmed Issue #52 has been resolved.
* Could be Interop incompatibilities UNTESTED
@charlesw
Fixed #65 - OtsuBinarization (x64)
6bcd059 
Turned out the signature of pixOtsuAdaptiveThreshold  was incorrect,
fixing it rectified this issue.
@charlesw
Updated tesseract binaries
433b279
@charlesw
Merge remote-tracking branch 'origin/master' into dev_3.03
4a6a4e2 
Conflicts:
	src/Common.net45.targets
	src/Tesseract.Tests.Console/Program.cs
@charlesw
Support for setting params on init
4cfa996
@charlesw
Updated binaries tesseract to rev 1039
a8b7913
@charlesw
Updated project refs to tesseract libs
a04e525
@amferguson
- Tweaked TesseractEngine.cs to account for when varValues is null (w…
8a52037 
…as throwing a null reference exception with call to .Length)
@amferguson
- Updated LeptonicaApi.cs to reference the new version included
5c7802e 
- Imported pixaReadMultipageTiff, pixaGetCount, and pixaGetPix from Leptonica DLL
- Updated Pix.cs to use those methods, imported the enumeration for the access types that pixaGetPix requires from pix.h in the original Leptonica source, and added a CreateArray method that creates a Pix[] to store the pages similar to the existing Create method
@amferguson
- Exposed pixaDestroy in LeptonicaApi.cs
9bdaf07 
- Renamed pixHandle to pixaHandle in Pix.cs
- call pixaDestroy on the original handle to the pixa object once the pixArray is created with the individual items extracted
@charlesw
Merge pull request #80 from amferguson/dev_3.03_multipage_tiff
52d4818 
Added multipage tiff reading to Dev 3.03
@charlesw
Multi-page pix improvements.
c679165
@charlesw
Made PixArray Enumerable.
e201016
@charlesw
Removed Pix.LoadMultiPageTiffFromFile
eb94702 
Please use PixArray.LoadMultiPageTiffFromFile.
@charlesw
Fixed null reference exception for partially iterated PixArray enumer…
50dbefc 
…ator.
@charlesw
Updated sample to do full iteration through src.
9159f87
@charlesw
Variables are now sent as a UTF8 encoded string - Issue #68
da357c6
@charlesw
Improved demo program.
102fb11
@charlesw
Merge branch 'develop' into dev_3.03
8ba4183 
Conflicts:
	Samples/Tesseract.ConsoleDemo/Program.cs
	src/Tesseract.Tests/EngineTests.cs
@charlesw
Merge branch 'develop' into dev_3.03
e9308b2 
Conflicts:
	Samples/Tesseract.ConsoleDemo/packages.config
	Samples/Tesseract.WebDemo/packages.config
	src/Tesseract.Tests/BaseApiTests.cs
	src/Tesseract.Tests/EngineTests.cs
	src/Tesseract/Internal/Guard.cs
	src/Tesseract/Interop/BaseApi.cs
	src/Tesseract/Interop/LeptonicaApi.cs
	src/Tesseract/Pix.cs
	src/Tesseract/TesseractEngine.cs
@charlesw
Merge branch 'develop' into dev_3.03
19e1ba2 
Conflicts:
	.gitignore
	Samples/Tesseract.WebDemo/packages.config
	src/Tesseract.Tests/BaseApiTests.cs
	src/Tesseract.Tests/EngineTests.cs
	src/Tesseract.Tests/Tesseract.Tests.csproj
	src/Tesseract/Internal/Guard.cs
	src/Tesseract/Interop/BaseApi.cs
	src/Tesseract/Interop/LeptonicaApi.cs
	src/Tesseract/Interop/MarshalHelper.cs
	src/Tesseract/Pix.cs
	src/Tesseract/TesseractEngine.cs
@charlesw
Updated english trainedata
f14737f
@charlesw
Cleaned up file contents using code maid to match dev (make it easier…
85a45ab 
… to merge).
@charlesw
Merge branch 'develop' into dev_3.03
50e7934 
Conflicts:
	Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj
	Samples/Tesseract.WebDemo/Tesseract.WebDemo.csproj
	src/Tesseract.Tests/EngineTests.cs
	src/Tesseract/BitmapToPixConverter.cs
	src/Tesseract/Interop/BaseApi.cs
	src/Tesseract/PixConverter.cs
	src/Tesseract/Tesseract.csproj
@jhuntsman
added ChoiceIterator to BaseApi
271c5c9 
when using ResultIterator to analyze results, the ChoiceIterator can be
used to analyze possible alternative choices for symbols.
@charlesw
Merge pull request #165 from jhuntsman/feature_3.04/choice-iterator
b35c7ab 
Feature - added ChoiceIterator to ResultIterator
@charlesw
Use invariant culture when testing output of result iterator so we do…
e302d6e 
…n't fail when running under different cultures.
@charlesw
Updated to latest version of tesseract 3.04.
1d11b34
@charlesw
Merge branch 'develop' into dev_3.03
035a31b 
Conflicts:
	Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj
	Samples/Tesseract.ConsoleDemo/app.config
	src/Tesseract.Tests/Tesseract.Tests.csproj
	src/Tesseract/Pix.cs
@charlesw
Copy link
Owner

Sorry for the delay, no opencl is not currently supported. I might look at
using the opencl enabled dlls for the upcoming release for 3.04 provided it
works for hardware that doesn't support opencl.
On 11 Jun 2015 21:58, "edynamic90" notifications@github.com wrote:

Hello,

Do you have implement OpenCL API (tesseract compilation
-enable-opencl=true) in current version ?

(I use currently tesseract on parallel process (.net) and with this
example:

One for loop 1 to 10 with 10 threads tesseract on Intel Xeon Processor is
very slow (1 hours for 100 documents)

Parallel.foreach
{}

if no : Do you will implement it on 3.0.3 ?

Thank you

You can view, comment on, or merge this pull request online at:

#178
Commit Summary

  • Updated tesseract to 3.03 (prerelease)
  • Fixed OtsuBinarizationTest fails when using x64 dlls on AMD64 #65 - OtsuBinarization (x64)
  • Updated tesseract binaries
  • Merge remote-tracking branch 'origin/master' into dev_3.03
  • Support for setting params on init
  • Updated binaries tesseract to rev 1039
  • Updated project refs to tesseract libs
  • - Tweaked TesseractEngine.cs to account for when varValues is null
    (was throwing a null reference exception with call to .Length)
  • - Updated LeptonicaApi.cs to reference the new version included
  • - Exposed pixaDestroy in LeptonicaApi.cs
  • Merge pull request Added multipage tiff reading to Dev 3.03 #80 from amferguson/dev_3.03_multipage_tiff
  • Multi-page pix improvements.
  • Made PixArray Enumerable.
  • Removed Pix.LoadMultiPageTiffFromFile
  • Fixed null reference exception for partially iterated PixArray
    enumerator.
  • Updated sample to do full iteration through src.
  • Variables are now sent as a UTF8 encoded string - Issue When use Chinese chars in setVariable, it has not effect #68
  • Improved demo program.
  • Merge branch 'develop' into dev_3.03
  • Merge branch 'develop' into dev_3.03
  • Merge branch 'develop' into dev_3.03
  • Updated english trainedata
  • Cleaned up file contents using code maid to match dev (make it
    easier to merge).
  • Merge branch 'develop' into dev_3.03
  • Test case for HOCR and additional guard check to ensure the page
    number is correct.
  • added ChoiceIterator to BaseApi
  • Merge pull request Feature - added ChoiceIterator to ResultIterator #165 from jhuntsman/feature_3.04/choice-iterator
  • Use invariant culture when testing output of result iterator so we
    don't fail when running under different cultures.
  • Some integration tests for issue Processing Image from memory? #166
  • Check prerequisites before performing otsu adaptive thresholding.
  • Updated to latest version of tesseract 3.04.
  • Merge branch 'develop' into dev_3.03

File Changes

Patch Links:

—
Reply to this email directly or view it on GitHub
#178.

@charlesw
Merge branch 'develop' into dev_3.03
961c9a4 
Conflicts:
	Samples/Tesseract.Samples.sln
	src/Tesseract.Tests/EngineTests.cs
	src/Tesseract/Pix.cs
@charlesw
Updated tesseract build to official 3.04 release.
2a9a692
@charlesw charlesw merged commit 2a9a692 into master Dec 19, 2015
@charlesw charlesw deleted the dev_3.03 branch November 30, 2022 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edynamic90 @charlesw @amferguson @jhuntsman