Merge branch 'master' into github_templates

Author: luomai

.gitignore

@@ -10,4 +10,5 @@ dist
 docs/_build
 tensorlayer.egg-info
 tensorlayer/__pacache__
-venv/
+venv/
+.pytest_cache/

.travis.yml

@@ -1,43 +1,56 @@
 # https://docs.travis-ci.com/user/languages/python/
 language: python
+
 python:
   - "2.7"
   - "3.5"
   - "3.6" 
 
+#env:
+#  global:
+#
+#  ### == PYPI_PASSWORD === ###
+#  - secure: "##############################################################"
+#
+#  ### === GITHUB_PERSONAL_TOKEN === ###
+#  - secure: "##############################################################"
+  
+  
 install:
   - pip install tensorflow
   - pip install -r requirements.txt
-  - pip install -r tests/requirements.txt
-  - pip install .
+  - pip install .[test]
+  
 
 script:
   # units test
   # https://docs.pytest.org/en/latest/
-  # TODO: make it work
-  # - pytest
+  - pytest
+  
+ 
+before_deploy:
+  - python setup.py sdist
+  - python setup.py bdist_wheel
+  - python setup.py bdist_wheel --universal
+  - python setup.py egg_info
+  
+  
+#deploy:
+#- provider: pypi
+#  user: zsdh123
+#  password: "$PYPI_PASSWORD"
+#  skip_cleanup: true
+#  on:
+#    tags: true
+#    python: '3.6'
 
-  # smoke tests
-  # - make test  # TODO: make it use python3 by default
-  - python tests/test_yapf_format.py
-  - python tests/test_pydocstyle.py
-  - python tests/test_mnist_simple.py
-  - python tests/test_reuse_mlp.py
-  - python tests/test_layers_basic.py
-  - python tests/test_layers_convolution.py
-  - python tests/test_layers_core.py
-  - python tests/test_layers_extend.py
-  - python tests/test_layers_flow_control.py
-  - python tests/test_layers_importer.py
-  - python tests/test_layers_merge.py
-  - python tests/test_layers_normalization.py
-  - python tests/test_layers_padding.py
-  - python tests/test_layers_pooling.py
-  - python tests/test_layers_recurrent.py
-  - python tests/test_layers_shape.py
-  - python tests/test_layers_spatial_transformer.py
-  - python tests/test_layers_special_activation.py
-  - python tests/test_layers_stack.py
-  - python tests/test_layers_super_resolution.py
-  - python tests/test_layers_time_distributed.py
-  - python tests/test_models.py
+#- provider: releases
+#  file:
+#    - dist/*
+#    - tensorlayer.egg-info/PKG-INFO
+#  file_glob: true
+#  skip_cleanup: true
+#  api_key: "$GITHUB_PERSONAL_TOKEN"
+#  on:
+#    tags: true
+#    python: '3.6'

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+testpaths = tests/

setup.py

@@ -133,9 +133,6 @@ def req_file(filename):
     extras_require={
         'test': req_file("tests/requirements.txt")
     },
-
-    zip_safe=True,
-    include_package_data=True,
     scripts=[
         'tl',
     ],

tests/requirements.txt

@@ -1,3 +1,7 @@
-yapf==0.20.2
-pydocstyle==2.1.1
 keras==2.1.5
+pydocstyle==2.1.1
+pytest==3.4.1
+pytest-cache==1.0
+pytest-cov==2.5.1
+pytest-xdist==1.22.2
+yapf==0.20.2

tests/test_layers_basic.py

@@ -1,38 +1,55 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import unittest
+
 import tensorflow as tf
 import tensorlayer as tl
 
-x = tf.placeholder(tf.float32, [None, 100])
-n = tl.layers.InputLayer(x, name='in')
-n = tl.layers.DenseLayer(n, n_units=80, name='d1')
-n = tl.layers.DenseLayer(n, n_units=80, name='d2')
-print(n)
-n.print_layers()
-n.print_params(False)
-print(n.count_params())
 
-if n.count_params() != 14560:
-    raise Exception("params do not match")
+class Layer_Basic_Test(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+
+        x = tf.placeholder(tf.float32, [None, 100])
+        n = tl.layers.InputLayer(x, name='in')
+        n = tl.layers.DenseLayer(n, n_units=80, name='d1')
+        n = tl.layers.DenseLayer(n, n_units=80, name='d2')
+
+        n.print_layers()
+        n.print_params(False)
+
+        n2 = n[:, :30]
+        n2.print_layers()
+
+        cls.n_params = n.count_params()
+        cls.shape_n = n.outputs.get_shape().as_list()
+        cls.shape_n2 = n2.outputs.get_shape().as_list()
+        cls.all_layers = n.all_layers
+        cls.all_params = n.all_params
+
+    @classmethod
+    def tearDownClass(cls):
+        tf.reset_default_graph()
+
+    def test_n_params(self):
+        self.assertEqual(self.n_params, 14560)
+
+    def test_shape_n(self):
+        self.assertEqual(self.shape_n[-1], 80)
 
-shape = n.outputs.get_shape().as_list()
-if shape[-1] != 80:
-    raise Exception("shape do not match")
+    def test_all_layers(self):
+        self.assertEqual(len(self.all_layers), 2)
 
-if len(n.all_layers) != 2:
-    raise Exception("layers do not match")
+    def test_all_params(self):
+        self.assertEqual(len(self.all_params), 4)
 
-if len(n.all_params) != 4:
-    raise Exception("params do not match")
+    def test_shape_n2(self):
+        self.assertEqual(self.shape_n2[-1], 30)
 
-for l in n:
-    print(l)
 
-n2 = n[:, :30]
-print(n2)
-n2.print_layers()
+if __name__ == '__main__':
 
-shape = n2.outputs.get_shape().as_list()
-if shape[-1] != 30:
-    raise Exception("shape do not match")
+    # tf.logging.set_verbosity(tf.logging.INFO)
+    tf.logging.set_verbosity(tf.logging.DEBUG)
 
-for l in n2:
-    print(l)
+    unittest.main()