add extra block, lower feature sizes
This commit is contained in:
+11
-5
@@ -145,16 +145,20 @@ class ResNetTypeI(tf.keras.Model):
|
||||
blocks=layer_params[0],
|
||||
stride=1 if not reversed else 2,
|
||||
upsample=reversed)
|
||||
self.layer2 = make_basic_block_layer(filter_num=128,
|
||||
self.layer2 = make_basic_block_layer(filter_num=64,
|
||||
blocks=layer_params[1],
|
||||
stride=2,
|
||||
upsample=reversed)
|
||||
self.layer3 = make_basic_block_layer(filter_num=256,
|
||||
self.layer3 = make_basic_block_layer(filter_num=64,
|
||||
blocks=layer_params[2],
|
||||
stride=2,
|
||||
upsample=reversed)
|
||||
self.layer4 = make_basic_block_layer(filter_num=features if not is_cvae else features*2,
|
||||
self.layer4 = make_basic_block_layer(filter_num=128,
|
||||
blocks=layer_params[3],
|
||||
stride=2,
|
||||
upsample=reversed)
|
||||
self.layer5 = make_basic_block_layer(filter_num=features if not is_cvae else features*2,
|
||||
blocks=layer_params[4],
|
||||
stride=2 if not reversed else 1,
|
||||
upsample=reversed)
|
||||
|
||||
@@ -168,8 +172,10 @@ class ResNetTypeI(tf.keras.Model):
|
||||
x = self.layer2(x, training=training)
|
||||
x = self.layer3(x, training=training)
|
||||
x = self.layer4(x, training=training)
|
||||
x = self.layer5(x, training=training)
|
||||
else:
|
||||
x = self.layer4(inputs, training=training)
|
||||
x = self.layer5(inputs, training=training)
|
||||
x = self.layer4(x, training=training)
|
||||
x = self.layer3(x, training=training)
|
||||
x = self.layer2(x, training=training)
|
||||
x = self.layer1(x, training=training)
|
||||
@@ -229,7 +235,7 @@ class ResNetTypeII(tf.keras.Model):
|
||||
|
||||
|
||||
def resnet_18(features, reversed=False, labels=None, is_cvae=False):
|
||||
return ResNetTypeI(layer_params=[2, 2, 2, 2], features=features, reversed=reversed, labels=labels, is_cvae=is_cvae)
|
||||
return ResNetTypeI(layer_params=[2, 2, 2, 2, 2], features=features, reversed=reversed, labels=labels, is_cvae=is_cvae)
|
||||
|
||||
|
||||
def resnet_34():
|
||||
|
||||
Reference in New Issue
Block a user