Skip to content

Commit 134b95b

Browse files
committed
Text updates in setup.py and README.
1 parent 46b42d3 commit 134b95b

File tree

2 files changed

+18
-32
lines changed

2 files changed

+18
-32
lines changed

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,7 @@ Contributions to this repository are welcome. Examples of things you can contrib
160160
You can also [join our team](https://matterport.com/careers/) and help us build even more projects like this one.
161161

162162
## Requirements
163-
* Python 3.4+
164-
165-
All required packages are listed in standard file:
166-
```bash
167-
pip3 install -r requirements.txt
168-
```
163+
Python 3.4, TensorFlow 1.3, Keras 2.0.8 and other common packages listed in `requirements.txt`.
169164

170165
### MS COCO Requirements:
171166
To train or test on MS COCO, you'll also need:
@@ -180,12 +175,17 @@ If you use Docker, the code has been verified to work on
180175

181176

182177
## Installation
183-
1. Clone this repository. The installation as possible using following command:
178+
1. Install dependencies
179+
```bash
180+
pip3 install -r requirements.txt
181+
```
182+
2. Clone this repository
183+
3. Run setup from the repository root directory
184184
```bash
185185
python3 setup.py install
186186
```
187-
2. Download pre-trained COCO weights (mask_rcnn_coco.h5) from the [releases page](https://github.com/matterport/Mask_RCNN/releases).
188-
3. (Optional) To train or test on MS COCO install `pycocotools` from one of these repos. They are forks of the original pycocotools with fixes for Python3 and Windows (the official repo doesn't seem to be active anymore).
187+
3. Download pre-trained COCO weights (mask_rcnn_coco.h5) from the [releases page](https://github.com/matterport/Mask_RCNN/releases).
188+
4. (Optional) To train or test on MS COCO install `pycocotools` from one of these repos. They are forks of the original pycocotools with fixes for Python3 and Windows (the official repo doesn't seem to be active anymore).
189189
190190
* Linux: https://github.com/waleedka/coco
191191
* Windows: https://github.com/philferriere/cocoapi.

setup.py

+9-23
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,14 @@
33
44
>> pip install -r requirements.txt
55
>> python setup.py install
6-
7-
For uploading to PyPi follow instructions
8-
http://peterdowns.com/posts/first-time-with-pypi.html
9-
10-
Pre-release package
11-
>> python setup.py sdist upload -r pypitest
12-
>> pip install --index-url https://test.pypi.org/simple/ your-package
13-
Release package
14-
>> python setup.py sdist upload -r pypi
15-
>> pip install your-package
166
"""
177
import pip
188
import logging
199
import pkg_resources
2010
try:
21-
from setuptools import setup, Extension # , Command, find_packages
22-
from setuptools.command.build_ext import build_ext
11+
from setuptools import setup
2312
except ImportError:
24-
from distutils.core import setup, Extension # , Command, find_packages
25-
from distutils.command.build_ext import build_ext
13+
from distutils.core import setup
2614

2715

2816
def _parse_requirements(file_path):
@@ -43,22 +31,18 @@ def _parse_requirements(file_path):
4331
logging.warning('Fail load requirements file, so using default ones.')
4432
install_reqs = []
4533

46-
4734
setup(
48-
name='mrcnn',
35+
name='mask-rcnn',
4936
version='2.1',
5037
url='https://github.com/matterport/Mask_RCNN',
51-
5238
author='Matterport',
53-
author_email='', # todo
39+
author_email='[email protected]',
5440
license='MIT',
55-
description='Mask R-CNN: object detection & classification & segmentation',
56-
41+
description='Mask R-CNN for object detection and instance segmentation',
5742
packages=["mrcnn"],
58-
cmdclass={'build_ext': build_ext},
5943
install_requires=install_reqs,
6044
include_package_data=True,
61-
45+
python_requires='>=3.4',
6246
long_description="""This is an implementation of Mask R-CNN on Python 3, Keras, and TensorFlow.
6347
The model generates bounding boxes and segmentation masks for each instance of an object in the image.
6448
It's based on Feature Pyramid Network (FPN) and a ResNet101 backbone.""",
@@ -72,11 +56,13 @@ def _parse_requirements(file_path):
7256
"License :: OSI Approved :: MIT License",
7357
"Natural Language :: English",
7458
"Operating System :: OS Independent",
75-
"Topic :: Scientific/Engineering :: Image object detection",
59+
"Topic :: Scientific/Engineering :: Artificial Intelligence",
7660
"Topic :: Scientific/Engineering :: Image Recognition",
61+
"Topic :: Scientific/Engineering :: Visualization",
7762
"Topic :: Scientific/Engineering :: Image Segmentation",
7863
'Programming Language :: Python :: 3.4',
7964
'Programming Language :: Python :: 3.5',
8065
'Programming Language :: Python :: 3.6',
8166
],
67+
keywords="image instance segmentation object detection mask rcnn r-cnn tensorflow keras",
8268
)

0 commit comments

Comments
 (0)