Commit 7ed37527 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'master' of gitlab.idiap.ch:tiago.pereira/bob.learn.tensorflow

Conflicts:
	bob/learn/tensorflow/network/VGG16_mod.py
parents 3a91b4ee 7d5e69d0
...@@ -61,7 +61,6 @@ class VGG16_mod(SequenceNetwork): ...@@ -61,7 +61,6 @@ class VGG16_mod(SequenceNetwork):
conv5_3_kernel_size=3, conv5_3_kernel_size=3,
conv5_3_output=512, conv5_3_output=512,
fc6_output=4096,
n_classes=10, n_classes=10,
default_feature_layer="fc8", default_feature_layer="fc8",
...@@ -130,7 +129,6 @@ class VGG16_mod(SequenceNetwork): ...@@ -130,7 +129,6 @@ class VGG16_mod(SequenceNetwork):
self.conv5_3_kernel_size = conv5_3_kernel_size self.conv5_3_kernel_size = conv5_3_kernel_size
self.conv5_3_output = conv5_3_output self.conv5_3_output = conv5_3_output
self.fc6_output = fc6_output
self.n_classes = n_classes self.n_classes = n_classes
# First convolutional # First convolutional
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment