Skip to content

Commit efb7939

Browse files
committed
change term warp to wrap
1 parent 8114962 commit efb7939

43 files changed

Lines changed: 244 additions & 247 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ read https://github.com/NVIDIA-AI-IOT/torch2trt#how-does-it-work for detail.
115115
- [x] Side-Aware Boundary Localization
116116
- [x] YOLOv3
117117
- [x] PAA
118-
- [ ] CornerNet(Can not save model)
118+
- [ ] CornerNet(WIP)
119119

120120

121121
Tested on:

mmdet2trt/converters/DeformPool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from .plugins import *
33
import mmcv.ops
44

5-
@tensorrt_converter('mmdet2trt.models.roi_heads.roi_extractors.pooling_layers.deform_roi_pool_extractor.deformable_roi_pool_warp')
5+
@tensorrt_converter('mmdet2trt.models.roi_heads.roi_extractors.pooling_layers.deform_roi_pool_extractor.deformable_roi_pool_wrap')
66
# @tensorrt_converter('mmcv.ops.deform_roi_pool')
77
def convert_DeformPool(ctx):
88
input = get_arg(ctx, 'input', pos=0, default=None)

mmdet2trt/core/anchor/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
from .anchor_generator import AnchorGeneratorWarper, SSDAnchorGeneratorWarper
2-
from .point_generator import PointGeneratorWarper
1+
from .anchor_generator import AnchorGeneratorWraper, SSDAnchorGeneratorWraper
2+
from .point_generator import PointGeneratorWraper

mmdet2trt/core/anchor/anchor_generator.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
import torch
33
from torch import nn
44

@@ -29,11 +29,11 @@ def forward(self, x, stride=None, device = "cuda"):
2929
stride=stride,
3030
device=device)
3131

32-
@register_warper("mmdet.core.anchor.anchor_generator.YOLOAnchorGenerator")
33-
@register_warper("mmdet.core.AnchorGenerator")
34-
class AnchorGeneratorWarper(nn.Module):
32+
@register_wraper("mmdet.core.anchor.anchor_generator.YOLOAnchorGenerator")
33+
@register_wraper("mmdet.core.AnchorGenerator")
34+
class AnchorGeneratorWraper(nn.Module):
3535
def __init__(self, module):
36-
super(AnchorGeneratorWarper, self).__init__()
36+
super(AnchorGeneratorWraper, self).__init__()
3737
self.generator = module
3838

3939
self.base_sizes = module.base_sizes
@@ -56,10 +56,10 @@ def forward(self, feat_list, device = "cuda"):
5656

5757

5858

59-
@register_warper("mmdet.core.anchor.anchor_generator.SSDAnchorGenerator")
60-
class SSDAnchorGeneratorWarper(nn.Module):
59+
@register_wraper("mmdet.core.anchor.anchor_generator.SSDAnchorGenerator")
60+
class SSDAnchorGeneratorWraper(nn.Module):
6161
def __init__(self, module):
62-
super(SSDAnchorGeneratorWarper, self).__init__()
62+
super(SSDAnchorGeneratorWraper, self).__init__()
6363
self.generator = module
6464
self.mlvl_anchors = None
6565

mmdet2trt/core/anchor/point_generator.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
# import mmdet2trt.ops.util_ops as mm2trt_util
33
import mmdet2trt
44
import torch
55
from torch import nn
66

77

8-
@register_warper("mmdet.core.anchor.point_generator.PointGenerator")
9-
class PointGeneratorWarper(nn.Module):
8+
@register_wraper("mmdet.core.anchor.point_generator.PointGenerator")
9+
class PointGeneratorWraper(nn.Module):
1010
def __init__(self, module):
11-
super(PointGeneratorWarper, self).__init__()
11+
super(PointGeneratorWraper, self).__init__()
1212

1313
def forward(self, featmap, stride):
1414
shift_yy, shift_xx = mmdet2trt.ops.arange_gridmesh(featmap, strides=[stride, stride])
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .delta_xywh_bbox_coder import DeltaXYWHBBoxCoderWarper
2-
from .tblr_bbox_coder import TBLRBBoxCoderWarper
3-
from .yolo_bbox_coder import YOLOBBoxCoderWarper
4-
from .bucketing_bbox_coder import BucketingBBoxCoderWarper
1+
from .delta_xywh_bbox_coder import DeltaXYWHBBoxCoderWraper
2+
from .tblr_bbox_coder import TBLRBBoxCoderWraper
3+
from .yolo_bbox_coder import YOLOBBoxCoderWraper
4+
from .bucketing_bbox_coder import BucketingBBoxCoderWraper

mmdet2trt/core/bbox/coder/bucketing_bbox_coder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
from mmdet2trt.ops import util_ops
33
import torch
44
from torch import nn
@@ -73,10 +73,10 @@ def bucket2bbox_batched(proposals,
7373

7474

7575

76-
@register_warper("mmdet.core.bbox.coder.BucketingBBoxCoder")
77-
class BucketingBBoxCoderWarper(nn.Module):
76+
@register_wraper("mmdet.core.bbox.coder.BucketingBBoxCoder")
77+
class BucketingBBoxCoderWraper(nn.Module):
7878
def __init__(self, module):
79-
super(BucketingBBoxCoderWarper, self).__init__()
79+
super(BucketingBBoxCoderWraper, self).__init__()
8080
self.module = module
8181

8282
def forward(self, cls_scores, bbox_preds, anchors,

mmdet2trt/core/bbox/coder/delta_xywh_bbox_coder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
import torch
33
from torch import nn
44
import numpy as np
@@ -87,10 +87,10 @@ def delta2bbox_batched(rois,
8787

8888

8989

90-
@register_warper("mmdet.core.bbox.coder.DeltaXYWHBBoxCoder")
91-
class DeltaXYWHBBoxCoderWarper(nn.Module):
90+
@register_wraper("mmdet.core.bbox.coder.DeltaXYWHBBoxCoder")
91+
class DeltaXYWHBBoxCoderWraper(nn.Module):
9292
def __init__(self, module):
93-
super(DeltaXYWHBBoxCoderWarper, self).__init__()
93+
super(DeltaXYWHBBoxCoderWraper, self).__init__()
9494
self.means = module.means
9595
self.stds = module.stds
9696

mmdet2trt/core/bbox/coder/tblr_bbox_coder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
from mmdet2trt.ops import util_ops
33
import torch
44
from torch import nn
@@ -33,10 +33,10 @@ def batched_blr2bboxes(priors,
3333
return boxes
3434

3535

36-
@register_warper("mmdet.core.bbox.coder.TBLRBBoxCoder")
37-
class TBLRBBoxCoderWarper(nn.Module):
36+
@register_wraper("mmdet.core.bbox.coder.TBLRBBoxCoder")
37+
class TBLRBBoxCoderWraper(nn.Module):
3838
def __init__(self, module):
39-
super(TBLRBBoxCoderWarper, self).__init__()
39+
super(TBLRBBoxCoderWraper, self).__init__()
4040
self.normalizer = module.normalizer
4141

4242
def forward(self, cls_scores, bbox_preds, anchors,

mmdet2trt/core/bbox/coder/yolo_bbox_coder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mmdet2trt.models.builder import register_warper, build_warper
1+
from mmdet2trt.models.builder import register_wraper, build_wraper
22
from mmdet2trt.ops import util_ops
33
import torch
44
from torch import nn
@@ -23,10 +23,10 @@ def yolodecoder_batched(bboxes, pred_bboxes, stride):
2323

2424

2525

26-
@register_warper("mmdet.core.bbox.coder.YOLOBBoxCoder")
27-
class YOLOBBoxCoderWarper(nn.Module):
26+
@register_wraper("mmdet.core.bbox.coder.YOLOBBoxCoder")
27+
class YOLOBBoxCoderWraper(nn.Module):
2828
def __init__(self, module):
29-
super(YOLOBBoxCoderWarper, self).__init__()
29+
super(YOLOBBoxCoderWraper, self).__init__()
3030

3131

3232
def forward(self, cls_scores, bbox_preds, anchors,

0 commit comments

Comments
 (0)