diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-12-20 17:10:03 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-20 17:23:11 -0800 |
| commit | ede3c12a11cd6858eef4de52b7697299743d4660 (patch) | |
| tree | 1995b78f626e20223872cfc699edc7e9f06c56b4 /tensorflow/contrib/specs | |
| parent | 6a2616e360daa08ad175d9856fd2e2fb1b4b2af5 (diff) | |
Uses VariableV2 and removes shape-setting code in tf.Variable.
Change: 142613993
Diffstat (limited to 'tensorflow/contrib/specs')
| -rw-r--r-- | tensorflow/contrib/specs/python/specs_test.py | 22 | ||||
| -rw-r--r-- | tensorflow/contrib/specs/python/summaries_test.py | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tensorflow/contrib/specs/python/specs_test.py b/tensorflow/contrib/specs/python/specs_test.py index b9ddfc4658..e7213a446d 100644 --- a/tensorflow/contrib/specs/python/specs_test.py +++ b/tensorflow/contrib/specs/python/specs_test.py @@ -40,7 +40,7 @@ class SpecsTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (1, 18, 19, 64)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var conv var biasadd relu") + "_ variablev2 conv variablev2 biasadd relu") def testUnary(self): # This is just a quick and dirty check that these ops exist @@ -64,8 +64,8 @@ class SpecsTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (17, 10)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var dot var biasadd sig " - "<> var dot var biasadd relu add") + "_ variablev2 dot variablev2 biasadd sig " + "<> variablev2 dot variablev2 biasadd relu add") def testMpPower(self): with self.test_session(): @@ -89,8 +89,9 @@ class SpecsTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (1, 8, 8, 5)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var conv var biasadd relu maxpool var conv var" - " biasadd relu maxpool var conv var" + "_ variablev2 conv variablev2 biasadd relu maxpool" + " variablev2 conv variablev2" + " biasadd relu maxpool variablev2 conv variablev2" " biasadd relu maxpool") def testAbbrevPower2(self): @@ -104,9 +105,10 @@ class SpecsTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (1, 8, 8, 5)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var conv var biasadd relu maxpool var conv" - " var biasadd relu" - " maxpool var conv var biasadd relu maxpool") + "_ variablev2 conv variablev2 biasadd relu maxpool" + " variablev2 conv variablev2 biasadd relu" + " maxpool variablev2 conv variablev2 biasadd relu" + " maxpool") def testConc(self): with self.test_session(): @@ -118,8 +120,8 @@ class SpecsTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (10, 30)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var dot var biasadd sig " - "<> var dot var biasadd sig _ concatv2") + "_ variablev2 dot variablev2 biasadd sig " + "<> variablev2 dot variablev2 biasadd sig _ concatv2") def testImport(self): with self.test_session(): diff --git a/tensorflow/contrib/specs/python/summaries_test.py b/tensorflow/contrib/specs/python/summaries_test.py index 594a671553..198f6101f0 100644 --- a/tensorflow/contrib/specs/python/summaries_test.py +++ b/tensorflow/contrib/specs/python/summaries_test.py @@ -42,7 +42,7 @@ class SummariesTest(tf.test.TestCase): self.assertEqual(tuple(result.shape), (1, 18, 19, 64)) self.assertEqual(summaries.tf_spec_structure(spec, input_shape=inputs_shape), - "_ var conv var biasadd relu") + "_ variablev2 conv variablev2 biasadd relu") def testStructureFromTensor(self): with self.test_session(): @@ -53,7 +53,7 @@ class SummariesTest(tf.test.TestCase): result = outputs.eval() self.assertEqual(tuple(result.shape), (1, 18, 19, 64)) self.assertEqual(summaries.tf_spec_structure(spec, inputs), - "_ var conv var biasadd relu") + "_ variablev2 conv variablev2 biasadd relu") def testPrint(self): with self.test_session(): |