diff --git a/ppgan/datasets/transforms/__init__.py b/ppgan/datasets/transforms/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..3b0e160826a488a942807e210489c7f75f9048e6 --- /dev/null +++ b/ppgan/datasets/transforms/__init__.py @@ -0,0 +1 @@ +from .transforms import ResizeToScale, PairedRandomCrop, PairedRandomHorizontalFlip, Add \ No newline at end of file diff --git a/ppgan/models/criterions/perceptual_loss.py b/ppgan/models/criterions/perceptual_loss.py index f112b9f5c14eeaf0e5ae726aa91beb4c2d8bd5b1..2c57edc46590eff3cac358c22694aa91567f3ad5 100644 --- a/ppgan/models/criterions/perceptual_loss.py +++ b/ppgan/models/criterions/perceptual_loss.py @@ -29,7 +29,7 @@ class PerceptualVGG(nn.Layer): layer_name_list, vgg_type='vgg19', use_input_norm=True, - pretrained_url='https://paddlegan.bj.bcebos.com/model/vgg19.pdparams' + pretrained_url='https://paddlegan.bj.bcebos.com/models/vgg19.pdparams' ): super(PerceptualVGG, self).__init__() diff --git a/ppgan/utils/download.py b/ppgan/utils/download.py index e9411a29db9bef05f7d487699e27731e86e40a44..016358404180a29471da3cc55992f2becffd3867 100644 --- a/ppgan/utils/download.py +++ b/ppgan/utils/download.py @@ -18,20 +18,17 @@ from __future__ import print_function import os import sys -import os.path as osp +import time import shutil -import requests import hashlib import tarfile import zipfile -import time +import requests +import os.path as osp from tqdm import tqdm -import logging from .logger import get_logger -logger = get_logger('ppgan') - PPGAN_HOME = os.path.expanduser("~/.cache/ppgan/") DOWNLOAD_RETRY_LIMIT = 3 @@ -75,6 +72,7 @@ def get_path_from_url(url, md5sum=None, check_exist=True): fullpath = _map_path(url, root_dir) if osp.exists(fullpath) and check_exist and _md5check(fullpath, md5sum): + logger = get_logger('ppgan') logger.info("Found {}".format(fullpath)) else: if ParallelEnv().local_rank == 0: @@ -111,6 +109,7 @@ def _download(url, path, md5sum=None): raise RuntimeError("Download from {} failed. " "Retry limit reached".format(url)) + logger = get_logger('ppgan') logger.info("Downloading {} from {} to {}".format(fname, url, fullname)) req = requests.get(url, stream=True) @@ -141,6 +140,7 @@ def _md5check(fullname, md5sum=None): if md5sum is None: return True + logger = get_logger('ppgan') logger.info("File {} md5 checking...".format(fullname)) md5 = hashlib.md5() with open(fullname, 'rb') as f: @@ -159,6 +159,8 @@ def _decompress(fname): """ Decompress for zip and tar file """ + logger = get_logger('ppgan') + logger.info("Decompressing {}...".format(fname)) # For protecting decompressing interupted,