Add SignalConv and GDN layer classes, plus dependencies.

Author: Johannes Ballé

README.md

@@ -10,11 +10,11 @@ For usage questions and discussions, please head over to our
 **Please note**: You need TensorFlow 1.9 (or the master branch as of May 2018)
 or later.
 
-To make sure the library imports succeed, try running the two
-tests.
+To make sure the library imports succeed, try running the unit tests.
 ```
-python tensorflow_compression/python/ops/coder_ops_test.py
-python tensorflow_compression/python/layers/entropybottleneck_test.py
+for i in tensorflow_compression/python/*/*_test.py; do
+  python $i
+done
 ```
 
 ## Entropy bottleneck layer

tensorflow_compression/__init__.py

@@ -19,13 +19,26 @@
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=wildcard-import
-from tensorflow_compression.python.layers.entropybottleneck import *
-from tensorflow.contrib.coder.python.ops.coder_ops import *
-# pylint: enable=wildcard-import
+# Dependency imports
 
 from tensorflow.python.util.all_util import remove_undocumented
+
+# pylint: disable=wildcard-import,g-bad-import-order
+from tensorflow.contrib.coder.python.ops.coder_ops import *
+from tensorflow_compression.python.layers.entropy_models import *
+from tensorflow_compression.python.layers.gdn import *
+from tensorflow_compression.python.layers.initializers import *
+from tensorflow_compression.python.layers.parameterizers import *
+from tensorflow_compression.python.layers.signal import *
+from tensorflow_compression.python.ops.math_ops import *
+from tensorflow_compression.python.ops.padding_ops import *
+from tensorflow_compression.python.ops.spectral_ops import *
+# pylint: enable=wildcard-import,g-bad-import-order
+
 remove_undocumented(__name__, [
-    "EntropyBottleneck",
+    "EntropyBottleneck", "GDN", "IdentityInitializer", "Parameterizer",
+    "StaticParameterizer", "RDFTParameterizer", "NonnegativeParameterizer",
+    "SignalConv1D", "SignalConv2D", "SignalConv3D",
+    "upper_bound", "lower_bound", "same_padding_for_kernel", "irdft_matrix",
     "pmf_to_quantized_cdf", "range_decode", "range_encode",
 ])

…ssion/python/layers/entropybottleneck.py …pression/python/layers/entropy_models.pytensorflow_compression/python/layers/entropybottleneck.py renamed to tensorflow_compression/python/layers/entropy_models.py tensorflow_compression/python/layers/entropybottleneck.py renamed to tensorflow_compression/python/layers/entropy_models.py

@@ -19,10 +19,12 @@
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.coder.python.ops import coder_ops
+# Dependency imports
 
 import numpy as np
 
+from tensorflow.contrib.coder.python.ops import coder_ops
+
 from tensorflow.python.eager import context
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes

…/python/layers/entropybottleneck_test.py …ion/python/layers/entropy_models_test.pytensorflow_compression/python/layers/entropybottleneck_test.py renamed to tensorflow_compression/python/layers/entropy_models_test.py tensorflow_compression/python/layers/entropybottleneck_test.py renamed to tensorflow_compression/python/layers/entropy_models_test.py

@@ -19,9 +19,9 @@
 from __future__ import division
 from __future__ import print_function
 
-import numpy as np
+# Dependency imports
 
-from tensorflow_compression.python.layers import entropybottleneck
+import numpy as np
 
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
@@ -30,13 +30,15 @@
 from tensorflow.python.platform import test
 from tensorflow.python.training import gradient_descent
 
+from tensorflow_compression.python.layers import entropy_models
+
 
 class EntropyBottleneckTest(test.TestCase):
 
   def test_noise(self):
     # Tests that the noise added is uniform noise between -0.5 and 0.5.
     inputs = array_ops.placeholder(dtypes.float32, (None, 1))
-    layer = entropybottleneck.EntropyBottleneck()
+    layer = entropy_models.EntropyBottleneck()
     noisy, _ = layer(inputs, training=True)
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
@@ -49,7 +51,7 @@ def test_quantization(self):
     # Tests that inputs are quantized to full integer values, even after
     # quantiles have been updated.
     inputs = array_ops.placeholder(dtypes.float32, (None, 1))
-    layer = entropybottleneck.EntropyBottleneck(optimize_integer_offset=False)
+    layer = entropy_models.EntropyBottleneck(optimize_integer_offset=False)
     quantized, _ = layer(inputs, training=False)
     opt = gradient_descent.GradientDescentOptimizer(learning_rate=1)
     self.assertTrue(len(layer.losses) == 1)
@@ -66,7 +68,7 @@ def test_quantization_optimized_offset(self):
     # have been updated. However, the difference between input and output should
     # be between -0.5 and 0.5, and the offset must be consistent.
     inputs = array_ops.placeholder(dtypes.float32, (None, 1))
-    layer = entropybottleneck.EntropyBottleneck(optimize_integer_offset=True)
+    layer = entropy_models.EntropyBottleneck(optimize_integer_offset=True)
     quantized, _ = layer(inputs, training=False)
     opt = gradient_descent.GradientDescentOptimizer(learning_rate=1)
     self.assertTrue(len(layer.losses) == 1)
@@ -85,7 +87,7 @@ def test_codec(self):
     # Tests that inputs are compressed and decompressed correctly, and quantized
     # to full integer values, even after quantiles have been updated.
     inputs = array_ops.placeholder(dtypes.float32, (1, None, 1))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_last", init_scale=60,
         optimize_integer_offset=False)
     bitstrings = layer.compress(inputs)
@@ -108,7 +110,7 @@ def test_codec_optimized_offset(self):
     # However, the difference between input and output should be between -0.5
     # and 0.5, and the offset must be consistent.
     inputs = array_ops.placeholder(dtypes.float32, (1, None, 1))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_last", init_scale=60,
         optimize_integer_offset=True)
     bitstrings = layer.compress(inputs)
@@ -132,7 +134,7 @@ def test_codec_clipping(self):
     # Tests that inputs are compressed and decompressed correctly, and clipped
     # to the expected range.
     inputs = array_ops.placeholder(dtypes.float32, (1, None, 1))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_last", init_scale=40)
     bitstrings = layer.compress(inputs)
     decoded = layer.decompress(bitstrings, array_ops.shape(inputs)[1:])
@@ -149,7 +151,7 @@ def test_channels_last(self):
     # Test the layer with more than one channel and multiple input dimensions,
     # with the channels in the last dimension.
     inputs = array_ops.placeholder(dtypes.float32, (None, None, None, 2))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_last", init_scale=50)
     noisy, _ = layer(inputs, training=True)
     quantized, _ = layer(inputs, training=False)
@@ -170,7 +172,7 @@ def test_channels_first(self):
     # Test the layer with more than one channel and multiple input dimensions,
     # with the channel dimension right after the batch dimension.
     inputs = array_ops.placeholder(dtypes.float32, (None, 3, None, None))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_first", init_scale=50)
     noisy, _ = layer(inputs, training=True)
     quantized, _ = layer(inputs, training=False)
@@ -192,7 +194,7 @@ def test_compress(self):
     # `test_decompress`. If you set the constant at the end to `True`, this test
     # will fail and the log will contain the new test data.
     inputs = array_ops.placeholder(dtypes.float32, (2, 3, 10))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_first", filters=(), init_scale=2)
     bitstrings = layer.compress(inputs)
     decoded = layer.decompress(bitstrings, array_ops.shape(inputs)[1:])
@@ -237,7 +239,7 @@ def test_decompress(self):
     bitstrings = array_ops.placeholder(dtypes.string)
     input_shape = array_ops.placeholder(dtypes.int32)
     quantized_cdf = array_ops.placeholder(dtypes.int32)
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         data_format="channels_first", filters=(), dtype=dtypes.float32)
     layer.build(self.expected.shape)
     layer._quantized_cdf = quantized_cdf
@@ -253,13 +255,13 @@ def test_build_decompress(self):
     # Test that layer can be built when `decompress` is the first call to it.
     bitstrings = array_ops.placeholder(dtypes.string)
     input_shape = array_ops.placeholder(dtypes.int32, shape=[3])
-    layer = entropybottleneck.EntropyBottleneck(dtype=dtypes.float32)
+    layer = entropy_models.EntropyBottleneck(dtype=dtypes.float32)
     layer.decompress(bitstrings, input_shape[1:], channels=5)
     self.assertTrue(layer.built)
 
   def test_pmf_normalization(self):
     # Test that probability mass functions are normalized correctly.
-    layer = entropybottleneck.EntropyBottleneck(dtype=dtypes.float32)
+    layer = entropy_models.EntropyBottleneck(dtype=dtypes.float32)
     layer.build((None, 10))
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
@@ -268,7 +270,7 @@ def test_pmf_normalization(self):
 
   def test_visualize(self):
     # Test that summary op can be constructed.
-    layer = entropybottleneck.EntropyBottleneck(dtype=dtypes.float32)
+    layer = entropy_models.EntropyBottleneck(dtype=dtypes.float32)
     layer.build((None, 10))
     summary = layer.visualize()
     with self.test_session() as sess:
@@ -278,7 +280,7 @@ def test_visualize(self):
   def test_normalization(self):
     # Test that densities are normalized correctly.
     inputs = array_ops.placeholder(dtypes.float32, (None, 1))
-    layer = entropybottleneck.EntropyBottleneck(filters=(2,))
+    layer = entropy_models.EntropyBottleneck(filters=(2,))
     _, likelihood = layer(inputs, training=True)
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
@@ -291,7 +293,7 @@ def test_normalization(self):
   def test_entropy_estimates(self):
     # Test that entropy estimates match actual range coding.
     inputs = array_ops.placeholder(dtypes.float32, (1, None, 1))
-    layer = entropybottleneck.EntropyBottleneck(
+    layer = entropy_models.EntropyBottleneck(
         filters=(2, 3), data_format="channels_last")
     _, likelihood = layer(inputs, training=True)
     diff_entropy = math_ops.reduce_sum(math_ops.log(likelihood)) / -np.log(2)