From b2ed6319042037da98058b6bd8627d2fec41758e Mon Sep 17 00:00:00 2001 From: Siju Samuel Date: Mon, 15 Jul 2019 16:05:48 +0530 Subject: [PATCH 1/3] Deprecated tf.app.run/tf.train.AdamOptimizer removed in mnist.py --- tensorflow/contrib/eager/python/examples/gan/mnist.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/contrib/eager/python/examples/gan/mnist.py b/tensorflow/contrib/eager/python/examples/gan/mnist.py index 9a421792991..697ff73d006 100644 --- a/tensorflow/contrib/eager/python/examples/gan/mnist.py +++ b/tensorflow/contrib/eager/python/examples/gan/mnist.py @@ -278,8 +278,8 @@ def main(_): model_objects = { 'generator': Generator(data_format), 'discriminator': Discriminator(data_format), - 'generator_optimizer': tf.train.AdamOptimizer(FLAGS.lr), - 'discriminator_optimizer': tf.train.AdamOptimizer(FLAGS.lr), + 'generator_optimizer': tf.compat.v1.train.AdamOptimizer(FLAGS.lr), + 'discriminator_optimizer': tf.compat.v1.train.AdamOptimizer(FLAGS.lr), 'step_counter': tf.train.get_or_create_global_step(), } @@ -363,4 +363,4 @@ if __name__ == '__main__': help='disables GPU usage even if a GPU is available') FLAGS, unparsed = parser.parse_known_args() - tf.app.run(main=main, argv=[sys.argv[0]] + unparsed) + tf.compat.v1.app.run(main=main, argv=[sys.argv[0]] + unparsed) From 5d0032a5e538868f6c0aa9e69fb41765eb70a5d1 Mon Sep 17 00:00:00 2001 From: Siju Samuel Date: Mon, 15 Jul 2019 16:07:01 +0530 Subject: [PATCH 2/3] Deprecated tf.Session/tf.train.AdamOptimizer removed in mnist_graph_test.py --- .../contrib/eager/python/examples/gan/mnist_graph_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorflow/contrib/eager/python/examples/gan/mnist_graph_test.py b/tensorflow/contrib/eager/python/examples/gan/mnist_graph_test.py index e73841fbf72..d9ea11b0c0f 100644 --- a/tensorflow/contrib/eager/python/examples/gan/mnist_graph_test.py +++ b/tensorflow/contrib/eager/python/examples/gan/mnist_graph_test.py @@ -49,9 +49,9 @@ class MnistGraphGanBenchmark(tf.test.Benchmark): generator = mnist.Generator(data_format()) discriminator = mnist.Discriminator(data_format()) with tf.variable_scope('generator'): - generator_optimizer = tf.train.AdamOptimizer(0.001) + generator_optimizer = tf.compat.v1.train.AdamOptimizer(0.001) with tf.variable_scope('discriminator'): - discriminator_optimizer = tf.train.AdamOptimizer(0.001) + discriminator_optimizer = tf.compat.v1.train.AdamOptimizer(0.001) # Run models and compute loss noise_placeholder = tf.placeholder(tf.float32, @@ -96,7 +96,7 @@ class MnistGraphGanBenchmark(tf.test.Benchmark): (generator_train, discriminator_train, noise_placeholder ) = self._create_graph(batch_size) - with tf.Session() as sess: + with tf.compat.v1.Session() as sess: tf.contrib.summary.initialize(graph=tf.get_default_graph(), session=sess) @@ -132,7 +132,7 @@ class MnistGraphGanBenchmark(tf.test.Benchmark): generated_images = generator(noise_placeholder) init = tf.global_variables_initializer() - with tf.Session() as sess: + with tf.compat.v1.Session() as sess: sess.run(init) noise = np.random.uniform(-1.0, 1.0, size=[batch_size, NOISE_DIM]) num_burn, num_iters = (30, 1000) From 685dc2f8cc2da7614ce24e85a6856d2becaa4ff0 Mon Sep 17 00:00:00 2001 From: Siju Samuel Date: Mon, 15 Jul 2019 16:07:21 +0530 Subject: [PATCH 3/3] Deprecated tf.train.AdamOptimizer removed in mnist_test.py --- tensorflow/contrib/eager/python/examples/gan/mnist_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow/contrib/eager/python/examples/gan/mnist_test.py b/tensorflow/contrib/eager/python/examples/gan/mnist_test.py index cb99e2b416b..7611ff13ab7 100644 --- a/tensorflow/contrib/eager/python/examples/gan/mnist_test.py +++ b/tensorflow/contrib/eager/python/examples/gan/mnist_test.py @@ -67,9 +67,9 @@ class MnistEagerGanBenchmark(tf.test.Benchmark): generator = mnist.Generator(data_format()) discriminator = mnist.Discriminator(data_format()) with tf.variable_scope('generator'): - generator_optimizer = tf.train.AdamOptimizer(0.001) + generator_optimizer = tf.compat.v1.train.AdamOptimizer(0.001) with tf.variable_scope('discriminator'): - discriminator_optimizer = tf.train.AdamOptimizer(0.001) + discriminator_optimizer = tf.compat.v1.train.AdamOptimizer(0.001) with tf.contrib.summary.create_file_writer( tempfile.mkdtemp(), flush_millis=SUMMARY_FLUSH_MS).as_default():