From 64fca4804e8ceb19c0dd1fd7866b1c6425740302 Mon Sep 17 00:00:00 2001 From: NullConvergence Date: Tue, 26 Jun 2018 22:43:34 +0200 Subject: [PATCH] Pypi 1.0.0 version --- MANIFEST | 15 +++++++++++++++ README.MD | 2 +- examples/mnist_train.py | 13 ++----------- setup.py | 7 ++++--- 4 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 MANIFEST diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..130adbb --- /dev/null +++ b/MANIFEST @@ -0,0 +1,15 @@ +# file GENERATED by distutils, do NOT edit +setup.py +dnnmodels/__init__.py +dnnmodels/conv2d.py +dnnmodels/flatten.py +dnnmodels/fully_connected.py +dnnmodels/get_model.py +dnnmodels/layer.py +dnnmodels/lrn.py +dnnmodels/max_pool.py +dnnmodels/mlp.py +dnnmodels/relu.py +dnnmodels/softmax.py +dnnmodels/train_graph.py +dnnmodels/utils.py diff --git a/README.MD b/README.MD index 391bb7e..9511f19 100644 --- a/README.MD +++ b/README.MD @@ -7,7 +7,7 @@ The inspiration comes from [Cleverhans](https://github.com/tensorflow/cleverhans ## ``` pip ``` Installation: -``` pip install -e git+https://github.com/NullConvergence/dnn-models#egg=dnn-models ``` +``` pip install pip install dnnmodels ``` ## Manual Installation diff --git a/examples/mnist_train.py b/examples/mnist_train.py index d209197..6efd07d 100644 --- a/examples/mnist_train.py +++ b/examples/mnist_train.py @@ -1,16 +1,7 @@ -# relative imports -# import sys -# import os -# PACKAGE_PARENT = '..' -# SCRIPT_DIR = os.path.dirname(os.path.realpath( -# os.path.join(os.getcwd(), os.path.expanduser(__file__)))) -# sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) - - import tensorflow as tf from cleverhans.utils_mnist import data_mnist -from dnn_models.get_model import basic_cnn -from dnn_models.train_graph import Trainer +from dnnmodels.get_model import basic_cnn +from dnnmodels.train_graph import Trainer # create session sess = tf.Session() diff --git a/setup.py b/setup.py index 9342397..44d932a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ -from setuptools import setup -from setuptools import find_packages +from distutils.core import setup with open("README.md", "r") as fh: long_description = fh.read() @@ -7,11 +6,13 @@ setup(name='dnnmodels', version='1.0.0', url='https://github.com/NullConvergence/dnnmodels', + download_url='https://github.com/NullConvergence/dnnmodels/archive/1.0.0.tar.gz', license='MIT', author='NullConvergence', + author_email='nullconvergence@anonymous.ne', description="Simple models inspired by Cleverhans that help create DNN Architectures", install_requires=[ 'cleverhans', 'tensorflow' ], - packages=find_packages()) + packages=['dnnmodels'])