AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-08-14 00:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

set PARALLEL_DEVICES default value= 0 (#7935)

Browse Source 
### What problem does this PR solve?


it would be fail if PARALLEL_DEVICES = None in OCR class , because it
pass 0 to TextDetector and TextRecognizer init method.

and It would be simpler to set 0 as the default value for
PARALLEL_DEVICES.

### Type of change

- [x] Refactoring
This commit is contained in:
giiiiiithub 2025-05-29 13:32:16 +08:00 committed by GitHub
parent f584f5c3d0
commit 6ba5a4348a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deepdoc/parser/pdf_parser.py
View File

@ -61,7 +61,7 @@ class RAGFlowPdfParser:
self.ocr = OCR() self.ocr = OCR()
self.parallel_limiter = None self.parallel_limiter = None
if PARALLEL_DEVICES is not None and PARALLEL_DEVICES > 1: if PARALLEL_DEVICES > 1:
self.parallel_limiter = [trio.CapacityLimiter(1) for _ in range(PARALLEL_DEVICES)] self.parallel_limiter = [trio.CapacityLimiter(1) for _ in range(PARALLEL_DEVICES)]
if hasattr(self, "model_speciess"): if hasattr(self, "model_speciess"):

13
deepdoc/vision/ocr.py
View File

@ -529,31 +529,30 @@ class OCR:
"rag/res/deepdoc") "rag/res/deepdoc")
# Append muti-gpus task to the list # Append muti-gpus task to the list
if PARALLEL_DEVICES is not None and PARALLEL_DEVICES > 0: if PARALLEL_DEVICES > 0:
self.text_detector = [] self.text_detector = []
self.text_recognizer = [] self.text_recognizer = []
for device_id in range(PARALLEL_DEVICES): for device_id in range(PARALLEL_DEVICES):
self.text_detector.append(TextDetector(model_dir, device_id)) self.text_detector.append(TextDetector(model_dir, device_id))
self.text_recognizer.append(TextRecognizer(model_dir, device_id)) self.text_recognizer.append(TextRecognizer(model_dir, device_id))
else: else:
self.text_detector = [TextDetector(model_dir, 0)] self.text_detector = [TextDetector(model_dir)]
self.text_recognizer = [TextRecognizer(model_dir, 0)] self.text_recognizer = [TextRecognizer(model_dir)]
except Exception: except Exception:
model_dir = snapshot_download(repo_id="InfiniFlow/deepdoc", model_dir = snapshot_download(repo_id="InfiniFlow/deepdoc",
local_dir=os.path.join(get_project_base_directory(), "rag/res/deepdoc"), local_dir=os.path.join(get_project_base_directory(), "rag/res/deepdoc"),
local_dir_use_symlinks=False) local_dir_use_symlinks=False)
if PARALLEL_DEVICES is not None: if PARALLEL_DEVICES > 0:
assert PARALLEL_DEVICES > 0, "Number of devices must be >= 1"
self.text_detector = [] self.text_detector = []
self.text_recognizer = [] self.text_recognizer = []
for device_id in range(PARALLEL_DEVICES): for device_id in range(PARALLEL_DEVICES):
self.text_detector.append(TextDetector(model_dir, device_id)) self.text_detector.append(TextDetector(model_dir, device_id))
self.text_recognizer.append(TextRecognizer(model_dir, device_id)) self.text_recognizer.append(TextRecognizer(model_dir, device_id))
else: else:
self.text_detector = [TextDetector(model_dir, 0)] self.text_detector = [TextDetector(model_dir)]
self.text_recognizer = [TextRecognizer(model_dir, 0)] self.text_recognizer = [TextRecognizer(model_dir)]
self.drop_score = 0.5 self.drop_score = 0.5
self.crop_image_res_index = 0 self.crop_image_res_index = 0

2
rag/settings.py
View File

@ -62,7 +62,7 @@ SVR_CONSUMER_GROUP_NAME = "rag_flow_svr_task_broker"
PAGERANK_FLD = "pagerank_fea" PAGERANK_FLD = "pagerank_fea"
TAG_FLD = "tag_feas" TAG_FLD = "tag_feas"
PARALLEL_DEVICES = None PARALLEL_DEVICES = 0
try: try:
import torch.cuda import torch.cuda
PARALLEL_DEVICES = torch.cuda.device_count() PARALLEL_DEVICES = torch.cuda.device_count()