ccn_arch

jmsaavedrar · Apr 18, 2019 · eb48ed1 · eb48ed1
1 parent 43004a2
commit eb48ed1
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/ConvNet/cnnLib/cnn_arch.py b/ConvNet/cnnLib/cnn_arch.py
@@ -34,14 +34,5 @@ def mnistnet_fn(features, input_shape, n_classes, n_channels, is_training = True
     with tf.variable_scope("class_layer"):        
         fc4 = layers.fc_layer(fc3, n_classes, name = 'fc4', use_relu = False)
         print(" fc4: {} ".format(fc4.get_shape().as_list()))    
-<<<<<<< HEAD
-
-    return {"output": fc4}
-=======
-        #gap = layers.gap_layer(conv_5) # 8x8
-        #print(" gap: {} ".format(gap.get_shape().as_list()))    
-    return {"output": fc4}
 
-
-
->>>>>>> fe03f054ea60fd0c1c06c53fe334bbe9fda9bbe0
+    return {"output": fc4}