add support for tf1.6

haowen-xu · Mar 8, 2018 · c31b4e4 · c31b4e4
1 parent 85eb5c9
commit c31b4e4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .idea
 .cache
+.pytest_cache
 *.iml
 /config.py
 /debug.py

diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,9 @@ services:
 env:
   matrix:
   - PYTHON_VERSION=2 TENSORFLOW_VERSION=1.2
-  - PYTHON_VERSION=2 TENSORFLOW_VERSION=1.3
-  - PYTHON_VERSION=2 TENSORFLOW_VERSION=1.4
-  - PYTHON_VERSION=2 TENSORFLOW_VERSION=1.5
   - PYTHON_VERSION=3 TENSORFLOW_VERSION=1.2
-  - PYTHON_VERSION=3 TENSORFLOW_VERSION=1.3
-  - PYTHON_VERSION=3 TENSORFLOW_VERSION=1.4
-  - PYTHON_VERSION=3 TENSORFLOW_VERSION=1.5
+  - PYTHON_VERSION=2 TENSORFLOW_VERSION=1.6
+  - PYTHON_VERSION=3 TENSORFLOW_VERSION=1.6
 install:
   - docker pull "ipwx/travis-tensorflow-docker:py${PYTHON_VERSION}tf${TENSORFLOW_VERSION}"
 script:

diff --git a/README.rst b/README.rst
@@ -11,13 +11,9 @@ TFSnippet
 +------------+-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
 | TensorFlow | Python 2                                                                                        | Python 3                                                                                        |
 +============+=================================================================================================+=================================================================================================+
-| 1.2        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/1 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/5 |
+| 1.2        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/1 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/2 |
 +------------+-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
-| 1.3        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/2 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/6 |
-+------------+-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
-| 1.4        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/3 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/7 |
-+------------+-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
-| 1.5        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/4 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/8 |
+| 1.6        | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/3 | .. image:: https://travis-matrix-badges.herokuapp.com/repos/korepwx/tfsnippet/branches/master/4 |
 +------------+-------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
 
 TF Snippet is a set of utilities for writing and testing TensorFlow models.

diff --git a/tests/distributions/test_univariate.py b/tests/distributions/test_univariate.py
@@ -63,12 +63,12 @@ def test_props(self):
             np.testing.assert_allclose(categorical.logits.eval(), logits)
 
     def test_dtype(self):
-        categorical = Categorical(logits=[0., 1.])
+        categorical = Categorical(logits=tf.constant([0., 1.]))
         self.assertEqual(categorical.dtype, tf.int32)
         samples = categorical.sample()
         self.assertEqual(samples.dtype, tf.int32)
 
-        categorical = Categorical(logits=[0., 1.], dtype=tf.int64)
+        categorical = Categorical(logits=tf.constant([0., 1.]), dtype=tf.int64)
         self.assertEqual(categorical.dtype, tf.int64)
         samples = categorical.sample()
         self.assertEqual(samples.dtype, tf.int64)

diff --git a/tests/distributions/test_wrapper.py b/tests/distributions/test_wrapper.py
@@ -17,7 +17,7 @@ def test_distribution(self):
         self.assertIs(distrib, d)
 
     def test_zs_distribution(self):
-        normal = zd.Normal(0., 1.)
+        normal = zd.Normal(mean=0., std=1.)
         distrib = as_distribution(normal)
         self.assertIsInstance(distrib, Distribution)
         self.assertIsInstance(distrib, ZhuSuanDistribution)

diff --git a/tfsnippet/distributions/univariate.py b/tfsnippet/distributions/univariate.py
@@ -104,6 +104,8 @@ def __init__(self, logits, dtype=None):
             dtype: The value type of samples from the distribution.
                 (default ``tf.int32``)
         """
+        if dtype is None:
+            dtype = tf.int32
         super(Categorical, self).__init__(
             zd.Categorical(logits=logits, dtype=dtype))
 

diff --git a/tfsnippet/utils/tfver.py b/tfsnippet/utils/tfver.py
@@ -15,4 +15,4 @@ def is_tensorflow_version_higher_or_equal(version):
     Returns:
         bool: True if higher or equal to, False if not.
     """
-    return semver.compare(version, tf.__version__) <= 0
+    return semver.compare(version, tf.__version__, loose=True) <= 0