From 514a10de736aa9591250062551721be59ac620c3 Mon Sep 17 00:00:00 2001 From: Andrew Gilbert Date: Tue, 6 Jun 2017 18:45:14 +0900 Subject: [PATCH] Fixed calls to concat and convolution2d --- adversarial_crypto/train_eval.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adversarial_crypto/train_eval.py b/adversarial_crypto/train_eval.py index 1e67be96a5..570de938f4 100644 --- a/adversarial_crypto/train_eval.py +++ b/adversarial_crypto/train_eval.py @@ -128,13 +128,13 @@ def model(self, collection, message, key=None): """ if key is not None: - combined_message = tf.concat(1, [message, key]) + combined_message = tf.concat([message, key], 1) else: combined_message = message # Ensure that all variables created are in the specified collection. with tf.contrib.framework.arg_scope( - [tf.contrib.layers.fully_connected, tf.contrib.layers.convolution], + [tf.contrib.layers.fully_connected, tf.contrib.layers.convolution2d], variables_collections=[collection]): fc = tf.contrib.layers.fully_connected( @@ -147,13 +147,13 @@ def model(self, collection, message, key=None): # and then squeezing it back down). fc = tf.expand_dims(fc, 2) # 2,1 -> 1,2 - conv = tf.contrib.layers.convolution( + conv = tf.contrib.layers.convolution2d( fc, 2, 2, 2, 'SAME', activation_fn=tf.nn.sigmoid) # 1,2 -> 1, 2 - conv = tf.contrib.layers.convolution( + conv = tf.contrib.layers.convolution2d( conv, 2, 1, 1, 'SAME', activation_fn=tf.nn.sigmoid) # 1,2 -> 1, 1 - conv = tf.contrib.layers.convolution( + conv = tf.contrib.layers.convolution2d( conv, 1, 1, 1, 'SAME', activation_fn=tf.nn.tanh) conv = tf.squeeze(conv, 2) return conv