mirrors
/
PaddleOCR
mirror of https://github.com/PaddlePaddle/PaddleOCR.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update infer/utility.py to support json format model (#14233) 

* update infer/utility.py to support json format model

* merge from #13524

* fix bug

* fix bug

* Update tools/infer/utility.py

Co-authored-by: jzhang533 <jzhang533@gmail.com>

* fix codestyle

---------

Co-authored-by: jzhang533 <jzhang533@gmail.com>
pull/14302/head
Wang Xin 2024-11-18 14:00:58 +08:00 committed by GitHub
parent 500381c940
commit fbba2178d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/infer/utility.py
View File

@ -232,21 +232,26 @@ def create_predictor(args, mode, logger):
else:
file_names = ["model", "inference"]
for file_name in file_names:
model_file_path = "{}/{}.pdmodel".format(model_dir, file_name)
params_file_path = "{}/{}.pdiparams".format(model_dir, file_name)
if os.path.exists(model_file_path) and os.path.exists(params_file_path):
params_file_path = f"{model_dir}/{file_name}.pdiparams"
if os.path.exists(params_file_path):
break
if not os.path.exists(model_file_path):
raise ValueError(
"not find model.pdmodel or inference.pdmodel in {}".format(model_dir)
)
if not os.path.exists(params_file_path):
raise ValueError(f"not find {file_name}.pdiparams in {model_dir}")
if not (
os.path.exists(f"{model_dir}/{file_name}.pdmodel")
or os.path.exists(f"{model_dir}/{file_name}.json")
):
raise ValueError(
"not find model.pdiparams or inference.pdiparams in {}".format(
model_dir
)
f"neither {file_name}.json nor {file_name}.pdmodel was found in {model_dir}."
)
if os.path.exists(f"{model_dir}/{file_name}.json"):
model_file_path = f"{model_dir}/{file_name}.json"
else:
model_file_path = f"{model_dir}/{file_name}.pdmodel"
config = inference.Config(model_file_path, params_file_path)
if hasattr(args, "precision"):