Merge branch 'nli/performance' of github.com:DS4SD/docling into cau/layout-processing-improvement

This commit is contained in:
Christoph Auer 2024-12-10 15:57:39 +01:00
commit 5497ec8a66
2 changed files with 8 additions and 5 deletions

View File

@ -45,10 +45,13 @@ class EasyOcrModel(BaseOcrModel):
if self.options.use_gpu: if self.options.use_gpu:
device = decide_device(accelerator_options.device) device = decide_device(accelerator_options.device)
# Enable easyocr GPU if running on CUDA, MPS # Enable easyocr GPU if running on CUDA, MPS
use_gpu = device in [ use_gpu = any(
AcceleratorDevice.CUDA, filter(
AcceleratorDevice.MPS, lambda x: str(x) in device,
] [AcceleratorDevice.CUDA, AcceleratorDevice.MPS],
)
)
self.reader = easyocr.Reader( self.reader = easyocr.Reader(
lang_list=self.options.lang, lang_list=self.options.lang,
gpu=use_gpu, gpu=use_gpu,

View File

@ -42,7 +42,7 @@ class RapidOcrModel(BaseOcrModel):
# Decide the accelerator devices # Decide the accelerator devices
device = decide_device(accelerator_options.device) device = decide_device(accelerator_options.device)
use_cuda = device == AcceleratorDevice.CUDA use_cuda = AcceleratorDevice.CUDA in device
use_dml = accelerator_options.device == AcceleratorDevice.AUTO use_dml = accelerator_options.device == AcceleratorDevice.AUTO
intra_op_num_threads = accelerator_options.num_threads intra_op_num_threads = accelerator_options.num_threads