Skip to content

Update vgg_arch.py #605

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

Open
Renzhihan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update vgg_arch.py #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
277e0ed
Update vgg_arch.py
Renzhihan Mar 15, 2023
cf89d56
Update paired_image_dataset.py
Renzhihan Apr 23, 2023
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
4 changes: 2 additions & 2 deletions basicsr/archs/vgg_arch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from collections import OrderedDict
from torch import nn as nn
from torchvision.models import vgg as vgg

from torchvision.models import VGG19_Weights
from basicsr.utils.registry import ARCH_REGISTRY

VGG_PRETRAIN_PATH = 'experiments/pretrained_models/vgg19-dcbb9e9d.pth'
Expand Down Expand Up @@ -105,7 +105,7 @@ def __init__(self,
state_dict = torch.load(VGG_PRETRAIN_PATH, map_location=lambda storage, loc: storage)
vgg_net.load_state_dict(state_dict)
else:
vgg_net = getattr(vgg, vgg_type)(pretrained=True)
vgg_net = getattr(vgg, vgg_type)(weights=VGG19_Weights.DEFAULT)

features = vgg_net.features[:max_idx + 1]

Expand Down
2 changes: 1 addition & 1 deletion basicsr/data/paired_image_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def __getitem__(self, index):
# BGR to RGB, HWC to CHW, numpy to tensor
img_gt, img_lq = img2tensor([img_gt, img_lq], bgr2rgb=True, float32=True)
# normalize
if self.mean is not None or self.std is not None:
if self.mean is not None and self.std is not None:
normalize(img_lq, self.mean, self.std, inplace=True)
normalize(img_gt, self.mean, self.std, inplace=True)

Expand Down