From 268760a526373445638de14903bd2afadefd30ce Mon Sep 17 00:00:00 2001 From: Kaipeng Deng Date: Fri, 13 Mar 2020 16:04:33 +0800 Subject: [PATCH] fix_3d_save_load (#4419) --- PaddleCV/3d_vision/PointNet++/eval_cls.py | 5 +++-- PaddleCV/3d_vision/PointNet++/eval_seg.py | 5 +++-- PaddleCV/3d_vision/PointNet++/train_cls.py | 11 +++++------ PaddleCV/3d_vision/PointNet++/train_seg.py | 11 +++++------ PaddleCV/3d_vision/PointRCNN/eval.py | 7 ++++--- PaddleCV/3d_vision/PointRCNN/train.py | 11 +++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/PaddleCV/3d_vision/PointNet++/eval_cls.py b/PaddleCV/3d_vision/PointNet++/eval_cls.py index ea9cfbef..e27f902d 100644 --- a/PaddleCV/3d_vision/PointNet++/eval_cls.py +++ b/PaddleCV/3d_vision/PointNet++/eval_cls.py @@ -109,8 +109,9 @@ def eval(): exe = fluid.Executor(place) exe.run(startup) - assert os.path.exists("{}.pdparams".format(args.weights)), \ - "Given resume weight {}.pdparams not exist.".format(args.weights) + if not os.path.isdir(args.weights): + assert os.path.exists("{}.pdparams".format(args.weights)), \ + "Given resume weight {}.pdparams not exist.".format(args.weights) fluid.load(eval_prog, args.weights, exe) eval_compile_prog = fluid.compiler.CompiledProgram(eval_prog) diff --git a/PaddleCV/3d_vision/PointNet++/eval_seg.py b/PaddleCV/3d_vision/PointNet++/eval_seg.py index 027211dc..09507648 100644 --- a/PaddleCV/3d_vision/PointNet++/eval_seg.py +++ b/PaddleCV/3d_vision/PointNet++/eval_seg.py @@ -108,8 +108,9 @@ def eval(): exe = fluid.Executor(place) exe.run(startup) - assert os.path.exists("{}.pdparams".format(args.weights)), \ - "Given resume weight {}.pdparams not exist.".format(args.weights) + if not os.path.isdir(args.weights): + assert os.path.exists("{}.pdparams".format(args.weights)), \ + "Given resume weight {}.pdparams not exist.".format(args.weights) fluid.load(eval_prog, args.weights, exe) eval_compile_prog = fluid.compiler.CompiledProgram(eval_prog) diff --git a/PaddleCV/3d_vision/PointNet++/train_cls.py b/PaddleCV/3d_vision/PointNet++/train_cls.py index eb58f682..170d6020 100644 --- a/PaddleCV/3d_vision/PointNet++/train_cls.py +++ b/PaddleCV/3d_vision/PointNet++/train_cls.py @@ -184,12 +184,11 @@ def train(): exe.run(startup) if args.resume: - assert os.path.exists("{}.pdparams".format(args.resume)), \ - "Given resume weight {}.pdparams not exist.".format(args.resume) - assert os.path.exists("{}.pdopt".format(args.resume)), \ - "Given resume optimizer state {}.pdopt not exist.".format(args.resume) - assert os.path.exists("{}.pdmodel".format(args.resume)), \ - "Given resume model parameter list {}.pdmodel not exist.".format(args.resume) + if not os.path.isdir(args.resume): + assert os.path.exists("{}.pdparams".format(args.resume)), \ + "Given resume weight {}.pdparams not exist.".format(args.resume) + assert os.path.exists("{}.pdopt".format(args.resume)), \ + "Given resume optimizer state {}.pdopt not exist.".format(args.resume) fluid.load(train_prog, args.resume, exe) build_strategy = fluid.BuildStrategy() diff --git a/PaddleCV/3d_vision/PointNet++/train_seg.py b/PaddleCV/3d_vision/PointNet++/train_seg.py index 4bdd73af..357ccad9 100644 --- a/PaddleCV/3d_vision/PointNet++/train_seg.py +++ b/PaddleCV/3d_vision/PointNet++/train_seg.py @@ -183,12 +183,11 @@ def train(): exe.run(startup) if args.resume: - assert os.path.exists("{}.pdparams".format(args.resume)), \ - "Given resume weight {}.pdparams not exist.".format(args.resume) - assert os.path.exists("{}.pdopt".format(args.resume)), \ - "Given resume optimizer state {}.pdopt not exist.".format(args.resume) - assert os.path.exists("{}.pdmodel".format(args.resume)), \ - "Given resume model parameter list {}.pdmodel not exist.".format(args.resume) + if not os.path.isdir(args.resume): + assert os.path.exists("{}.pdparams".format(args.resume)), \ + "Given resume weight {}.pdparams not exist.".format(args.resume) + assert os.path.exists("{}.pdopt".format(args.resume)), \ + "Given resume optimizer state {}.pdopt not exist.".format(args.resume) fluid.load(train_prog, args.resume, exe) build_strategy = fluid.BuildStrategy() diff --git a/PaddleCV/3d_vision/PointRCNN/eval.py b/PaddleCV/3d_vision/PointRCNN/eval.py index d3e18c3e..d7a38f38 100644 --- a/PaddleCV/3d_vision/PointRCNN/eval.py +++ b/PaddleCV/3d_vision/PointRCNN/eval.py @@ -165,9 +165,10 @@ def eval(): exe.run(startup) # load weights - assert os.path.exists("{}.pdparams".format(args.weights)), \ - "Given resume weight {}.pdparams not exist.".format(args.weights) - fluid.load(eval_prog, args.weights) + if not os.path.isdir(args.weights): + assert os.path.exists("{}.pdparams".format(args.weights)), \ + "Given resume weight {}.pdparams not exist.".format(args.weights) + fluid.load(eval_prog, args.weights, exe) kitti_feature_dir = os.path.join(args.output_dir, 'features') kitti_output_dir = os.path.join(args.output_dir, 'detections', 'data') diff --git a/PaddleCV/3d_vision/PointRCNN/train.py b/PaddleCV/3d_vision/PointRCNN/train.py index 44e64677..e907407c 100644 --- a/PaddleCV/3d_vision/PointRCNN/train.py +++ b/PaddleCV/3d_vision/PointRCNN/train.py @@ -187,12 +187,11 @@ def train(): exe.run(startup) if args.resume: - assert os.path.exists("{}.pdparams".format(args.resume)), \ - "Given resume weight {}.pdparams not exist.".format(args.resume) - assert os.path.exists("{}.pdopt".format(args.resume)), \ - "Given resume optimizer state {}.pdopt not exist.".format(args.resume) - assert os.path.exists("{}.pdmodel".format(args.resume)), \ - "Given resume model parameter list {}.pdmodel not exist.".format(args.resume) + if not os.path.isdir(args.resume): + assert os.path.exists("{}.pdparams".format(args.resume)), \ + "Given resume weight {}.pdparams not exist.".format(args.resume) + assert os.path.exists("{}.pdopt".format(args.resume)), \ + "Given resume optimizer state {}.pdopt not exist.".format(args.resume) fluid.load(train_prog, args.resume, exe) build_strategy = fluid.BuildStrategy() -- GitLab