diff --git a/PaddleCV/3d_vision/PointNet++/eval_cls.py b/PaddleCV/3d_vision/PointNet++/eval_cls.py index ea9cfbef343840c3f6f40625172135ba811ae27b..e27f902deae70ec4a486c6ac708d4de1749e66b4 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 027211dc833264c5274ff2440d23fd3d511c4f15..095076480a4a478f3fac13556fef68ae329221df 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 eb58f6826f6cf076e56d76cd771b7d8fb2dee943..170d6020cd902cc2b9cf0d2ba1d342c761ab957b 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 4bdd73af5bfc4ab97cd5c5405e1fb0c80e44f961..357ccad9cf3b1aa44bb7dfe4b3d74f51983824ab 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 d3e18c3e4b9b36abebae93276a93ff8ae102a7f6..d7a38f38570ed008e68f1bc40f838e8bc2d4fb25 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 44e646773e830dee90bab17960f9adf62c4dc19b..e907407c753f0dcaacb3a7cd1ce30299d695e107 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()