summaryrefslogtreecommitdiff
path: root/neural_style.py
diff options
context:
space:
mode:
authorcam <cameron@ideum.com>2017-02-27 14:46:29 -0700
committercam <cameron@ideum.com>2017-02-27 14:46:29 -0700
commitaec13c76fe224daafaf534b8c5a26d772b1a4db5 (patch)
tree6946ef77020c36d7d8ce5892d5468e28c84eda10 /neural_style.py
parent3b81cfe38a8955421947c906b7074e3aa046fc77 (diff)
parente515f89f3635f59a9f96bef2a393b3a11b0a90f1 (diff)
Merge branch 'master' of https://github.com/cysmith/neural-style-tf
Diffstat (limited to 'neural_style.py')
-rw-r--r--neural_style.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/neural_style.py b/neural_style.py
index 86c1eac..b220f12 100644
--- a/neural_style.py
+++ b/neural_style.py
@@ -615,7 +615,7 @@ def stylize(content_img, style_imgs, init_img, frame=None):
def minimize_with_lbfgs(sess, net, optimizer, init_img):
if args.verbose: print('\nMINIMIZING LOSS USING: L-BFGS OPTIMIZER')
- init_op = tf.initialize_all_variables()
+ init_op = tf.global_variables_initializer()
sess.run(init_op)
sess.run(net['input'].assign(init_img))
optimizer.minimize(sess)
@@ -623,7 +623,7 @@ def minimize_with_lbfgs(sess, net, optimizer, init_img):
def minimize_with_adam(sess, net, optimizer, init_img, loss):
if args.verbose: print('\nMINIMIZING LOSS USING: ADAM OPTIMIZER')
train_op = optimizer.minimize(loss)
- init_op = tf.initialize_all_variables()
+ init_op = tf.global_variables_initializer()
sess.run(init_op)
sess.run(net['input'].assign(init_img))
iterations = 0