Skip to content

Commit b84b7be

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
update readme and dependency
Summary: resolve facebookresearch#3 Reviewed By: rbgirshick Differential Revision: D17872890 fbshipit-source-id: 4222bafc3d83da85d931b937d45064eae2a1fd4f
1 parent 35993be commit b84b7be

File tree

8 files changed

+12
-64
lines changed

8 files changed

+12
-64
lines changed

INSTALL.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ python setup.py build develop
2727
# or, as an alternative to `setup.py`, do
2828
# pip install .
2929
```
30+
Note: you may need to rebuild detectron2 after reinstalling a different build of PyTorch.
3031

3132
### Common Installation Issues
3233

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ learning framework.
1212
<img src="https://user-images.githubusercontent.com/1381301/66535560-d3422200-eace-11e9-9123-5535d469db19.png"/>
1313
</div>
1414

15-
See our [blog post](https://ai.facebook.com/blog/-detectron2-a-pytorch-based-modular-object-detection-library-/)
15+
Check our [blog post](https://ai.facebook.com/blog/-detectron2-a-pytorch-based-modular-object-detection-library-/)
1616
to see more demos and learn what's new in detectron2.
1717

1818
## Installation

configs/quick_schedules/README.md

-50
Original file line numberDiff line numberDiff line change
@@ -1,51 +1 @@
11
These are quick configs for performance or accuracy regression tracking purposes.
2-
3-
## Perf testing configs:
4-
5-
### Inference
6-
7-
Reference devgpu configuration:
8-
9-
- 48 core Intel(R) Xeon(R) CPU E5-2680 v3 @ 2.50GHz
10-
- 2x M40 (12GB)
11-
- buck build @mode/dev-nosan
12-
13-
configs/quick_schedules/mask_rcnn_R_50_C4_inference_acc_test.yaml
14-
```
15-
# Before https://github.com/fairinternal/detectron2/pull/84
16-
Total inference time: 0:00:30.808294 (0.6161658811569214 s / img per device, on 2 devices)
17-
# After https://github.com/fairinternal/detectron2/pull/84
18-
Total inference time: 0:00:36.952044 (0.7390408849716187 s / img per device, on 2 devices)
19-
```
20-
21-
configs/quick_schedules/mask_rcnn_R_50_FPN_inference_acc_test.yaml
22-
```
23-
# Before https://github.com/fairinternal/detectron2/pull/84
24-
Total inference time: 0:00:21.773355 (0.435467095375061 s / img per device, on 2 devices)
25-
# After https://github.com/fairinternal/detectron2/pull/84
26-
Total inference time: 0:00:28.766723 (0.5753344583511353 s / img per device, on 2 devices)
27-
```
28-
29-
### Training
30-
31-
TODO
32-
33-
They are equivalent to the standard C4 / FPN models, only with extremely short schedules.
34-
35-
Metrics to look at:
36-
37-
```
38-
INFO: Total training time: 0:3:20.276231
39-
...
40-
INFO: Total inference time: 0:01:20.276231
41-
```
42-
43-
44-
## Accuracy testing configs:
45-
46-
They are simplified versions of standard models, trained and tested on the same
47-
minival dataset, with short schedules.
48-
49-
The schedule is designed to provide a stable enough mAP within minimal amount of training time.
50-
51-
Metrics to look at: mAPs.

configs/semantic_R_101_FPN_1x.yaml

-11
This file was deleted.

detectron2/engine/launch.py

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def launch(main_func, num_gpus_per_machine, num_machines=1, machine_rank=0, dist
5555
def _distributed_worker(
5656
local_rank, main_func, world_size, num_gpus_per_machine, machine_rank, dist_url, args
5757
):
58+
assert torch.cuda.is_available(), "cuda is not available. Please check your installation."
5859
global_rank = machine_rank * num_gpus_per_machine + local_rank
5960
try:
6061
dist.init_process_group(

docs/conf.py

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

4+
# flake8: noqa
5+
46
# Configuration file for the Sphinx documentation builder.
57
#
68
# This file does only contain a selection of the most common options. For a
@@ -48,6 +50,8 @@
4850
"torch.autograd.function",
4951
"torch.nn.modules",
5052
"torch.nn.modules.utils",
53+
"torchvision",
54+
"torchvision.ops",
5155
]:
5256
sys.modules[m] = mock.Mock(name=m)
5357

docs/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ yacs
1212
tabulate
1313
git+git://github.com/facebookresearch/fvcore.git
1414
https://download.pytorch.org/whl/nightly/cpu/torch-1.3.0.dev20191010%2Bcpu-cp37-cp37m-linux_x86_64.whl
15+
https://download.pytorch.org/whl/nightly/cpu/torchvision-0.5.0.dev20191008%2Bcpu-cp37-cp37m-linux_x86_64.whl

setup.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ def get_extensions():
6060
name="detectron2",
6161
version="0.1",
6262
author="FAIR",
63-
url="unknown",
64-
description="object detection in pytorch",
63+
url="https://github.com/facebookresearch/detectron2",
64+
description="Detectron2 is FAIR's next-generation research "
65+
"platform for object detection and segmentation.",
6566
packages=find_packages(exclude=("configs", "tests")),
6667
install_requires=[
6768
"termcolor>=1.1",
@@ -72,6 +73,7 @@ def get_extensions():
7273
"matplotlib",
7374
"tqdm>4.29.0",
7475
"shapely",
76+
"tensorboard",
7577
],
7678
ext_modules=get_extensions(),
7779
cmdclass={"build_ext": torch.utils.cpp_extension.BuildExtension},

0 commit comments

Comments
 (0)