Commit 1fa7ce9a authored by Yuxin Wu's avatar Yuxin Wu

better versioning and import

parent 0526c0ca
[metadata] [metadata]
name = tensorpack name = tensorpack
version = attr: tensorpack.__version__
author = TensorPack contributors author = TensorPack contributors
author-email = ppwwyyxxc@gmail.com author-email = ppwwyyxxc@gmail.com
summary = Neural Network Toolbox on TensorFlow description = Neural Network Toolbox on TensorFlow
description-file = README.md long_description = file: README.md
url = https://github.com/ppwwyyxx/tensorpack url = https://github.com/ppwwyyxx/tensorpack
keywords = tensorflow, deep learning, neural network
license = Apache license = Apache
[options]
[files] zip_safe = False # dataset and __init__ use file
packages = packages = find:
tensorpack
[wheel] [wheel]
universal = 1 universal = 1
...@@ -12,7 +12,6 @@ req = ['numpy', ...@@ -12,7 +12,6 @@ req = ['numpy',
if sys.version_info.major == 2: if sys.version_info.major == 2:
req.extend(['subprocess32', 'functools32']) req.extend(['subprocess32', 'functools32'])
setup(version='0.1', # TODO:
install_requires=req, # setup_requires, extras_requires, scripts
zip_safe=False # dataset and __init__ use file setup(install_requires=req)
)
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# File: __init__.py # File: __init__.py
# Author: Yuxin Wu <ppwwyyxx@gmail.com> # Author: Yuxin Wu <ppwwyyxx@gmail.com>
import numpy # avoid https://github.com/tensorflow/tensorflow/issues/2034 __version__ = '0.1'
import cv2 # avoid https://github.com/tensorflow/tensorflow/issues/1924
from tensorpack.train import * from tensorpack.train import *
from tensorpack.models import * from tensorpack.models import *
...@@ -12,6 +11,3 @@ from tensorpack.tfutils import * ...@@ -12,6 +11,3 @@ from tensorpack.tfutils import *
from tensorpack.callbacks import * from tensorpack.callbacks import *
from tensorpack.dataflow import * from tensorpack.dataflow import *
from tensorpack.predict import * from tensorpack.predict import *
if int(numpy.__version__.split('.')[1]) < 9:
logger.warn("Numpy < 1.9 could be extremely slow on some tasks.")
...@@ -9,6 +9,8 @@ from .base import ProxyDataFlow ...@@ -9,6 +9,8 @@ from .base import ProxyDataFlow
""" This file was deprecated """ """ This file was deprecated """
__all__ = []
class TFFuncMapper(ProxyDataFlow): class TFFuncMapper(ProxyDataFlow):
def __init__(self, ds, def __init__(self, ds,
......
...@@ -8,6 +8,8 @@ from types import ModuleType ...@@ -8,6 +8,8 @@ from types import ModuleType
from ..utils import logger from ..utils import logger
from .common import get_registered_layer from .common import get_registered_layer
__all__ = ['LinearWrap']
class LinearWrap(object): class LinearWrap(object):
""" A simple wrapper to easily create "linear" graph, """ A simple wrapper to easily create "linear" graph,
......
...@@ -95,7 +95,7 @@ def get_dataset_path(*args): ...@@ -95,7 +95,7 @@ def get_dataset_path(*args):
os.path.dirname(__file__), '..', 'dataflow', 'dataset')) os.path.dirname(__file__), '..', 'dataflow', 'dataset'))
if execute_only_once(): if execute_only_once():
from . import logger from . import logger
logger.info("TENSORPACK_DATASET not set, using {} for dataset.".format(d)) logger.warn("TENSORPACK_DATASET not set, using {} for dataset.".format(d))
assert os.path.isdir(d), d assert os.path.isdir(d), d
return os.path.join(d, *args) return os.path.join(d, *args)
......
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