summaryrefslogtreecommitdiff
path: root/Code
diff options
context:
space:
mode:
authorMatt Cooper <matthew_cooper@brown.edu>2016-12-09 18:47:49 -0500
committerMatt Cooper <matthew_cooper@brown.edu>2016-12-09 18:47:49 -0500
commit0197b738067ed76cba63b0eff41ca65ae5e0341d (patch)
tree4f03b188a35d43942cb5dd01b53fc043ee90c2ff /Code
parent9c6b43a967227f7bea591f1647b8dff9953cd7ad (diff)
Updated for tensorflow 0.12
Diffstat (limited to 'Code')
-rw-r--r--Code/avg_runner.py2
-rw-r--r--Code/g_model.py9
2 files changed, 5 insertions, 6 deletions
diff --git a/Code/avg_runner.py b/Code/avg_runner.py
index 959ff90..6809187 100644
--- a/Code/avg_runner.py
+++ b/Code/avg_runner.py
@@ -51,7 +51,7 @@ class AVGRunner:
print 'Init variables...'
self.saver = tf.train.Saver(keep_checkpoint_every_n_hours=2)
- self.sess.run(tf.initialize_all_variables())
+ self.sess.run(tf.global_variables_initializer())
# if load path specified, load a saved model
if model_load_path is not None:
diff --git a/Code/g_model.py b/Code/g_model.py
index 4e0df31..5dc8265 100644
--- a/Code/g_model.py
+++ b/Code/g_model.py
@@ -106,15 +106,14 @@ class GeneratorModel:
scale_height = int(height * scale_factor)
scale_width = int(width * scale_factor)
- inputs = tf.image.resize_images(inputs, scale_height, scale_width)
- scale_gts = tf.image.resize_images(gts, scale_height, scale_width)
+ inputs = tf.image.resize_images(inputs, [scale_height, scale_width])
+ scale_gts = tf.image.resize_images(gts, [scale_height, scale_width])
# for all scales but the first, add the frame generated by the last
# scale to the input
if scale_num > 0:
- last_gen_frames = tf.image.resize_images(last_gen_frames,
- scale_height,
- scale_width)
+ last_gen_frames = tf.image.resize_images(
+ last_gen_frames,[scale_height, scale_width])
inputs = tf.concat(3, [inputs, last_gen_frames])
# generated frame predictions