Commit e4b0bd9d authored by Yuxin Wu's avatar Yuxin Wu

bug fix in dataset dir. add extra requires

parent 57af140a
from setuptools import setup
import sys
req = ['numpy',
'six',
'termcolor',
'tqdm>4.11.1',
'msgpack-python',
'msgpack-numpy',
'pyzmq'
]
if sys.version_info.major == 2:
req.extend(['subprocess32', 'functools32'])
req = [
'numpy',
'six',
'termcolor',
'tqdm>4.11.1',
'msgpack-python',
'msgpack-numpy',
'pyzmq',
'subprocess32;python_version<"3.0"',
'functools32;python_version<"3.0"',
]
extra_req = [
'pillow',
'scipy',
'h5py',
'lmdb',
'matplotlib',
'scikit-learn',
'tornado;python_version<"3.0"',
]
# TODO:
# setup_requires, extras_requires, scripts
setup(install_requires=req)
# setup_requires, scripts
setup(
install_requires=req,
extras_require={
'all': extra_req
},
)
......@@ -82,7 +82,7 @@ def get_dataset_path(*args):
if d is None:
old_d = os.path.abspath(os.path.join(
os.path.dirname(__file__), '..', 'dataflow', 'dataset'))
old_d_ret = os.path.join(d, *args)
old_d_ret = os.path.join(old_d, *args)
new_d = os.path.expanduser('~/tensorpack_data')
if os.path.isdir(old_d_ret):
# there is an old dir containing data, use it for back-compat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment