Skip to content

Commit 3c0509e

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
use non-persistent buffers for pixel_mean/std
Summary: supported since pytorch 1.6: pytorch/pytorch#37191 This will not save pixel_mean/std in checkpoints. This is consistent with our current model zoo format. Reviewed By: theschnitz Differential Revision: D26576833 fbshipit-source-id: b7143d6ef8b106e873958394f80aba75fc11d2cf
1 parent 01a362f commit 3c0509e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

detectron2/modeling/meta_arch/rcnn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def __init__(
6464
if vis_period > 0:
6565
assert input_format is not None, "input_format is required for visualization!"
6666

67-
self.register_buffer("pixel_mean", torch.Tensor(pixel_mean).view(-1, 1, 1))
68-
self.register_buffer("pixel_std", torch.Tensor(pixel_std).view(-1, 1, 1))
67+
self.register_buffer("pixel_mean", torch.Tensor(pixel_mean).view(-1, 1, 1), False)
68+
self.register_buffer("pixel_std", torch.Tensor(pixel_std).view(-1, 1, 1), False)
6969
assert (
7070
self.pixel_mean.shape == self.pixel_std.shape
7171
), f"{self.pixel_mean} and {self.pixel_std} have different shapes!"

detectron2/modeling/meta_arch/retinanet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ def __init__(
137137
self.vis_period = vis_period
138138
self.input_format = input_format
139139

140-
self.register_buffer("pixel_mean", torch.Tensor(pixel_mean).view(-1, 1, 1))
141-
self.register_buffer("pixel_std", torch.Tensor(pixel_std).view(-1, 1, 1))
140+
self.register_buffer("pixel_mean", torch.Tensor(pixel_mean).view(-1, 1, 1), False)
141+
self.register_buffer("pixel_std", torch.Tensor(pixel_std).view(-1, 1, 1), False)
142142

143143
"""
144144
In Detectron1, loss is normalized by number of foreground samples in the batch.

detectron2/modeling/meta_arch/semantic_seg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def __init__(self, cfg):
3535
super().__init__()
3636
self.backbone = build_backbone(cfg)
3737
self.sem_seg_head = build_sem_seg_head(cfg, self.backbone.output_shape())
38-
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1))
39-
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1))
38+
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1), False)
39+
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1), False)
4040

4141
@property
4242
def device(self):

projects/Panoptic-DeepLab/panoptic_deeplab/panoptic_seg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def __init__(self, cfg):
4444
self.backbone = build_backbone(cfg)
4545
self.sem_seg_head = build_sem_seg_head(cfg, self.backbone.output_shape())
4646
self.ins_embed_head = build_ins_embed_branch(cfg, self.backbone.output_shape())
47-
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1))
48-
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1))
47+
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1), False)
48+
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1), False)
4949
self.meta = MetadataCatalog.get(cfg.DATASETS.TRAIN[0])
5050
self.stuff_area = cfg.MODEL.PANOPTIC_DEEPLAB.STUFF_AREA
5151
self.threshold = cfg.MODEL.PANOPTIC_DEEPLAB.CENTER_THRESHOLD

projects/TensorMask/tensormask/arch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ def __init__(self, cfg):
348348
)
349349
# box transform
350350
self.box2box_transform = Box2BoxTransform(weights=cfg.MODEL.TENSOR_MASK.BBOX_REG_WEIGHTS)
351-
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1))
352-
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1))
351+
self.register_buffer("pixel_mean", torch.Tensor(cfg.MODEL.PIXEL_MEAN).view(-1, 1, 1), False)
352+
self.register_buffer("pixel_std", torch.Tensor(cfg.MODEL.PIXEL_STD).view(-1, 1, 1), False)
353353

354354
@property
355355
def device(self):

0 commit comments

Comments
 (0)