Skip to content

Commit bfd47ae

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
update isort path
Summary: some files were skipped Reviewed By: rbgirshick Differential Revision: D20260481 fbshipit-source-id: 193c74cce8e6cdff68ebc20c3ab14d7076183e9b
1 parent 6901cc7 commit bfd47ae

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

INSTALL.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ also installs detectron2 with a few simple commands.
1818

1919
After having the above dependencies and gcc & g++ ≥ 4.9, run:
2020
```
21-
pip install 'git+https://github.com/facebookresearch/detectron2.git'
21+
python -m pip install 'git+https://github.com/facebookresearch/detectron2.git'
2222
# (add --user if you don't have permission)
2323
2424
# Or, to install it from a local clone:
2525
git clone https://github.com/facebookresearch/detectron2.git
26-
cd detectron2 && pip install -e .
26+
cd detectron2 && python -m pip install -e .
2727
2828
# Or if you are on macOS
29-
# CC=clang CXX=clang++ pip install -e .
29+
# CC=clang CXX=clang++ python -m pip install -e .
3030
```
3131

32-
To __rebuild__ detectron2 that's built from a local clone, `rm -rf build/ **/*.so` then `pip install -e .`.
33-
You often need to rebuild detectron2 after reinstalling PyTorch.
32+
To __rebuild__ detectron2 that's built from a local clone, use `rm -rf build/ **/*.so` to clean the
33+
old build first. You often need to rebuild detectron2 after reinstalling PyTorch.
3434

3535
### Install Pre-Built Detectron2
3636
```
3737
# for CUDA 10.1:
38-
pip install detectron2 -f https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/index.html
38+
python -m pip install detectron2 -f https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/index.html
3939
```
4040
You can replace cu101 with "cu{100,92}" or "cpu".
4141

datasets/prepare_cocofied_lvis.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# -*- coding: utf-8 -*-
22
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
33

4-
import json
54
import copy
5+
import json
66
import os
77
from collections import defaultdict
88

9-
109
# This mapping is extracted from the official LVIS mapping:
1110
# https://github.com/lvis-dataset/lvis-api/blob/master/data/coco_to_synset.json
1211
COCO_SYNSET_CATEGORIES = [

datasets/prepare_panoptic_fpn.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# -*- coding: utf-8 -*-
22
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
33

4-
import time
54
import functools
65
import json
76
import multiprocessing as mp
87
import numpy as np
98
import os
9+
import time
10+
from fvcore.common.download import download
1011
from PIL import Image
1112

1213
from detectron2.data.datasets.builtin_meta import COCO_CATEGORIES
13-
from fvcore.common.download import download
1414

1515
from panopticapi.utils import rgb2id
1616

detectron2/data/datasets/builtin.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
import os
2121

22-
from detectron2.data import MetadataCatalog, DatasetCatalog
23-
from .register_coco import register_coco_instances, register_coco_panoptic_separated
24-
from .lvis import register_lvis_instances, get_lvis_instances_meta
22+
from detectron2.data import DatasetCatalog, MetadataCatalog
23+
24+
from .builtin_meta import _get_builtin_metadata
2525
from .cityscapes import load_cityscapes_instances, load_cityscapes_semantic
26+
from .lvis import get_lvis_instances_meta, register_lvis_instances
2627
from .pascal_voc import register_pascal_voc
27-
from .builtin_meta import _get_builtin_metadata
28-
28+
from .register_coco import register_coco_instances, register_coco_panoptic_separated
2929

3030
# ==== Predefined datasets and splits for COCO ==========
3131

detectron2/data/datasets/cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import os
99
from itertools import chain
1010
import pycocotools.mask as mask_util
11+
from fvcore.common.file_io import PathManager
1112
from PIL import Image
1213

1314
from detectron2.structures import BoxMode
14-
from detectron2.utils.logger import setup_logger
1515
from detectron2.utils.comm import get_world_size
16-
from fvcore.common.file_io import PathManager
16+
from detectron2.utils.logger import setup_logger
1717

1818
try:
1919
import cv2 # noqa

detectron2/data/datasets/lvis.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
22
import logging
33
import os
4-
5-
from fvcore.common.timer import Timer
6-
from detectron2.structures import BoxMode
74
from fvcore.common.file_io import PathManager
5+
from fvcore.common.timer import Timer
6+
87
from detectron2.data import DatasetCatalog, MetadataCatalog
8+
from detectron2.structures import BoxMode
99

1010
from .builtin_meta import _get_coco_instances_meta
1111
from .lvis_v0_5_categories import LVIS_CATEGORIES

detectron2/data/datasets/pascal_voc.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# -*- coding: utf-8 -*-
22
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
33

4-
from fvcore.common.file_io import PathManager
5-
import os
64
import numpy as np
5+
import os
76
import xml.etree.ElementTree as ET
7+
from fvcore.common.file_io import PathManager
88

9-
from detectron2.structures import BoxMode
109
from detectron2.data import DatasetCatalog, MetadataCatalog
11-
10+
from detectron2.structures import BoxMode
1211

1312
__all__ = ["register_pascal_voc"]
1413

detectron2/data/datasets/register_coco.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import copy
33

44
from detectron2.data import DatasetCatalog, MetadataCatalog
5+
56
from .coco import load_coco_json, load_sem_seg
67

78
"""

docs/tutorials/models.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ model = build_model(cfg)
127127
features = model.backbone(images.tensor)
128128
proposals, _ = model.proposal_generator(images, features)
129129
instances = model.roi_heads._forward_box(features, proposals)
130-
mask_features = model.roi_heads.mask_pooler(features, [x.pred_boxes for x in instances])
130+
mask_features = [features[f] for f in model.roi_heads.in_features]
131+
mask_features = model.roi_heads.mask_pooler(mask_features, [x.pred_boxes for x in instances])
131132
```
132133

133134
Note that both options require you to read the existing forward code to understand

projects/PointRend/point_rend/roi_heads.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def _init_mask_head(self, cfg, input_shape):
6464
return
6565
self.mask_coarse_in_features = cfg.MODEL.ROI_MASK_HEAD.IN_FEATURES
6666
self.mask_coarse_side_size = cfg.MODEL.ROI_MASK_HEAD.POOLER_RESOLUTION
67-
self._feature_scales = {k: 1.0 / v.stride for k, v in input_shape.items()}
67+
self._feature_scales = {k: 1.0 / v.stride for k, v in input_shape.items()}
6868
# fmt: on
6969

7070
in_channels = np.sum([input_shape[f].channels for f in self.mask_coarse_in_features])

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ line_length=100
33
multi_line_output=3
44
include_trailing_comma=True
55
known_standard_library=numpy,setuptools,mock
6-
skip=datasets,docs
6+
skip=./datasets,docs
77
skip_glob=*/__init__.py
88
known_myself=detectron2
99
known_third_party=fvcore,matplotlib,cv2,torch,torchvision,PIL,pycocotools,yacs,termcolor,cityscapesscripts,tabulate,tqdm,scipy,lvis,psutil,pkg_resources,caffe2,onnx

0 commit comments

Comments
 (0)