Merge pull request #119 from facebookresearch/d2

Bug fix for D2

Author: alcinos

d2/detr/config.py

@@ -23,7 +23,6 @@ def add_detr_config(cfg):
     cfg.MODEL.DETR.ENC_LAYERS = 6
     cfg.MODEL.DETR.DEC_LAYERS = 6
     cfg.MODEL.DETR.PRE_NORM = False
-    cfg.MODEL.DETR.PASS_POS_AND_QUERY = True
 
     cfg.MODEL.DETR.HIDDEN_DIM = 256
     cfg.MODEL.DETR.NUM_OBJECT_QUERIES = 100

d2/detr/detr.py

@@ -85,7 +85,6 @@ def __init__(self, cfg):
         enc_layers = cfg.MODEL.DETR.ENC_LAYERS
         dec_layers = cfg.MODEL.DETR.DEC_LAYERS
         pre_norm = cfg.MODEL.DETR.PRE_NORM
-        pass_pos_and_query = cfg.MODEL.DETR.PASS_POS_AND_QUERY
 
         # Loss parameters:
         giou_weight = cfg.MODEL.DETR.GIOU_WEIGHT
@@ -107,7 +106,6 @@ def __init__(self, cfg):
             num_decoder_layers=dec_layers,
             normalize_before=pre_norm,
             return_intermediate_dec=deep_supervision,
-            pass_pos_and_query=pass_pos_and_query,
         )
 
         self.detr = DETR(

models/detr.py

@@ -56,7 +56,7 @@ def forward(self, samples: NestedTensor):
                - "aux_outputs": Optional, only returned when auxilary losses are activated. It is a list of
                                 dictionnaries containing the two above keys for each decoder layer.
         """
-        if not isinstance(samples, NestedTensor):
+        if isinstance(samples, list):
             samples = nested_tensor_from_tensor_list(samples)
         features, pos = self.backbone(samples)