From ea879d73fa19653413cb0339a02f94bd5533195f Mon Sep 17 00:00:00 2001 From: LielinJiang <50691816+LielinJiang@users.noreply.github.com> Date: Sat, 20 Feb 2021 14:23:39 +0800 Subject: [PATCH] [cherrypick 2.0-bera] fix bugs (#168) * add configuration options (#164) e.g. python tools/main.py --c configs/stylegan_v2_256_ffhq.yaml -o total_iters=1 log_config.visiual_interval=1 * fix vgg19 url (#167) Co-authored-by: lyl120117 <278401555@qq.com> --- ppgan/models/criterions/perceptual_loss.py | 2 +- ppgan/utils/options.py | 8 ++++---- tools/main.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ppgan/models/criterions/perceptual_loss.py b/ppgan/models/criterions/perceptual_loss.py index 2c57edc..5e19913 100644 --- a/ppgan/models/criterions/perceptual_loss.py +++ b/ppgan/models/criterions/perceptual_loss.py @@ -120,7 +120,7 @@ class PerceptualLoss(nn.Layer): perceptual_weight=1.0, style_weight=1.0, norm_img=True, - pretrained='https://paddlegan.bj.bcebos.com/model/vgg19.pdparams', + pretrained='https://paddlegan.bj.bcebos.com/models/vgg19.pdparams', criterion='l1'): super(PerceptualLoss, self).__init__() # when loss weight less than zero return None diff --git a/ppgan/utils/options.py b/ppgan/utils/options.py index e87477a..32572c4 100644 --- a/ppgan/utils/options.py +++ b/ppgan/utils/options.py @@ -45,10 +45,10 @@ def parse_args(): default=False, help='skip validation during training') # config options - parser.add_argument('opts', - help='See config for all options', - default=None, - nargs=argparse.REMAINDER) + parser.add_argument("-o", + "--opt", + nargs='+', + help="set configuration options") #for inference parser.add_argument("--source_path", diff --git a/tools/main.py b/tools/main.py index 7d40c11..b7e2b82 100644 --- a/tools/main.py +++ b/tools/main.py @@ -51,6 +51,6 @@ def main(args, cfg): if __name__ == '__main__': args = parse_args() - cfg = get_config(args.config_file) + cfg = get_config(args.config_file, args.opt) main(args, cfg) -- GitLab