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

【WIP】update for infer config #13524

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+16 −9
Open

【WIP】update for infer config #13524

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b2c65
update for infer config
tink2123 Jul 26, 2024
8f826ed
update for infer config
tink2123 Jul 26, 2024
8bfbd5a
update for infer config
tink2123 Jul 29, 2024
cda49b8
update for infer config
tink2123 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions tools/infer/utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,22 +215,29 @@ 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):
if os.path.exists(params_file_path):
break
if not os.path.exists(model_file_path):

if not os.path.exists(params_file_path):
raise ValueError(
"not find model.pdmodel or inference.pdmodel in {}".format(model_dir)
f"not find {file_name}.pdiparams or {file_name}.pdiparams in {model_dir}"
)
if not os.path.exists(params_file_path):

if not os.path.exists(
"{}/{}.pdmodel".format(model_dir, file_name)
) and not os.path.exists("{}/{}.json".format(model_dir, file_name)):
raise ValueError(
"not find model.pdiparams or inference.pdiparams in {}".format(
model_dir
)
f"not find {file_name}.json or {file_name}.pdmodel in {model_dir}"
)

config = inference.Config(model_file_path, params_file_path)
if paddle.__version__ == "0.0.0" or paddle.__version__ >= "3.0.0":
model_path = model_dir
model_prefix = file_name
config = inference.Config(model_path, model_prefix)
else:
model_file_path = "{}/{}.pdmodel".format(model_dir, file_name)
config = inference.Config(model_file_path, params_file_path)

if hasattr(args, "precision"):
if args.precision == "fp16" and args.use_tensorrt:
Expand Down
Loading