convolutional weights model
This commit is contained in:
+2
-2
@@ -171,13 +171,13 @@ class AEEncoderNew(tf.keras.Model):
|
||||
|
||||
class DecoderNew(tf.keras.Model):
|
||||
|
||||
def __init__(self, depths, dims, kernel_size=7, is_label=False):
|
||||
def __init__(self, depths, dims, kernel_size=7, is_label=False, learn_weights=False):
|
||||
super(DecoderNew, self).__init__()
|
||||
|
||||
self.is_label = is_label
|
||||
|
||||
if not is_label:
|
||||
self.decoder = ConvNeXtReverse(depths=depths, dims=dims, kernel_size=kernel_size)
|
||||
self.decoder = ConvNeXtReverse(depths=depths, dims=dims, kernel_size=kernel_size, learn_weights=learn_weights)
|
||||
else:
|
||||
self.decoder = ConvNeXtReverseLabels(depths=depths, dims=dims, nr_of_classes=7)
|
||||
|
||||
|
||||
@@ -181,6 +181,7 @@ class CVAENew(tf.keras.Model):
|
||||
|
||||
self.encoder = VariationalEncoderNew(config['cvae']['encoder_depths'], config['cvae']['encoder_dims'], kernel_size=config['cvae']['kernel_size'])
|
||||
self.decoder = DecoderNew(config['cvae']['decoder_depths'], config['cvae']['decoder_dims'], config['cvae']['kernel_size'])
|
||||
self.decoder_weights = DecoderNew(config['cvae']['decoder_weights_depths'], config['cvae']['decoder_weights_dims'], config['cvae']['kernel_size'], learn_weights=True)
|
||||
|
||||
self.reshape = tf.keras.layers.Reshape((8, 4, 64))
|
||||
|
||||
@@ -213,7 +214,8 @@ class CVAENew(tf.keras.Model):
|
||||
|
||||
z = tf.concat([eps, z_cond], axis=-1)
|
||||
|
||||
x, weights = self.decoder(z, training=False)
|
||||
x = self.decoder(z, training=False)
|
||||
weights = self.decoder_weights(z, training=False)
|
||||
|
||||
if self.avg_garment is not None:
|
||||
x = x + self.avg_garment[tf.newaxis,:,:,:]
|
||||
@@ -271,7 +273,8 @@ class CVAENew(tf.keras.Model):
|
||||
|
||||
|
||||
z = tf.concat([z, z_cond], axis=-1)
|
||||
x, weights = self.decoder(z, training=training)
|
||||
x = self.decoder(z, training=training)
|
||||
weights = self.decoder_weights(z, training=training)
|
||||
|
||||
if self.avg_garment is not None:
|
||||
x = x + self.avg_garment[tf.newaxis,:,:,:]
|
||||
|
||||
Reference in New Issue
Block a user