diff --git a/maskrcnn_modanet/cli/main.py b/maskrcnn_modanet/cli/main.py index fa222fd..09d0e01 100644 --- a/maskrcnn_modanet/cli/main.py +++ b/maskrcnn_modanet/cli/main.py @@ -156,9 +156,9 @@ def download(path): https://github.com/kyamagu/paperdoll/tree/master/data/chictopia ''') - failure = os.system("sh " + dir_pkg_path + "download.sh '" + path + "' " + str(fast_download) ) + failure = os.system("bash " + dir_pkg_path + "download.sh '" + path + "' " + str(fast_download) ) - if failure: + if failure == 1: print('Bash script failed. Run again this command after having downloaded the necessary packages') exit() diff --git a/maskrcnn_modanet/download.sh b/maskrcnn_modanet/download.sh index eac4577..1981b8b 100644 --- a/maskrcnn_modanet/download.sh +++ b/maskrcnn_modanet/download.sh @@ -77,6 +77,16 @@ echo $text # download images annotations git clone https://github.com/eBay/modanet.git +cd modanet +cd annotations + +wget -O modanet2018_instances_train.json https://github.com/cad0p/maskrcnn-modanet/releases/download/v1.0.3/modanet2018_instances_train.json + +wget -O modanet2018_instances_val.json https://github.com/cad0p/maskrcnn-modanet/releases/download/v1.0.3/modanet2018_instances_val.json + +cd .. +cd .. + mkdir coco #this will be our dataset final folder cd coco diff --git a/setup.py b/setup.py index c7d362c..582bc50 100644 --- a/setup.py +++ b/setup.py @@ -6,9 +6,9 @@ setuptools.setup( name='maskrcnn-modanet', - version='1.0.2.1', + version='1.0.3', # scripts=[ - # 'maskrcnn_modanet/cli/main.py' + # 'maskrcnn_modanet/download.sh' # ], author="Pier Carlo Cadoppi", author_email="piercarlo.cadoppi@studenti.unipr.it", @@ -42,6 +42,8 @@ 'console_scripts': [ 'maskrcnn-modanet=maskrcnn_modanet.cli.main:main', ], - } + }, + include_package_data=True, + zip_safe=False )