add

SSnowl · Oct 9, 2021 · b3e97fe · b3e97fe
1 parent f8a4743
commit b3e97fe
Show file tree

Hide file tree

Showing 185 changed files with 8 additions and 10 deletions.
diff --git a/configs/Base-YOLOF.yaml b/configs/Base-YOLOF.yaml
diff --git a/configs/Base-YOLOv7.yaml b/configs/Base-YOLOv7.yaml
diff --git a/configs/canaries/detrt_256_6_6_torchvision.yaml b/configs/canaries/detrt_256_6_6_torchvision.yaml
diff --git a/configs/canaries/regnetx_0.2g.yaml b/configs/canaries/regnetx_0.2g.yaml
diff --git a/configs/canaries/yolomask_2gpu.yaml b/configs/canaries/yolomask_2gpu.yaml
diff --git a/configs/canaries/yolomask_m_8gpu.yaml b/configs/canaries/yolomask_m_8gpu.yaml
diff --git a/configs/coco-instance/solov2_lite.yaml b/configs/coco-instance/solov2_lite.yaml
diff --git a/configs/coco-instance/yolomask.yaml b/configs/coco-instance/yolomask.yaml
diff --git a/configs/coco-instance/yolomask_8gpu.yaml b/configs/coco-instance/yolomask_8gpu.yaml
diff --git a/configs/coco/cspdarknet53.yaml b/configs/coco/cspdarknet53.yaml
diff --git a/configs/coco/darknet53.yaml b/configs/coco/darknet53.yaml
diff --git a/configs/coco/detr/detrt_256_6_6_regnetx_0.4g.yaml b/configs/coco/detr/detrt_256_6_6_regnetx_0.4g.yaml
@@ -9,7 +9,7 @@ MODEL:
     NAME: "build_regnet_backbone"
   REGNETS:
     TYPE: "RegNetX_400MF"
-    OUT_FEATURES: ["s2", "s3", "s4", "s5"] # fpn produce 4 levels, only using 3 for now
+    OUT_FEATURES: ["s2", "s3", "s4"] # fpn produce 4 levels, only using 3 for now
   # RESNETS:
   #   DEPTH: 50
   #   STRIDE_IN_1X1: False
@@ -27,7 +27,7 @@ DATASETS:
   TEST: ("coco_2017_val",)
 
 SOLVER:
-  IMS_PER_BATCH: 128
+  IMS_PER_BATCH: 64
   BASE_LR: 0.0001
   STEPS: (369600,)
   MAX_ITER: 554400

diff --git a/configs/coco/detr/detrt_256_6_6_torchvision.yaml b/configs/coco/detr/detrt_256_6_6_torchvision.yaml
@@ -21,7 +21,7 @@ DATASETS:
   TEST: ("coco_2017_val",)
 
 SOLVER:
-  IMS_PER_BATCH: 128
+  IMS_PER_BATCH: 56
   BASE_LR: 0.0001
   STEPS: (369600,)
   MAX_ITER: 554400

diff --git a/configs/coco/pvt_v2_b0.yaml b/configs/coco/pvt_v2_b0.yaml
diff --git a/configs/coco/r2_50.yaml b/configs/coco/r2_50.yaml
diff --git a/configs/coco/r2_50_l.yaml b/configs/coco/r2_50_l.yaml
diff --git a/configs/coco/r2next_50.yaml b/configs/coco/r2next_50.yaml
diff --git a/configs/coco/r50.yaml b/configs/coco/r50.yaml
diff --git a/configs/coco/regnetx_0.4g.yaml b/configs/coco/regnetx_0.4g.yaml
diff --git a/configs/coco/swin_s.yaml b/configs/coco/swin_s.yaml
diff --git a/configs/coco/swin_t.yaml b/configs/coco/swin_t.yaml
diff --git a/configs/coco/yolof/yolof_CSP_D_53_DC5_3x.yaml b/configs/coco/yolof/yolof_CSP_D_53_DC5_3x.yaml
diff --git a/configs/coco/yolof/yolof_R_50_DC5_1x.yaml b/configs/coco/yolof/yolof_R_50_DC5_1x.yaml
diff --git a/configs/coco/yolox_s.yaml b/configs/coco/yolox_s.yaml
diff --git a/configs/common/coco_schedule.py b/configs/common/coco_schedule.py
diff --git a/configs/common/data/coco.py b/configs/common/data/coco.py
diff --git a/configs/common/data/coco_keypoint.py b/configs/common/data/coco_keypoint.py
diff --git a/configs/common/data/coco_panoptic_separated.py b/configs/common/data/coco_panoptic_separated.py
diff --git a/configs/common/models/mask_rcnn_fpn.py b/configs/common/models/mask_rcnn_fpn.py
diff --git a/configs/common/models/mask_rcnn_fpn_kps.py b/configs/common/models/mask_rcnn_fpn_kps.py
diff --git a/configs/common/models/panoptic_fpn.py b/configs/common/models/panoptic_fpn.py
diff --git a/configs/common/optim.py b/configs/common/optim.py
diff --git a/configs/common/readme.md b/configs/common/readme.md
diff --git a/configs/common/train.py b/configs/common/train.py
diff --git a/configs/facemask/cspdarknet53_1gpu.yaml b/configs/facemask/cspdarknet53_1gpu.yaml
diff --git a/configs/facemask/r2_50_1gpu.yaml b/configs/facemask/r2_50_1gpu.yaml
diff --git a/configs/facemask/r50_1gpu.yaml b/configs/facemask/r50_1gpu.yaml
diff --git a/configs/facemask/r50_pan_1gpu.yaml b/configs/facemask/r50_pan_1gpu.yaml
diff --git a/configs/facemask/swin_tiny_1gpu.yaml b/configs/facemask/swin_tiny_1gpu.yaml
diff --git a/configs/facemask/yolov5_s.yaml b/configs/facemask/yolov5_s.yaml
diff --git a/configs/new_baselines/mask_rcnn_R_50_FPN_100ep_LSJ.py b/configs/new_baselines/mask_rcnn_R_50_FPN_100ep_LSJ.py
diff --git a/configs/new_baselines/mask_rcnn_regnetx_4gf_dds_FPN_200ep_LSJ.py b/configs/new_baselines/mask_rcnn_regnetx_4gf_dds_FPN_200ep_LSJ.py
diff --git a/configs/new_baselines/maskrcnn_kps_regnetx_0.4g.py b/configs/new_baselines/maskrcnn_kps_regnetx_0.4g.py
diff --git a/configs/new_baselines/maskrcnn_regnetx_0.4g.py b/configs/new_baselines/maskrcnn_regnetx_0.4g.py
diff --git a/configs/new_baselines/panoptic_fpn_regnetx_0.4g.py b/configs/new_baselines/panoptic_fpn_regnetx_0.4g.py
diff --git a/configs/new_baselines/panoptic_fpn_regnetx_0.4g_s.py b/configs/new_baselines/panoptic_fpn_regnetx_0.4g_s.py
diff --git a/configs/taco/darknet53.yaml b/configs/taco/darknet53.yaml
diff --git a/configs/taco/r50.yaml b/configs/taco/r50.yaml
diff --git a/configs/tl/cspdarknet.yaml b/configs/tl/cspdarknet.yaml
diff --git a/configs/tl/darknet53.yaml b/configs/tl/darknet53.yaml
diff --git a/configs/tl/r2_50.yaml b/configs/tl/r2_50.yaml
diff --git a/configs/tl/r50.yaml b/configs/tl/r50.yaml
diff --git a/configs/tl/res2net_bifpn.yaml b/configs/tl/res2net_bifpn.yaml
diff --git a/configs/tl/res2net_fpn.yaml b/configs/tl/res2net_fpn.yaml
diff --git a/configs/tl/x_s_pafpn_1gpu.yaml b/configs/tl/x_s_pafpn_1gpu.yaml
diff --git a/configs/tl/yolov5_s.yaml b/configs/tl/yolov5_s.yaml
diff --git a/configs/tl/yolox_s.yaml b/configs/tl/yolox_s.yaml
@@ -17,7 +17,8 @@ MODEL:
   YOLO:
     CLASSES: 5
     IN_FEATURES: ["dark3", "dark4", "dark5"]
-    CONF_THRESHOLD: 0.001
+    # CONF_THRESHOLD: 0.01
+    CONF_THRESHOLD: 0.01
     NMS_THRESHOLD: 0.65
     IGNORE_THRESHOLD: 0.7
     WIDTH_MUL: 0.50
@@ -78,4 +79,4 @@ VIS_PERIOD: 5000
 
 DATALOADER:
   # proposals are part of the dataset_dicts, and take a lot of RAM
-  NUM_WORKERS: 3
+  NUM_WORKERS: 1
diff --git a/configs/tl/yolox_s_1gpu.yaml b/configs/tl/yolox_s_1gpu.yaml
diff --git a/configs/visdrone/r2_50_1gpu.yaml b/configs/visdrone/r2_50_1gpu.yaml
diff --git a/configs/visdrone/yolov5_s.yaml b/configs/visdrone/yolov5_s.yaml
diff --git a/configs/visdrone/yolox_s_1gpu.yaml b/configs/visdrone/yolox_s_1gpu.yaml
diff --git a/configs/voc/darknet53_1gpu.yaml b/configs/voc/darknet53_1gpu.yaml
diff --git a/configs/voc/r2_50_1gpu.yaml b/configs/voc/r2_50_1gpu.yaml
diff --git a/configs/voc/x_s_pafpn_1gpu.yaml b/configs/voc/x_s_pafpn_1gpu.yaml
diff --git a/configs/voc/yolov5_s.yaml b/configs/voc/yolov5_s.yaml
diff --git a/configs/voc/yolox_s_1gpu.yaml b/configs/voc/yolox_s_1gpu.yaml
diff --git a/configs/wearmask/cspdarknet53.yaml b/configs/wearmask/cspdarknet53.yaml
diff --git a/configs/wearmask/cspdarknet53_1gpu.yaml b/configs/wearmask/cspdarknet53_1gpu.yaml
diff --git a/configs/wearmask/darknet53.yaml b/configs/wearmask/darknet53.yaml
diff --git a/configs/wearmask/efficient_b2.yaml b/configs/wearmask/efficient_b2.yaml
diff --git a/configs/wearmask/r50.yaml b/configs/wearmask/r50.yaml
diff --git a/configs/wearmask/r50_1gpu.yaml b/configs/wearmask/r50_1gpu.yaml
diff --git a/configs/wearmask/r50_bifpn.yaml b/configs/wearmask/r50_bifpn.yaml
diff --git a/configs/wearmask/r50_pan.yaml b/configs/wearmask/r50_pan.yaml
diff --git a/configs/wearmask/yolov5_s.yaml b/configs/wearmask/yolov5_s.yaml
diff --git a/demo.py b/demo.py
diff --git a/demo_lazyconfig.py b/demo_lazyconfig.py
diff --git a/deploy/onnxrt_infer.py b/deploy/onnxrt_infer.py
diff --git a/deploy/prune_nni.py b/deploy/prune_nni.py
diff --git a/deploy/quant_tvm.py b/deploy/quant_tvm.py
diff --git a/deploy/trt_cc/.gitignore b/deploy/trt_cc/.gitignore
diff --git a/deploy/trt_cc/CMakeLists.txt b/deploy/trt_cc/CMakeLists.txt
diff --git a/deploy/trt_cc/demo_yolox.cc b/deploy/trt_cc/demo_yolox.cc
diff --git a/deploy/trt_cc/demo_yolox_origin.cc b/deploy/trt_cc/demo_yolox_origin.cc
diff --git a/deploy/trt_cc/logging.h b/deploy/trt_cc/logging.h
diff --git a/deploy/trt_cc/readme.md b/deploy/trt_cc/readme.md
diff --git a/export_onnx.py b/export_onnx.py
diff --git a/export_torchscript.py b/export_torchscript.py
diff --git a/images/COCO_val2014_000000001722.jpg b/images/COCO_val2014_000000001722.jpg
diff --git a/images/COCO_val2014_000000001856.jpg b/images/COCO_val2014_000000001856.jpg
diff --git a/images/COCO_val2014_000000001869.jpg b/images/COCO_val2014_000000001869.jpg
diff --git a/images/COCO_val2014_000000001960.jpg b/images/COCO_val2014_000000001960.jpg
diff --git a/images/COCO_val2014_000000002149.jpg b/images/COCO_val2014_000000002149.jpg
diff --git a/images/COCO_val2014_000000002153.jpg b/images/COCO_val2014_000000002153.jpg
diff --git a/images/COCO_val2014_000000002171.jpg b/images/COCO_val2014_000000002171.jpg
diff --git a/images/COCO_val2014_000000002315.jpg b/images/COCO_val2014_000000002315.jpg
diff --git a/images/COCO_val2014_000000002532.jpg b/images/COCO_val2014_000000002532.jpg
diff --git a/images/mask/u=1506317376,3450613040&fm=26&fmt=auto&gp=0.jpg b/images/mask/u=1506317376,3450613040&fm=26&fmt=auto&gp=0.jpg
diff --git a/images/mask/u=3352497688,3286290828&fm=26&fmt=auto&gp=0.jpg b/images/mask/u=3352497688,3286290828&fm=26&fmt=auto&gp=0.jpg
diff --git a/images/mask/u=3557104275,359021270&fm=26&fmt=auto&gp=0.jpg b/images/mask/u=3557104275,359021270&fm=26&fmt=auto&gp=0.jpg
diff --git a/images/mask/u=4153583989,584404369&fm=26&fmt=auto&gp=0.jpg b/images/mask/u=4153583989,584404369&fm=26&fmt=auto&gp=0.jpg
diff --git a/images/mask/u=724341885,3385420344&fm=26&fmt=auto&gp=0.jpg b/images/mask/u=724341885,3385420344&fm=26&fmt=auto&gp=0.jpg
diff --git a/log.md b/log.md
diff --git a/readme.md b/readme.md
diff --git a/requirements.txt b/requirements.txt
diff --git a/tests.py b/tests.py
diff --git a/tools/compute_anchors.py b/tools/compute_anchors.py
diff --git a/tools/convert_detr_to_d2.py b/tools/convert_detr_to_d2.py
diff --git a/tools/demo_onnx_detr.py b/tools/demo_onnx_detr.py
diff --git a/tools/demo_trt_detr.py b/tools/demo_trt_detr.py
diff --git a/tools/eval_coco.py b/tools/eval_coco.py
diff --git a/tools/train_detr.py b/tools/train_detr.py
diff --git a/train_cocomini.py b/train_cocomini.py
diff --git a/train_custom.py b/train_custom.py
diff --git a/train_net.py b/train_net.py
diff --git a/train_taco.py b/train_taco.py
diff --git a/train_tl.py b/train_tl.py
diff --git a/train_visdrone.py b/train_visdrone.py
diff --git a/train_voc.py b/train_voc.py
diff --git a/train_wearmask.py b/train_wearmask.py
diff --git a/yolov7/__init__.py b/yolov7/__init__.py
diff --git a/yolov7/config.py b/yolov7/config.py
diff --git a/yolov7/data/dataset_mapper.py b/yolov7/data/dataset_mapper.py
diff --git a/yolov7/data/detection_utils.py b/yolov7/data/detection_utils.py
diff --git a/yolov7/data/transforms/__init__.py b/yolov7/data/transforms/__init__.py
diff --git a/yolov7/data/transforms/augmentation_impl.py b/yolov7/data/transforms/augmentation_impl.py
diff --git a/yolov7/data/transforms/data_augment.py b/yolov7/data/transforms/data_augment.py
diff --git a/yolov7/data/transforms/transform.py b/yolov7/data/transforms/transform.py
diff --git a/yolov7/modeling/__init__.py b/yolov7/modeling/__init__.py
diff --git a/yolov7/modeling/backbone/__init__.py b/yolov7/modeling/backbone/__init__.py
diff --git a/yolov7/modeling/backbone/anchordetr_backbone.py b/yolov7/modeling/backbone/anchordetr_backbone.py
diff --git a/yolov7/modeling/backbone/cspdarknet.py b/yolov7/modeling/backbone/cspdarknet.py
diff --git a/yolov7/modeling/backbone/cspresnet.py b/yolov7/modeling/backbone/cspresnet.py
diff --git a/yolov7/modeling/backbone/darknet.py b/yolov7/modeling/backbone/darknet.py
diff --git a/yolov7/modeling/backbone/darknetx.py b/yolov7/modeling/backbone/darknetx.py
diff --git a/yolov7/modeling/backbone/detr_backbone.py b/yolov7/modeling/backbone/detr_backbone.py
diff --git a/yolov7/modeling/backbone/dla.py b/yolov7/modeling/backbone/dla.py
diff --git a/yolov7/modeling/backbone/dlafpn.py b/yolov7/modeling/backbone/dlafpn.py
diff --git a/yolov7/modeling/backbone/efficientnet.py b/yolov7/modeling/backbone/efficientnet.py
diff --git a/yolov7/modeling/backbone/layers/__init__.py b/yolov7/modeling/backbone/layers/__init__.py
diff --git a/yolov7/modeling/backbone/layers/activations.py b/yolov7/modeling/backbone/layers/activations.py
diff --git a/yolov7/modeling/backbone/layers/utils.py b/yolov7/modeling/backbone/layers/utils.py
diff --git a/yolov7/modeling/backbone/layers/wrappers.py b/yolov7/modeling/backbone/layers/wrappers.py
diff --git a/yolov7/modeling/backbone/pvt_v2.py b/yolov7/modeling/backbone/pvt_v2.py
@@ -7,8 +7,6 @@
 from timm.models.layers import DropPath, to_2tuple, trunc_normal_
 from timm.models.registry import register_model
 from timm.models.vision_transformer import _cfg
-
-from mmcv.runner import load_checkpoint
 import math
 from detectron2.modeling.backbone import BACKBONE_REGISTRY, Backbone
 from detectron2.utils.logger import logging

diff --git a/yolov7/modeling/backbone/regnet.py b/yolov7/modeling/backbone/regnet.py
diff --git a/yolov7/modeling/backbone/res2nets/__init__.py b/yolov7/modeling/backbone/res2nets/__init__.py
diff --git a/yolov7/modeling/backbone/res2nets/res2net.py b/yolov7/modeling/backbone/res2nets/res2net.py
diff --git a/yolov7/modeling/backbone/res2nets/res2net_v1b.py b/yolov7/modeling/backbone/res2nets/res2net_v1b.py
diff --git a/yolov7/modeling/backbone/res2nets/res2next.py b/yolov7/modeling/backbone/res2nets/res2next.py
diff --git a/yolov7/modeling/backbone/res2nets/wrapper.py b/yolov7/modeling/backbone/res2nets/wrapper.py
diff --git a/yolov7/modeling/backbone/swin_transformer.py b/yolov7/modeling/backbone/swin_transformer.py
diff --git a/yolov7/modeling/backbone/volo.py b/yolov7/modeling/backbone/volo.py
diff --git a/yolov7/modeling/backbone/yolov5_backbone.py b/yolov7/modeling/backbone/yolov5_backbone.py
diff --git a/yolov7/modeling/head/__init__.py b/yolov7/modeling/head/__init__.py
diff --git a/yolov7/modeling/head/box_regression.py b/yolov7/modeling/head/box_regression.py
diff --git a/yolov7/modeling/head/decoder.py b/yolov7/modeling/head/decoder.py
diff --git a/yolov7/modeling/head/encoder.py b/yolov7/modeling/head/encoder.py
diff --git a/yolov7/modeling/head/sem_seg_head.py b/yolov7/modeling/head/sem_seg_head.py
diff --git a/yolov7/modeling/head/uniform_matcher.py b/yolov7/modeling/head/uniform_matcher.py
diff --git a/yolov7/modeling/head/yolox_head.py b/yolov7/modeling/head/yolox_head.py
diff --git a/yolov7/modeling/loss/loss.py b/yolov7/modeling/loss/loss.py
diff --git a/yolov7/modeling/meta_arch/__init__.py b/yolov7/modeling/meta_arch/__init__.py
diff --git a/yolov7/modeling/meta_arch/anchor_detr.py b/yolov7/modeling/meta_arch/anchor_detr.py
diff --git a/yolov7/modeling/meta_arch/detr.py b/yolov7/modeling/meta_arch/detr.py
diff --git a/yolov7/modeling/meta_arch/detr_seg.py b/yolov7/modeling/meta_arch/detr_seg.py
diff --git a/yolov7/modeling/meta_arch/maskrcnn_seg.py b/yolov7/modeling/meta_arch/maskrcnn_seg.py
diff --git a/yolov7/modeling/meta_arch/solov2.py b/yolov7/modeling/meta_arch/solov2.py
diff --git a/yolov7/modeling/meta_arch/utils.py b/yolov7/modeling/meta_arch/utils.py
diff --git a/yolov7/modeling/meta_arch/yolo.py b/yolov7/modeling/meta_arch/yolo.py
diff --git a/yolov7/modeling/meta_arch/yolof.py b/yolov7/modeling/meta_arch/yolof.py
diff --git a/yolov7/modeling/meta_arch/yolomask.py b/yolov7/modeling/meta_arch/yolomask.py
diff --git a/yolov7/modeling/meta_arch/yolov5.py b/yolov7/modeling/meta_arch/yolov5.py
diff --git a/yolov7/modeling/meta_arch/yolov7.py b/yolov7/modeling/meta_arch/yolov7.py
diff --git a/yolov7/modeling/meta_arch/yolov7p.py b/yolov7/modeling/meta_arch/yolov7p.py
diff --git a/yolov7/modeling/meta_arch/yolox.py b/yolov7/modeling/meta_arch/yolox.py
@@ -102,10 +102,8 @@ def preprocess_image(self, batched_inputs, training):
             images, size_divisibility=self.size_divisibility, pad_value=self.padded_value)
         # logger.info('images ori shape: {}'.format(images.tensor.shape))
 
-        comm.synchronize()
         if training and self.iter > self.enable_l1_loss_at and not self.use_l1:
             meg = torch.BoolTensor(1).to(self.device)
-            comm.synchronize()
             if comm.is_main_process():
                 logger.info(
                     '[master] enable l1 loss now at iter: {}'.format(self.iter))
@@ -114,7 +112,8 @@ def preprocess_image(self, batched_inputs, training):
 
             if comm.get_world_size() > 1:
                 comm.synchronize()
-                dist.broadcast(meg, 0)
+                if comm.is_main_process():
+                    dist.broadcast(meg, 0)
             self.head.use_l1 = meg.item()
             self.use_l1 = meg.item()
             comm.synchronize()

diff --git a/yolov7/modeling/neck/bifpn.py b/yolov7/modeling/neck/bifpn.py
diff --git a/yolov7/modeling/neck/ppyolo_pan.py b/yolov7/modeling/neck/ppyolo_pan.py
diff --git a/yolov7/modeling/neck/yolo_fpn.py b/yolov7/modeling/neck/yolo_fpn.py
diff --git a/yolov7/modeling/neck/yolo_pafpn.py b/yolov7/modeling/neck/yolo_pafpn.py
diff --git a/yolov7/utils/__init__.py b/yolov7/utils/__init__.py
diff --git a/yolov7/utils/allreduce_norm.py b/yolov7/utils/allreduce_norm.py
diff --git a/yolov7/utils/boxes.py b/yolov7/utils/boxes.py
diff --git a/yolov7/utils/detr_utils.py b/yolov7/utils/detr_utils.py
diff --git a/yolov7/utils/misc.py b/yolov7/utils/misc.py
diff --git a/yolov7/utils/solov2_utils.py b/yolov7/utils/solov2_utils.py