Skip to content

Commit

Permalink
expose select_foreground_proposals & fix lint (close #395)
Browse files Browse the repository at this point in the history
Summary: Pull Request resolved: https://github.com/fairinternal/detectron2/pull/335

Differential Revision: D18691035

Pulled By: ppwwyyxx

fbshipit-source-id: e199058753d271f0a9ece1d49f46601c8a4501ff
  • Loading branch information
ppwwyyxx authored and yuxinwu committed Nov 26, 2019
1 parent 5926143 commit e75e8f1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
2 changes: 0 additions & 2 deletions detectron2/evaluation/lvis_evaluation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
import itertools
import json
import logging
import numpy as np
import os
import pickle
from collections import OrderedDict
import pycocotools.mask as mask_util
import torch
from fvcore.common.file_io import PathManager

Expand Down
8 changes: 7 additions & 1 deletion detectron2/modeling/roi_heads/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
from .box_head import ROI_BOX_HEAD_REGISTRY, build_box_head
from .keypoint_head import ROI_KEYPOINT_HEAD_REGISTRY, build_keypoint_head
from .mask_head import ROI_MASK_HEAD_REGISTRY, build_mask_head
from .roi_heads import ROI_HEADS_REGISTRY, ROIHeads, StandardROIHeads, build_roi_heads
from .roi_heads import (
ROI_HEADS_REGISTRY,
ROIHeads,
StandardROIHeads,
build_roi_heads,
select_foreground_proposals,
)
from .rotated_fast_rcnn import RROIHeads

from . import cascade_rcnn # isort:skip
2 changes: 1 addition & 1 deletion detectron2/modeling/roi_heads/roi_heads.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def select_foreground_proposals(proposals, bg_label):
Returns:
list[Instances]: N Instances, each contains only the selected foreground instances.
list[Tensor]: N boolean vector, correspond to the selection mask of
each instance. True for selected instances.
each Instances object. True for selected instances.
"""
assert isinstance(proposals, (list, tuple))
assert isinstance(proposals[0], Instances)
Expand Down
5 changes: 1 addition & 4 deletions projects/DensePose/densepose/roi_head.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# -*- coding: utf-8 -*-
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# File:

import torch

from detectron2.modeling import ROI_HEADS_REGISTRY, StandardROIHeads
from detectron2.modeling.poolers import ROIPooler

# Is this function good to expose as an API?
from detectron2.modeling.roi_heads.roi_heads import select_foreground_proposals
from detectron2.modeling.roi_heads import select_foreground_proposals

from .densepose_head import (
build_densepose_data_filter,
Expand Down
6 changes: 2 additions & 4 deletions tests/test_model_zoo.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import unittest

from detectron2 import model_zoo
from detectron2.modeling import GeneralizedRCNN, FPN
from detectron2.modeling import FPN, GeneralizedRCNN

logger = logging.getLogger(__name__)


class TestModelZoo(unittest.TestCase):
def test_get_returns_model(self):
model = model_zoo.get(
"Misc/scratch_mask_rcnn_R_50_FPN_3x_gn.yaml", trained=False
)
model = model_zoo.get("Misc/scratch_mask_rcnn_R_50_FPN_3x_gn.yaml", trained=False)
assert isinstance(model, GeneralizedRCNN), model
assert isinstance(model.backbone, FPN), model.backbone

Expand Down

0 comments on commit e75e8f1

Please sign in to comment.