More fixes in commits

Author: architrathore

__pycache__/layers.cpython-36.pyc

@@ -11,11 +11,7 @@ def lrelu(x, leak=0.2, name="lrelu", alt_relu_impl=True):
             return tf.maximum(x, leak*x)
 
 
-<<<<<<< HEAD
-def general_conv2d(inputconv, o_d=64, f_h=7, f_w=7, s_h=1, s_w=1, stddev=0.02, padding=None, name="conv2d", do_norm=True, do_relu=True, relufactor=0):
-=======
 def general_conv2d(inputconv, o_d=64, f_h=7, f_w=7, s_h=1, s_w=1, stddev=0.02, padding="VALID", name="conv2d", do_norm=True, do_relu=True, relufactor=0):
->>>>>>> 80b993bcd27a00f9bc26de1fbd2250bbc092827d
     with tf.variable_scope(name):
         w = tf.get_variable('w',[f_h, f_w, inputconv.get_shape()[-1], o_d], 
             initializer=tf.truncated_normal_initializer(stddev=stddev))
@@ -36,11 +32,7 @@ def general_conv2d(inputconv, o_d=64, f_h=7, f_w=7, s_h=1, s_w=1, stddev=0.02, p
 
     return conv
 
-<<<<<<< HEAD
-def general_deconv2d(inputconv, outshape, o_d=64, f_h=7, f_w=7, s_h=1, s_w=1, stddev=0.02, padding=None, name="deconv2d", do_norm=True, do_relu=True, relufactor=0):
-=======
 def general_deconv2d(inputconv, outshape, o_d=64, f_h=7, f_w=7, s_h=1, s_w=1, stddev=0.02, padding="VALID", name="deconv2d", do_norm=True, do_relu=True, relufactor=0):
->>>>>>> 80b993bcd27a00f9bc26de1fbd2250bbc092827d
     with tf.variable_scope(name):
         w = tf.get_variable('w',[f_h, f_w, o_d, inputconv.get_shape()[-1]], 
             initializer=tf.truncated_normal_initializer(stddev=stddev))