diff --git a/official-pretrained/.gitignore b/official-pretrained/.gitignore deleted file mode 100644 index cfeac87..0000000 --- a/official-pretrained/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# ignore all -* - -# except this file -!.gitignore \ No newline at end of file diff --git a/stylegan2/layers/mapping_block.py b/stylegan2/layers/mapping_block.py index a86311e..430025d 100644 --- a/stylegan2/layers/mapping_block.py +++ b/stylegan2/layers/mapping_block.py @@ -14,9 +14,9 @@ class Mapping(tf.keras.layers.Layer): self.gain = 1.0 self.lrmul = 0.01 - # self.pose_shape_embedding = PoseShapeEmbedding() - # self.garment_embedding = GarmentEmbedding((self.w_dim * 2) - (216 + 11)) - self.garment_embedding = GarmentEmbedding(self.w_dim) + self.pose_shape_embedding = PoseShapeEmbedding() + self.garment_embedding = GarmentEmbedding((self.w_dim * 2) - (216 + 11)) + # self.garment_embedding = GarmentEmbedding(self.w_dim) self.normalize = tf.keras.layers.Lambda(lambda x: x * tf.math.rsqrt(tf.reduce_mean(tf.square(x), axis=1, keepdims=True) + 1e-8)) @@ -31,10 +31,10 @@ class Mapping(tf.keras.layers.Layer): x = latents # embed label if any - # pose_shape_latent = self.pose_shape_embedding([conditions[0], conditions[1]]) + pose_shape_latent = self.pose_shape_embedding([conditions[0], conditions[1]]) garment_latent = self.garment_embedding(conditions[2]) - # x = tf.concat([x, pose_shape_latent, garment_latent], axis=1) - x = tf.concat([x, garment_latent], axis=1) + x = tf.concat([x, pose_shape_latent, garment_latent], axis=1) + # x = tf.concat([x, garment_latent], axis=1) # normalize inputs x = self.normalize(x)