try

aaa_helpers.txt

@@ -1,12 +1,3 @@
-nohup python cvae_pyramid.py --name="lhunor_abl_pyr_32_no_curv_r1" > nohup/review/abl_pyr_32_no_curv_r1.out 2>&1 &
-nohup python auto_encoder_static.py --name="lhunor_ae_static_orig_10p_r1" > nohup/review/static_orig_10p_r1.out 2>&1 &
-nohup python auto_encoder_body.py --name="lhunor_ae_body_orig_10p_r1" > nohup/review/body_orig_10p_r1.out 2>&1 &
-nohup python cvae_pyramid.py --name="lhunor_abl_32_64_skirt_no_curv_r1" > nohup/review/abl_pyr_32_64_skirt_no_curv_r1.out 2>&1 &
-nohup python evaluate_ae_pyramid.py --name evaluate_ae_abl_pyr_32_no_curv_r1 > nohup/evaluate/abl_pyr_32_no_curv_r1.out 2>&1 &
-nohup python evaluate_ae_pyramid.py --name evaluate_ae_abl_32_64_skirt_no_curv_r1 > nohup/evaluate/abl_32_64_skirt_no_curv_r1.out 2>&1 &
-nohup python calculate_error.py --name error_abl_pyr_32_no_curv_r1 > nohup/error/abl_pyr_32_no_curv_r1.out 2>&1 &
-nohup python calculate_error.py --name error_pyr_abl_32_64_skirt_no_curv_r1 > nohup/error/pyr_abl_32_64_skirt_no_curv_r1.out 2>&1 &
-
 one final convolutional layer for smoothing, on the final coordinates
 
 skirts!!!!

auto_encoder_body.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_ae_body import config
+from configs.config_ae_body_post import config
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 
 import tensorflow as tf
@@ -30,7 +30,7 @@ from tf_utils import check_tf_version, allow_memory_growth
 from losses import edge_loss, uv_mask_loss
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.custom_utils import batch_to_dict, plot_3d
-from models.cond_encoder import AutoEncoder
+from models.cond_encoder import AutoEncoderNew as AutoEncoder
 
 
 def init_wandb():
@@ -171,6 +171,7 @@ if __name__ == '__main__':
                                         signature=config['signature_dynamic'],
                                         resolutions=[config['resolution']], 
                                         in_memory=config['dataset_in_memory'],
+                                        use_no_orient=config['remove_global_orientation'],
                                         frames_file=config['frames_file'] if 'frames_file' in config.keys() else None, 
                                         is_cape=config['is_cape'])
     static_dataset_train = StaticDataset(folder=config['train_dir'],
@@ -184,6 +185,7 @@ if __name__ == '__main__':
                                         signature=config['signature_dynamic'], 
                                         resolutions=[config['resolution']], 
                                         in_memory=config['dataset_in_memory'], 
+                                        use_no_orient=config['remove_global_orientation'], 
                                         frames_file=config['frames_file_valid'] if 'frames_file_valid' in config.keys() else None, 
                                         is_cape=config['is_cape'])
     static_dataset_valid = StaticDataset(folder=config['valid_dir'],

auto_encoder_curv.py

@@ -95,7 +95,7 @@ def dice_dense(prediction, ground_truth, weight_map=None):
     return tf.reduce_mean(dice_score)
 
 
-@tf.function
+# @tf.function
 def train_step(batch):
     with tf.GradientTape() as tape:
         pred = model([batch['uv_curvature'], batch['uv_mask']], training=True)

auto_encoder_static.py

@@ -33,7 +33,7 @@ else:
 from tf_utils import check_tf_version, allow_memory_growth
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.custom_utils import batch_to_dict, plot_3d
-from models.cond_encoder import AutoEncoder
+from models.cond_encoder import AutoEncoderNew as AutoEncoder
 
 
 def init_wandb():
@@ -205,6 +205,7 @@ if __name__ == '__main__':
                                         signature=config['signature_dynamic'],
                                         resolutions=[config['resolution']], 
                                         in_memory=config['dataset_in_memory'],
+                                        use_no_orient=config['remove_global_orientation'],
                                         frames_file=config['frames_file'] if 'frames_file' in config.keys() else None, 
                                         is_cape=config['is_cape'])
     static_dataset_train = StaticDataset(folder=config['train_dir'],
@@ -218,6 +219,7 @@ if __name__ == '__main__':
                                         signature=config['signature_dynamic'], 
                                         resolutions=[config['resolution']], 
                                         in_memory=config['dataset_in_memory'], 
+                                        use_no_orient=config['remove_global_orientation'], 
                                         frames_file=config['frames_file_valid'] if 'frames_file_valid' in config.keys() else None, 
                                         is_cape=config['is_cape'])
     static_dataset_valid = StaticDataset(folder=config['valid_dir'],

calculate_error.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_pyr_32_64_skirt_r1 import config
+from configs.config_abl_all_post import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 # import tensorflow as tf
@@ -59,13 +59,13 @@ if __name__ == '__main__':
     folder = config['test_dir']
 
     checkpoint_name = config['name']
-    iteration = '50000'
+    iteration = ''
 
     F = np.load("custom_utils/smpl_faces" + skirt_modifier + ".npy").astype(np.int32)
     garment_type_table = np.load('custom_data/garment_type_table_test.npy', allow_pickle=True).item()
 
 
-    output_folder = '/home/workspace/data/results/' + checkpoint_name + '-' + iteration
+    output_folder = '/home/workspace/data/results/post/' + checkpoint_name + '-' + iteration
 
 
     faces_folder = '/home/workspace/data/results/support/faces' + ('_skirt' if config['is_skirt'] else '')
@@ -107,7 +107,7 @@ if __name__ == '__main__':
     for key in per_garment_errors.keys():
         print(key + ': ' + str(np.mean(per_garment_errors[key])))
 
-    with open('/home/workspace/data/results/errors/' + checkpoint_name + '-' + iteration + '.csv', mode='w') as f:
+    with open('/home/workspace/data/results/errors/post/' + checkpoint_name + '-' + iteration + '.csv', mode='w') as f:
         file_writer = csv.writer(f, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
 
         for key in sorted(errors.keys()):

configs/config_abl_overfit_jumpsuit_2.py

@@ -19,7 +19,7 @@ config['only_curvatures'] =           True
 ablation_count = [config['use_skinning'], config['remove_global_orientation'], config['use_curvature'], config['use_extra_losses'], config['use_offsets']].count(False)
 assert ablation_count == 1 or ablation_count == 0
 
-config['gpu'] = '5'
+config['gpu'] = '3'
 config['name'] = 'abl_overfit_jumpsuit_2'
 config['notes'] = 'remove other conditions from input as well'
 

configs/config_abl_pyr_32_64_skirt_r1.py

@@ -1,189 +0,0 @@
-config = dict()
-
-config['gpu'] = '1'
-config['name'] = 'pyr_abl_32_64_skirt_no_curv_r1'
-config['notes'] = 'no curv, 10p data'
-config['tags'] = ['review_1']
-
-# DON'T FORGET TO RESET SSIM LOSS USAGE
-# DON'T FORGET TO CHECK MODEL LOADING
-# DON'T FORGET TO CHECK IF STORE IN MEMORY
-# DON'T FORGET TO CHECK REG LOSS COEFF
-# DON'T FORGET TO LOAD FINAL UPSCALER UNLESS HAVE LEVEL 512
-# DON'T FORGET TO CHECK IF SKIRT
-# DON'T FORGET TO CHECK IF CAPE
-# DON'T FORGET TO CHECK IF USING DOWNSCALE NONE OR _2
-# DON'T FORGET TO CHECK UPSCALING and ENCODER CHECKPOINTS
-
-config['use_skinning'] =              True # and deshaping
-config['remove_global_orientation'] = True
-config['use_extra_losses'] =          True # edge, collision, 3d mesh
-config['use_offsets'] =               False
-config['use_curvature'] =             False
-
-config['pyramid'] = dict()
-config['pyramid']['resolutions'] = [32, 64]
-config['pyramid']['pretrained_pyramid'] = 'checkpoints/pyr_abl_32_skirt_no_curv_r1'
-config['pyramid']['final_upscale_enhancer'] = 'checkpoints/64_512_skirt'
-
-config['pretrained_model'] = ''
-config['pretrained_model_iteration'] = ''
-
-config['train_dir'] = '/home/workspace/data/dataset/local-cache/train_skirt'
-config['valid_dir'] = '/home/workspace/local-data/valid_skirt'
-config['test_dir'] = '/home/workspace/data/dataset/test_skirt_ready_2'
-config['batch_size'] = 4
-config['is_skirt'] = True
-config['is_cape'] = False
-config['frames_file'] = 'frames_skirt_10p.txt'
-config['frames_file_valid'] = 'frames_skirt_10p.txt'
-
-config['pyramid']['static_model'] = 'checkpoints/static_1_skirt'
-config['pyramid']['body_model'] = 'checkpoints/body_1_skirt_2_2'
-config['pyramid']['curvature_model'] = 'checkpoints/curv_1_skirt'
-
-config['dataset_in_memory'] = True
-config['resolution'] = None
-config['latent_dim'] = 128
-
-config['smpl_res'] = 14475
-if config['is_cape']:
-  config['smpl_res'] = 3638
-
-config['lr'] = 0.0001
-config['starting_balancing_coeff'] = 0.0001
-config['reg_loss_coeff'] = 0.1 # set to 0 if don't want to use edge+collision
-config['avg_garment_path'] = ''
-
-config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
-                          'pose_shape': (72 + 11,),
-                          'uv_body_posed': (512, 256, 3),
-                          'mesh_body_posed': (config['smpl_res'], 3,),
-                          'mesh_posed': (config['smpl_res'], 3,),
-                          'mesh_unposed': (config['smpl_res'], 3,),
-                          'uv_unposed': (512, 256, 3),
-                          'uv_curvature': (512, 256, 7),
-                        }
-config['signature_static'] = { 'uv_static': (512, 256, 3),
-                              'mesh_mask': (config['smpl_res'],),
-                              'uv_mask': (512, 256,),
-                              }
-
-config['pyramid']['is_label'] = False
-config['pyramid']['latent_dim'] = config['latent_dim']
-config['pyramid']['add_noise'] = True
-config['pyramid']['noise_amount'] = 0.001
-
-config['pyramid']['loss_weights'] = [1,1,1,1,1]
-
-for res in config['pyramid']['resolutions']:
-  if res != 512:
-      res_modifier = '_' + str(res)
-      config['signature_dynamic']['uv_body_posed' + res_modifier] = (res, res//2, 3)
-      config['signature_dynamic']['uv_unposed' + res_modifier] = (res, res//2, 3)
-      config['signature_dynamic']['uv_curvature' + res_modifier] = (res, res//2, 7)
-      config['signature_static']['uv_static' + res_modifier] = (res, res//2, 3)
-      config['signature_static']['uv_mask' + res_modifier] = (res, res//2)
-
-
-
-config['pyramid']['freeze_encoders'] = True
-
-config['pyramid']['levels'] = []
-for res in config['pyramid']['resolutions']:
-  if res == 512:
-    level = dict()
-    level['resolution'] = 512
-    level['latent_dim'] = config['latent_dim']
-    level['kernel_size'] = 7
-    level['encoder_depths'] = [3, 3, 9, 3]
-    level['encoder_dims'] = [32, 64, 128, 256]
-    level['decoder_input'] = (16, 8, 80)
-    level['decoder_depths'] = [3, 3, 9, 3]
-    level['decoder_dims'] = [256, 128, 64, 16]
-    level['avg_garment_path'] = ''
-    level['upscale_enhancer'] = ''
-    config['pyramid']['levels'].append(level)
-  elif res == 256:
-    level = dict()
-    level['resolution'] = 256
-    level['latent_dim'] = config['latent_dim']
-    level['kernel_size'] = 7
-    level['encoder_depths'] = [9, 9, 9, 9]
-    level['encoder_dims'] = [32, 64, 128, 256]
-    level['decoder_input'] = (8, 4, 128)
-    level['decoder_depths'] = [9, 9, 9, 9]
-    level['decoder_dims'] = [256, 128, 64, 16]
-    level['avg_garment_path'] = ''
-    level['upscale_enhancer'] = ''#'checkpoints/up_3_d256_512_2'
-    level['upscale_enhancer_freeze'] = True
-    config['pyramid']['levels'].append(level)
-  elif res == 128:
-    level = dict()
-    level['resolution'] = 128
-    level['latent_dim'] = config['latent_dim']
-    level['kernel_size'] = 5
-    level['encoder_depths'] = [16, 9, 9, 9]
-    level['encoder_dims'] = [64, 128, 128, 256]
-    level['decoder_input'] = (4, 2, 128)
-    level['decoder_depths'] = [16, 9, 9, 9]
-    level['decoder_dims'] = [256, 128, 128, 64]
-    level['avg_garment_path'] = ''
-    level['upscale_enhancer'] = ''#'checkpoints/up_3_d128_256_2'
-    level['upscale_enhancer_freeze'] = True
-    config['pyramid']['levels'].append(level)
-  elif res == 64:
-    level = dict()
-    level['resolution'] = 64
-    level['latent_dim'] = config['latent_dim']
-    level['kernel_size'] = 5
-    level['encoder_depths'] = [9, 9, 9]
-    level['encoder_dims'] = [64, 128, 256]
-    level['decoder_input'] = (4, 2, 256)
-    level['decoder_depths'] = [9, 9, 9]
-    level['decoder_dims'] = [256, 128, 64]
-    level['avg_garment_path'] = ''
-    level['upscale_enhancer'] = ''#checkpoints/up_3_d64_128_2'
-    level['upscale_enhancer_freeze'] = False
-    config['pyramid']['levels'].append(level)
-  elif res == 32:
-    level = dict()
-    level['resolution'] = 32
-    level['latent_dim'] = config['latent_dim']
-    level['kernel_size'] = 3
-    level['encoder_depths'] = [9, 9]
-    level['encoder_dims'] = [256, 256]
-    level['decoder_input'] = (4, 2, 256)
-    level['decoder_depths'] = [9, 9]
-    level['decoder_dims'] = [256, 256]
-    level['avg_garment_path'] = ''
-    level['upscale_enhancer'] = 'checkpoints/32_512_skirt'#'checkpoints/up_3_d32_64_2'
-    level['upscale_enhancer_freeze'] = True
-    config['pyramid']['levels'].append(level)
-  else:
-    raise NotImplementedError
-
-
-
-config['cond_ae'] = dict()
-config['cond_ae']['is_label'] = False
-config['cond_ae']['upscale_output'] = False
-config['cond_ae']['latent_dim'] = config['latent_dim']
-config['cond_ae']['kernel_size'] = 7
-config['cond_ae']['bottleneck_size'] = 64
-config['cond_ae']['encoder_depths'] = [3, 3, 9, 9, 3]
-config['cond_ae']['encoder_dims'] = [32, 64, 128, 256, config['cond_ae']['bottleneck_size']]
-config['cond_ae']['decoder_input'] = (8, 4, config['cond_ae']['bottleneck_size'])
-config['cond_ae']['decoder_depths'] = [3, 3, 9, 3, 3]
-config['cond_ae']['decoder_dims'] = [config['cond_ae']['bottleneck_size'], 256, 128, 64, 16]
-
-config['cond_ae_body'] = dict()
-config['cond_ae_body']['latent_dim'] = config['latent_dim']
-config['cond_ae_body']['kernel_size'] = 7
-config['cond_ae_body']['upscale_output'] = True
-config['cond_ae_body']['bottleneck_size'] = 512
-config['cond_ae_body']['encoder_depths'] = [3, 3, 9, 9, 3, 3]
-config['cond_ae_body']['encoder_dims'] = [32, 64, 128, 256, 256, config['cond_ae_body']['bottleneck_size']]
-config['cond_ae_body']['decoder_input'] = (4, 2, config['cond_ae_body']['bottleneck_size'])
-config['cond_ae_body']['decoder_depths'] = [3, 3, 9, 3]
-config['cond_ae_body']['decoder_dims'] = [config['cond_ae_body']['bottleneck_size'], 128, 64, 16]

configs/config_abl_pyr_32_skirt.py

@@ -1,9 +1,8 @@
 config = dict()
 
-config['gpu'] = '4'
-config['name'] = 'pyr_abl_32_skirt_no_curv_r1'
-config['notes'] = 'no curv, 10p data'
-config['tags'] = ['review_1']
+config['gpu'] = '3'
+config['name'] = 'pyr_abl_32_skirt_r1'
+config['notes'] = ''
 
 # DON'T FORGET TO RESET SSIM LOSS USAGE
 # DON'T FORGET TO CHECK MODEL LOADING
@@ -19,7 +18,6 @@ config['use_skinning'] =              True # and deshaping
 config['remove_global_orientation'] = True
 config['use_extra_losses'] =          True # edge, collision, 3d mesh
 config['use_offsets'] =               False
-config['use_curvature'] =             False
 
 config['pyramid'] = dict()
 config['pyramid']['resolutions'] = [32]
@@ -35,8 +33,6 @@ config['test_dir'] = '/home/workspace/data/dataset/test_skirt_ready_2'
 config['batch_size'] = 4
 config['is_skirt'] = True
 config['is_cape'] = False
-config['frames_file'] = 'frames_skirt_10p.txt'
-config['frames_file_valid'] = 'frames_skirt_10p.txt'
 
 config['pyramid']['static_model'] = 'checkpoints/static_1_skirt'
 config['pyramid']['body_model'] = 'checkpoints/body_1_skirt_2_2'

configs/config_ae_body.py

@@ -1,9 +1,8 @@
 from configs.config_base import config
 
-config['gpu'] = '1'
+config['gpu'] = '2'
 config['lr'] = 0.0001
-config['name'] = 'body_orig_10p_r1'
-config['tags'] = ['review_1']
+config['name'] = 'body_1_skirt_2_2'
 
 config['notes'] = 'convnext + convnext, add dense with tanh at the end of reverse convnext, | \
     flattened bottleneck with 128 latent_dim\ remove global orientation | \
@@ -16,7 +15,7 @@ config['notes'] = 'convnext + convnext, add dense with tanh at the end of revers
     continued from body_1_skirt_2 | \
     '
 
-config['dataset_in_memory'] = True
+config['dataset_in_memory'] = False
 config['batch_size'] = 32
 
 config['signature_dynamic'] = { 'id': (), 'frame_nr': (),

configs/config_ae_static.py

@@ -1,14 +1,44 @@
-from configs.config_base import config
+config = dict()
 
-config['gpu'] = '3'
+
+config['batch_size'] = 4
+config['train_dir'] = '/home/workspace/local-data/train'
+config['valid_dir'] = '/home/workspace/local-data/valid'
+config['test_dir'] = '/home/workspace/data/dataset/test_ready'
+config['use_filled'] = False
+config['resolution'] = 512
+config['is_skirt'] = False
+config['dataset_in_memory'] = True
+config['is_cape'] = False
+config['remove_global_orientation'] = True
+
+config['smpl_res'] = 14475
+if config['is_cape']:
+  config['smpl_res'] = 3638
+
+config['latent_dim'] = 128
+
+config['cond_ae'] = dict()
+config['cond_ae']['is_label'] = False
+config['cond_ae']['upscale_output'] = False
+config['cond_ae']['latent_dim'] = config['latent_dim']
+config['cond_ae']['kernel_size'] = 7
+config['cond_ae']['bottleneck_size'] = 8
+config['cond_ae']['encoder_depths'] = [3, 3, 3, 27, 3]
+config['cond_ae']['encoder_dims'] = [8, 16, 32, 32, config['cond_ae']['bottleneck_size']]
+config['cond_ae']['decoder_depths'] = config['cond_ae']['encoder_depths']
+config['cond_ae']['decoder_dims'] = config['cond_ae']['encoder_dims']
+config['cond_ae']['activation'] = 'linear'
+
+
+config['gpu'] = '5'
 config['lr'] = 0.0005
-config['name'] = 'static_orig_10p_r1'
-config['tags'] = ['review_1']
-config['notes'] = 'convnext + convnext, add dense with tanh at the end of reverse convnext, | \
-    flattened latent dim to 128 | \
-    train on 100 garments | \
+config['name'] = 'static_post_4'
+config['notes'] = 'convnext + convnext, | \
+ \
+| \
     deeper model | \
-    larger batch size | \
+linear activation| \
     ' 
 
 config['cond_ae']['upscale_output'] = False

configs/config_ae_static_post.py

@@ -1,53 +0,0 @@
-config = dict()
-
-
-config['batch_size'] = 4
-config['train_dir'] = '/home/workspace/local-data/train'
-config['valid_dir'] = '/home/workspace/local-data/valid'
-config['test_dir'] = '/home/workspace/data/dataset/test_ready'
-config['use_filled'] = False
-config['resolution'] = 512
-config['is_skirt'] = False
-config['dataset_in_memory'] = True
-config['is_cape'] = False
-config['remove_global_orientation'] = True
-
-config['smpl_res'] = 14475
-if config['is_cape']:
-  config['smpl_res'] = 3638
-
-config['latent_dim'] = 128
-
-config['cond_ae'] = dict()
-config['cond_ae']['is_label'] = False
-config['cond_ae']['upscale_output'] = False
-config['cond_ae']['latent_dim'] = config['latent_dim']
-config['cond_ae']['kernel_size'] = 7
-config['cond_ae']['bottleneck_size'] = 8
-config['cond_ae']['encoder_depths'] = [3, 3, 3, 27, 3]
-config['cond_ae']['encoder_dims'] = [8, 16, 32, 32, config['cond_ae']['bottleneck_size']]
-config['cond_ae']['decoder_depths'] = config['cond_ae']['encoder_depths']
-config['cond_ae']['decoder_dims'] = config['cond_ae']['encoder_dims']
-config['cond_ae']['activation'] = 'linear'
-
-
-config['gpu'] = '5'
-config['lr'] = 0.0005
-config['name'] = 'static_post_4'
-config['notes'] = 'convnext + convnext, | \
- \
-| \
-    deeper model | \
-linear activation| \
-    ' 
-
-config['cond_ae']['upscale_output'] = False
-config['pretrained_model'] = ''
-
-
-config['signature_dynamic'] = { 'id': (), 'frame_nr': (), }
-config['signature_static'] = { 'uv_static': (512, 256, 3),
-                         'mesh_static': (config['smpl_res'], 3,),
-                         'mesh_mask': (config['smpl_res'],),
-                         'uv_mask': (512, 256,),
-                        }

configs/config_base.py

@@ -5,19 +5,17 @@ config['batch_size'] = 4
 # config['train_dir'] = '/home/workspace/local-data/cape_processed/train/female'
 # config['valid_dir'] = '/home/workspace/local-data/cape_processed/test/female'
 # config['test_dir'] = '/home/workspace/local-data/cape_processed/test/female'
-config['train_dir'] = '/home/workspace/data/dataset/local-cache/train_skirt'
-config['valid_dir'] = '/home/workspace/local-data/valid_skirt'
-config['test_dir'] = '/home/workspace/data/dataset/test_ready_skirt_2'
+config['train_dir'] = '/home/workspace/local-data/train'
+config['valid_dir'] = '/home/workspace/local-data/valid'
+config['test_dir'] = '/home/workspace/data/dataset/test_ready'
 # config['train_dir'] = '/home/workspace/local-data/train_skirt'
 # config['valid_dir'] = '/home/workspace/local-data/valid_skirt'
 # config['test_dir'] = '/home/workspace/local-data/test_skirt_ready'
 config['use_filled'] = False
 config['resolution'] = 512
 config['is_skirt'] = False
-config['dataset_in_memory'] = True
+config['dataset_in_memory'] = False
 config['is_cape'] = False
-config['frames_file'] = 'frames_skirt_10p.txt'
-config['frames_file_valid'] = 'frames_skirt_10p.txt'
 
 config['smpl_res'] = 14475
 if config['is_cape']:

configs/post/config_abl_pyr_32.py

@@ -1,9 +1,9 @@
 config = dict()
 
-config['gpu'] = '6'
+config['gpu'] = '2'
 config['name'] = 'abl_pyr_32'
-config['notes'] = ''
-config['tags'] = ['review_1']
+config['notes'] = 'fixed noise handling'
+config['tags'] = ['pyr_post']
 
 # DON'T FORGET TO RESET SSIM LOSS USAGE
 # DON'T FORGET TO CHECK MODEL LOADING

curvature_analysis.py

@@ -0,0 +1,348 @@
+import os
+import sys
+os.environ["CUDA_VISIBLE_DEVICES"] = '4'
+
+
+import tqdm
+import argparse
+import random
+import string
+import time
+import numpy as np
+import trimesh as tm
+import cmapy as cm
+import scipy as sp
+import scipy.io as sio
+import plotly.graph_objects as go
+from pyntcloud import PyntCloud
+from scipy.sparse import csr_matrix, coo_matrix
+from scipy.sparse.csgraph import floyd_warshall, dijkstra
+from plotly.subplots import make_subplots
+from custom_utils.custom_utils import _maskFaces
+from postprocessing import fix_collision
+
+from custom_utils.supersmpl_io import readPC2, readPC2Frame, writePC2, readOBJ
+from custom_utils.custom_utils import _maskFaces
+from auto_encoder_curv import dice_dense
+
+def postprocess(mesh, faces, mask=None, body=None, do_smoothing=True):
+    if body is not None:
+        mesh_fixed = fix_collision(mesh, body[np.newaxis,:,:], mask[np.newaxis,:])[0].numpy()[mask, :]
+    else:
+        mesh_fixed = mesh
+
+    if do_smoothing:
+        m = tm.Trimesh(mesh_fixed, faces, process=False, validate=False)
+        outliers = np.array([len(v) for v in m.vertex_neighbors]) == 0
+        outliers = np.nonzero(outliers)[0]
+        outliers_n_neighbours = get_closest_n_points(mesh_fixed, outliers, 2)
+        outliers_faces = np.concatenate((outliers[:, np.newaxis], outliers_n_neighbours), axis=-1)
+        faces_fixed = np.concatenate((faces, outliers_faces), axis=0)
+        m = tm.Trimesh(mesh_fixed, faces_fixed, process=False, validate=False)
+        tm.smoothing.filter_humphrey(m, iterations=1, alpha=0.6, beta=0.4)
+
+        mesh = m.vertices
+    else:
+        mesh = mesh_fixed
+
+    return mesh
+
+def export_to_ply(mesh, file):
+    ply = tm.exchange.ply.export_ply(mesh, encoding='binary', vertex_normal=True, include_attributes=True)
+    output_file = open(file, "wb+")
+    output_file.write(ply)
+    output_file.close()
+
+
+def get_closest_n_points(verts, idx, n):
+    dist = sp.spatial.distance.cdist(verts[idx, :], verts)
+    dist[dist == 0] = 1e9
+    idx_sort = np.argsort(dist, axis=-1)
+    closest = idx_sort[:, :n]
+    return closest
+
+
+def calculate_dist(folder, neighbourhood):
+    out = dict()
+    frames = sorted(os.listdir(os.path.join(folder, 'mesh_posed')))[int(args.start):int(args.end)]
+
+    for frame in tqdm.tqdm(frames):
+        id = frame.split('_')[0]
+        if id in out.keys():
+            continue
+
+        mask = np.load(os.path.join(folder, 'mesh_mask', f'{id}.npy')).astype(bool)
+        k_neighbors = np.argsort(dist[mask, :][:, mask], axis=-1)[:, :neighbourhood] #cloud.get_neighbors(k=neighbourhood)
+        out[id] = k_neighbors
+
+    return out
+
+
+def histedges_equalN(x, nbin):
+    npt = len(x)
+    return np.interp(np.linspace(0, npt, nbin + 1),
+                     np.arange(npt),
+                     np.sort(x))
+
+
+def get_bins(values, nr_of_bins):
+    flattened = []
+    for c in values:
+        flattened.extend(c.flatten())
+    flattened = np.array(flattened)
+    bins = histedges_equalN(flattened, nr_of_bins)
+    return bins
+
+
+def generate_curvatures(v, faces, mask, neighbourhood=25, nr_of_labels=6):
+    # id = frame.split('_')[0]
+    # frame_nr = int(frame.split('_')[1].split('.')[0])
+
+    # mask = np.load(os.path.join(folder, 'mesh_mask', f'{id}.npy')).astype(bool)
+    # _, faces = _maskFaces(np.zeros((14475,3)), F, mask)
+    # v = np.load(os.path.join(folder, 'mesh_posed', f'{id}_{frame_nr}.npz'))['mesh_posed'][mask,:]
+    
+    m = tm.Trimesh(v, faces, process=False, validate=False)
+
+    outliers = np.array([len(v) for v in m.vertex_neighbors]) == 0
+    outliers = np.nonzero(outliers)[0]
+    outliers_n_neighbours = get_closest_n_points(v, outliers, 2)
+    outliers_faces = np.concatenate((outliers[:, np.newaxis], outliers_n_neighbours), axis=-1)
+    faces = np.concatenate((faces, outliers_faces), axis=0)
+
+    verts = v
+
+    m = tm.Trimesh(verts, faces, process=False, validate=False)
+    export_to_ply(m, temp_file)
+
+    cloud = PyntCloud.from_file(temp_file)
+
+    k_neighbors = np.argsort(dist[mask, :][:, mask], axis=-1)[:, :neighbourhood]
+    # k_neighbors = cloud.get_neighbors(k=neighbourhood)
+    # tree = sp.spatial.cKDTree(verts)
+    # k_neighbors = tree.query(verts, 25)[1]
+    #k_neighbors = k_neighbors_cache[id] # np.argsort(dist[mask, :][:, mask], axis=-1)[:, :neighbourhood] #cloud.get_neighbors(k=neighbourhood)
+    ev = cloud.add_scalar_field("eigen_values", k_neighbors=k_neighbors)
+    cloud.add_scalar_field("curvature", ev=ev)
+    curvature = np.array(cloud.points["curvature(" + str(neighbourhood+1) + ")"])
+    
+    bins = np.load(f'custom_data/train_bins.npy')
+    # bins = get_bins(curvature, nr_of_labels)
+    labels = np.linspace(0, bins.shape[0] - 2, bins.shape[0] - 1)
+
+    frame_labels = np.zeros((curvature.shape[0]), dtype=np.float32)
+    for j in range(bins.shape[0] - 2):
+        frame_labels[(curvature >= bins[j]) * (curvature < bins[j+1])] = labels[j]
+    frame_labels[curvature >= bins[-2]] = labels[-1]
+       
+    return frame_labels, curvature
+
+import tensorflow as tf
+from configs.config_abl_overfit_jumpsuit_2 import config
+from custom_utils.custom_utils import batch_to_dict, load_model, plot_3d, UV2Mesh, get_summary_html, maskFacesBatch, _maskFaces, plot_3d_collision, UV2MeshLabel
+
+from custom_utils.smpl import SMPL
+from models.cvae_model import CVAE
+
+uv2mesh = UV2Mesh(res=256, is_skirt=False, is_adaptive=False, is_smpl_orig=False)
+uv2meshlabel = UV2MeshLabel(res=256, is_skirt=False)
+
+def get_prediction(folder, frame, curv):
+    smpl = SMPL(use_one_hot=False, orig_smpl=False)
+    model = CVAE(config)
+    load_model(model, 'checkpoints/' + config['name'])
+
+    id = frame.split('_')[0]
+    frame_nr = frame.split('_')[1].split('.')[0]
+
+    mesh_mask = np.load(os.path.join(folder, 'mesh_mask', f'{id}.npy')).astype(bool)
+    uv_mask = np.load(os.path.join(folder, 'uv_mask', f'{id}.npz'))['uv_mask'].astype(np.float32)  
+    pose_shape = np.load(os.path.join(folder, 'pose_shape', f'{id}_{frame_nr}.npy')).astype(np.float32)  
+    pose_shape[:3] = 0
+    uv_unposed = np.load(os.path.join(folder, 'uv_unposed_no_shape', f'{id}_{frame_nr}.npz'))['uv_unposed_no_shape']
+    uv_static = np.load(os.path.join(folder, 'uv_static', f'{id}.npz'))['uv_static']
+    uv_body_posed = np.load(os.path.join(folder, 'uv_posed_body_no_orient_2', f'{id}_{frame_nr}.npz'))['uv_posed_body_no_orient']
+
+    pred, _, _ = model([uv_unposed[None,:,:,:], uv_static[None,:,:,:], uv_body_posed[None,:,:,:], curv[None,:,:,:], uv_mask[None,:,:]], training=False)
+    mesh_pred = uv2mesh(pred)
+
+    shape = pose_shape[None, 72:]
+    gender = tf.cast(tf.greater_equal(shape[:, 10] , 0.5), tf.int32)
+    shape_offsets = tf.stack([tf.gather(tf.tensordot(shape[i,:10][tf.newaxis, :], smpl.shapedirs[gender[i]], axes=[[1], [2]])[0,:,:], smpl.to_keep, axis=0) for i in range(shape.shape[0])])
+
+    mesh_pred_shaped = mesh_pred + shape_offsets * mesh_mask[tf.newaxis,:,tf.newaxis]
+    mesh_pred_posed = smpl.run_garment(pose_shape[None, :72], pose_shape[None, 72:], mesh_pred_shaped)
+    
+    return mesh_pred_posed.numpy()[0,mesh_mask,:]
+
+
+def visualize_curvature_labels(folder, results_folder, frame):
+    id = frame.split('_')[0]
+    frame_nr = frame.split('_')[1].split('.')[0]
+
+    mask = np.load(os.path.join(folder, 'mesh_mask', f'{id}.npy')).astype(bool)
+    _, faces = _maskFaces(np.zeros((14475,3)), F, mask)
+    verts = np.load(os.path.join(folder, 'mesh_posed', f'{id}_{frame_nr}.npz'))['mesh_posed'][mask,:]
+    pred = np.load(os.path.join(results_folder, frame + '.npy'))
+    pred = postprocess(pred, faces)
+
+    uv_curvature = np.load(os.path.join(folder, 'uv_curvature', f'{id}_{frame_nr}.npz'))['curvature_uv']
+    mesh_curvature = np.load(os.path.join(folder, 'mesh_curvature', f'{id}_{frame_nr}.npz'))['mesh_curvature'][mask]
+    mesh_curvature_raw = np.load(os.path.join(folder, 'mesh_curvature_raw', f'{id}_{frame_nr}.npz'))['mesh_curvature_raw'][mask]
+    uv_curvature = tf.one_hot(uv_curvature, 7)
+    pred_new = get_prediction(folder, frame, uv_curvature)
+    pred_new = postprocess(pred_new, faces)
+
+    curvature_labels_gt, curv_gt = generate_curvatures(verts, faces, mask, 25)
+    curvature_labels_pred, _ = generate_curvatures(pred, faces, mask, 25)
+    curvatures_new = (uv2meshlabel(uv_curvature[None,:,:,:])[0].numpy() * mask[:,None])[mask, :]
+    curvatures_pred_new, curv_gt_new = generate_curvatures(pred_new, faces, mask, 25)
+    dice = dice_dense(tf.one_hot(curvature_labels_pred, 7)[None,:], tf.one_hot(curvature_labels_gt, 7)[None,:])
+    dice_new = dice_dense(tf.one_hot(curvatures_pred_new, 7)[None,:], curvatures_new[None,:])
+    curvatures_new = curvatures_new.argmax(axis=-1) - 1
+
+    colors_binned_all = []
+
+    for curvature_labels in [curvature_labels_gt, curvature_labels_pred, curvatures_new, curvatures_pred_new]:
+        colors = np.array([cm.color('jet', 1 - i) for i in np.linspace(0, 1, int(curvature_labels.max()+1))])
+        colors_binned = np.zeros((curvature_labels.shape[0], 3))
+        for i in range(int(curvature_labels.max())+1):
+            # print(np.count_nonzero(curvature_labels == i))
+            colors_binned[curvature_labels == i, :] = colors[i]
+        colors_binned_all.append(colors_binned)
+
+    fig = make_subplots(rows=1, cols=4, start_cell="top-left", specs = [ [{ 'type': 'scene' } for _ in range(4)] ])
+
+    fig.add_trace(go.Mesh3d(
+                # 8 vertices of a cube
+                x=verts[:,0],
+                y=verts[:,1],
+                z=verts[:,2],
+                # i, j and k give the vertices of triangles
+                i = faces[:,0],
+                j = faces[:,1],
+                k = faces[:,2],
+                vertexcolor=colors_binned_all[0]
+            ),
+            row=1, col=1)
+
+    fig.add_trace(go.Mesh3d(
+                # 8 vertices of a cube
+                x=-pred[:,0],
+                y=pred[:,2],
+                z=pred[:,1],
+                # i, j and k give the vertices of triangles
+                i = faces[:,0],
+                j = faces[:,1],
+                k = faces[:,2],
+                vertexcolor=colors_binned_all[1],
+                text=f'dice: {dice}'
+            ),
+            row=1, col=2)
+    
+    fig.add_trace(go.Mesh3d(
+                # 8 vertices of a cube
+                x=verts[:,0],
+                y=verts[:,1],
+                z=verts[:,2],
+                # i, j and k give the vertices of triangles
+                i = faces[:,0],
+                j = faces[:,1],
+                k = faces[:,2],
+                vertexcolor=colors_binned_all[2]
+            ),
+            row=1, col=3)
+
+    fig.add_trace(go.Mesh3d(
+                # 8 vertices of a cube
+                x=-pred_new[:,0],
+                y=pred_new[:,2],
+                z=pred_new[:,1],
+                # i, j and k give the vertices of triangles
+                i = faces[:,0],
+                j = faces[:,1],
+                k = faces[:,2],
+                vertexcolor=colors_binned_all[3],
+                text=f'dice: {dice_new}'
+            ),
+            row=1, col=4)
+
+    fig.update_layout(scene_aspectmode='manual', scene_aspectratio=dict(x=1, y=1, z=1),
+                    scene2_aspectmode='manual', scene2_aspectratio=dict(x=1, y=1, z=1),
+                    scene3_aspectmode='manual', scene3_aspectratio=dict(x=1, y=1, z=1),
+                    scene4_aspectmode='manual', scene4_aspectratio=dict(x=1, y=1, z=1),
+                    # scene5_aspectmode='manual', scene5_aspectratio=dict(x=1, y=1, z=1),
+                    )
+    helper = dict(xaxis = dict(range=[-1,1], showbackground=False, showticklabels=False, showaxeslabels=False, showspikes=False, visible=False),
+                yaxis = dict(range=[-1,1], showbackground=False, showticklabels=False, showaxeslabels=False, showspikes=False, visible=False),
+                zaxis = dict(range=[-1,1], showbackground=False, showticklabels=False, showaxeslabels=False, showspikes=False, visible=False),)
+        
+    fig.update_layout(scene = helper,
+                        scene2 = helper,
+                        scene3 = helper,
+                        scene4 = helper,
+                        # scene5 = helper,
+                        )
+
+
+    # meshes = [go.Mesh3d(
+    #             x=x[:,0],
+    #             y=x[:,1],
+    #             z=x[:,2],
+    #             i = faces[:,0],
+    #             j = faces[:,1],
+    #             k = faces[:,2],
+    #             vertexcolor=colors_binned
+    #             )]
+
+    # fig = go.Figure(data=meshes)
+    # fig.update_layout(scene_aspectmode='manual', scene_aspectratio=dict(x=1, y=1, z=1))
+    # fig.update_layout(
+    #     scene = dict(
+    #         xaxis = dict(nticks=4, range=[-1,1],),
+    #                     yaxis = dict(nticks=4, range=[-1,1],),
+    #                     zaxis = dict(nticks=4, range=[-1,1],),)
+    #                     )
+
+    return fig, dice
+
+import wandb
+
+def init_wandb():
+    run = wandb.init(project='plots', name='review_5', dir='/home/workspace/local-data/temp/')
+    artifact = wandb.Artifact('code', type='code')
+    artifact.add_file('curvature_analysis.py')
+    run.log_artifact(artifact)
+
+if __name__ == '__main__':
+    # init_wandb()
+
+    is_skirt = False
+    skirt_modifier = '_skirt' if is_skirt else ''
+    F = np.load("custom_utils/smpl_faces" + skirt_modifier + ".npy").astype(np.int32)
+    # k_neighbours(k=25)
+
+    folder = '/home/workspace/local-data/train'
+    results_folder = '/home/workspace/data/results/post/abl_overfit_jumpsuit_2-'
+
+    frames_file = 'frames_jumpsuit_30k.txt'
+    frames = []
+    with open(os.path.join(folder, frames_file), 'r') as f:
+        lines = f.readlines()
+        lines = [line.strip() for line in lines]
+    frames = lines
+
+    temp_file = '/home/workspace/local-data/temp/' + ''.join(random.choice(string.ascii_lowercase) for i in range(10)) + '.ply'
+    if not is_skirt:
+        dist = np.load('custom_data/dijkstra.npy')
+    else:
+        dist = np.load('custom_data/dijkstra_skirt.npy')
+
+    i = 0
+    while True:
+        # frame = np.random.choice(frames)
+        frame = '02806_129'
+        fig, dice = visualize_curvature_labels(folder, results_folder, frame)
+        wandb.log({f'{frame}-dice:{dice}': fig}, step=i)
+        i += 1
+        print(frame)

custom_utils/custom_utils.py

@@ -311,7 +311,7 @@ def load_model(model, checkpoint, disable_assert=False, assert_consumed_on=False
 
 def get_summary_str(model):
     lines = []
-    model.summary(print_fn=lines.append, line_length=150, expand_nested=True, show_trainable=True)
+    model.summary(print_fn=lines.append, line_length=150,expand_nested=True,show_trainable=True)
     # Add initial spaces to avoid markdown formatting in TensorBoard
     return lines
 

cvae.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_all_post import config
+from configs.config_abl_overfit_jumpsuit_2 import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 import tensorflow as tf
@@ -41,7 +41,7 @@ from losses import collision_loss as collision_penalty
 from custom_utils.custom_utils import batch_to_dict, load_model, plot_3d, UV2Mesh, get_summary_html, maskFacesBatch, _maskFaces, plot_3d_collision
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.smpl import SMPL
-from models.cvae_model import CVAENew as CVAE
+from models.cvae_model import CVAE
 
 
 def init_wandb():

cvae_pyramid.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_pyr_32_64_skirt_r1 import config
+from configs.config_abl_pyr_32_skirt import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 import tensorflow as tf
@@ -210,7 +210,7 @@ def plot_3d(mesh_gt, mesh_pred_unposed_levels, faces, mesh_posed, collision, col
     return fig
 
 
-@tf.function
+# @tf.function
 def train_step(batch):
     levels_input, conds = group_inputs_for_levels(batch, config)
 
@@ -733,7 +733,7 @@ def speed_step(levels_input, conds):
 
 
 if __name__ == '__main__':
-    init_wandb()
+    # init_wandb()
     parser = argparse.ArgumentParser(description='')
     parser.add_argument('--name', type=str, default='lhunor')
     args = vars(parser.parse_args())
@@ -803,14 +803,12 @@ if __name__ == '__main__':
     if len(config['pyramid']['resolutions']) == 1:
         model.static_enc.trainable = False
         model.body_enc.trainable = False
-        if config['use_curvature']:
-            model.curv_enc.trainable = False
+        model.curv_enc.trainable = False
     else:
         load_model(model, config['pyramid']['pretrained_pyramid'], iteration=(config['pyramid']['pretrained_pyramid_iteration'] if 'pretrained_pyramid_iteration' in config.keys() else ''))
         model.static_enc.trainable = False
         model.body_enc.trainable = False
-        if config['use_curvature']:
-            model.curv_enc.trainable = False
+        model.curv_enc.trainable = False
         model.cond_encoder.trainable = False
 
     # load_model(model.levels[0].upscale_enhancer, config['pyramid']['levels'][0]['upscale_enhancer'])

evaluate_ae.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_all_post import config
+from configs.config_abl_overfit_jumpsuit_2 import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 import tensorflow as tf
@@ -42,7 +42,7 @@ from losses import collision_loss as collision_penalty
 from custom_utils.custom_utils import batch_to_dict, load_model, plot_3d, UV2Mesh, get_summary_html, maskFacesBatch, _maskFaces, plot_3d_collision
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.smpl import SMPL
-from models.cvae_model import CVAENew as CVAE
+from models.cvae_model import CVAE
 from custom_utils.supersmpl_io import writeOBJ
 # from unif_metric import chamfer_and_score
 
@@ -104,7 +104,7 @@ if __name__ == '__main__':
 
     iteration = ''
 
-    load_model(model, 'checkpoints/post/' + checkpoint_name, iteration=iteration)
+    load_model(model, 'checkpoints/' + checkpoint_name, iteration=iteration)
     # load_model(model, 'checkpoints/' + 'abl_all_120k')
 
     output_folder = '/home/workspace/data/results/post/' + checkpoint_name + '-' + iteration

evaluate_ae_pyramid.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_pyr_32_64_skirt_r1 import config
+from configs.config_abl_2_pyr_32_64_128_256_512 import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 import tensorflow as tf

models/pyramid_model_optimized.py

@@ -24,17 +24,15 @@ class Pyramid(tf.keras.Model):
         self.body_enc : AEEncoder = AEEncoder(config['cond_ae_body']['latent_dim'], config['cond_ae_body']['encoder_depths'], config['cond_ae_body']['encoder_dims'], config['cond_ae_body']['bottleneck_size'], config['cond_ae_body']['kernel_size'])
         if config['pyramid']['body_model'] != '':
             load_model(self.body_enc, config['pyramid']['body_model'] + '_enc')
-        
-        if config['use_curvature']:
-            self.curv_enc : AEEncoder = AEEncoder(config['cond_ae']['latent_dim'], config['cond_ae']['encoder_depths'], config['cond_ae']['encoder_dims'], config['cond_ae']['bottleneck_size'], config['cond_ae']['kernel_size'])
-            if config['pyramid']['curvature_model'] != '':
-                load_model(self.curv_enc, config['pyramid']['curvature_model'] + '_enc')
+
+        self.curv_enc : AEEncoder = AEEncoder(config['cond_ae']['latent_dim'], config['cond_ae']['encoder_depths'], config['cond_ae']['encoder_dims'], config['cond_ae']['bottleneck_size'], config['cond_ae']['kernel_size'])
+        if config['pyramid']['curvature_model'] != '':
+            load_model(self.curv_enc, config['pyramid']['curvature_model'] + '_enc')
 
         if config['pyramid']['freeze_encoders']:
             self.static_enc.trainable = False
             self.body_enc.trainable = False
-            if config['use_curvature']:
-                self.curv_enc.trainable = False
+            self.curv_enc.trainable = False
 
         self.cond_encoder = tf.keras.Sequential([tf.keras.layers.Dense(512, activation='relu'),
                                                  tf.keras.layers.Dense(256, activation='relu'),
@@ -72,12 +70,11 @@ class Pyramid(tf.keras.Model):
         self.add_noise = config['pyramid']['add_noise']
         self.noise_amount = config['pyramid']['noise_amount']
         self.use_offsets = config['use_offsets']
-        self.use_curvature = config['use_curvature']
  
         self.upscale_enhancer = None
         if config['pyramid']['final_upscale_enhancer'] != '':
             k_size = config['pyramid']['final_upscale_enhancer_kernel_size'] if 'final_upscale_enhancer_kernel_size' in config['pyramid'].keys() else ((3 if config['pyramid']['resolutions'][-1] <= 64 else 5))
-            self.upscale_enhancer : tf.keras.Model = UpscalerBasicConv(low_res=config['pyramid']['resolutions'][-1], kernel_size=k_size)
+            self.upscale_enhancer = UpscalerBasicConv(low_res=config['pyramid']['resolutions'][-1], kernel_size=k_size)
             load_model(self.upscale_enhancer, config['pyramid']['final_upscale_enhancer'])
             self.upscale_enhancer.trainable = False
 
@@ -88,11 +85,9 @@ class Pyramid(tf.keras.Model):
     def encode_conds(self, uv_template, uv_body_posed, uv_curv, training):
         z_static = self.static_enc(uv_template, training)
         z_body = self.body_enc(uv_body_posed, training)
-        if self.use_curvature:
-            z_curv = self.curv_enc(uv_curv, training=training)
-            z_cond = tf.concat([z_static, z_body, z_curv], axis=-1)
-        else:
-            z_cond = tf.concat([z_static, z_body], axis=-1)
+        z_curv = self.curv_enc(uv_curv, training)
+
+        z_cond = tf.concat([z_static, z_body, z_curv], axis=-1)
         z_cond = self.cond_encoder(z_cond, training=training)
 
         return z_cond
@@ -299,8 +294,7 @@ class PyramidNew(tf.keras.Model):
         self.add_noise = config['pyramid']['add_noise']
         self.noise_amount = config['pyramid']['noise_amount']
         self.use_offsets = config['use_offsets']
-        self.use_curvature = config['use_curvature']
-
+ 
         self.upscale_enhancer = None
         if config['pyramid']['final_upscale_enhancer'] != '':
             k_size = config['pyramid']['final_upscale_enhancer_kernel_size'] if 'final_upscale_enhancer_kernel_size' in config['pyramid'].keys() else ((3 if config['pyramid']['resolutions'][-1] <= 64 else 5))
@@ -315,11 +309,9 @@ class PyramidNew(tf.keras.Model):
     def encode_conds(self, uv_template, uv_body_posed, uv_curv, training):
         z_static = self.static_enc(uv_template, training)
         z_body = self.body_enc(uv_body_posed, training)
-        if self.use_curvature:
-            z_curv = self.curv_enc(uv_curv, training=training)
-            z_cond = tf.concat([z_static, z_body, z_curv], axis=-1)
-        else:
-            z_cond = tf.concat([z_static, z_body], axis=-1)
+        z_curv = self.curv_enc(uv_curv, training)
+
+        z_cond = tf.concat([z_static, z_body, z_curv], axis=-1)
 
         return z_cond
 

preprocessing.py

@@ -232,17 +232,17 @@ def generate_frames_file(folder, ratio=0.1):
     selected = []
 
     for id in tqdm.tqdm(sub_ids):
-        # if garment_type_table[id] != 'Dress':
-        #     continue
-        # if len(selected) > 30000:
-        #     break
+        if garment_type_table[id] != 'Dress':
+            continue
+        if len(selected) > 30000:
+            break
 
         # frames = glob.glob(os.path.join(folder, 'pose_shape', id + '_*'))
         frames = [frame for frame in all_frames if frame.startswith(id + '_')]
         frames = [frame.split('/')[-1].split('.')[0] for frame in frames]
         selected.extend(frames)
 
-    with open(os.path.join(folder, 'frames_skirt_10p.txt'), 'w') as f:
+    with open(os.path.join(folder, 'frames_dress_30k.txt'), 'w') as f:
         for i, frame in enumerate(selected):
             f.write(frame + '\n')
 
@@ -293,9 +293,9 @@ def generate_frames_file_filtered_cape():
 
 if __name__ == '__main__':
 
-    src_folder = '/home/workspace/local-data/valid_skirt' #cloth3d_skirt
+    src_folder = '/home/workspace/local-data/train_skirt' #cloth3d_skirt
     # src_folder = r'D:\Work\Dataset\validation_2'
-    dest_folder = '/home/workspace/data/dataset/local-cache/train_skirt' 
+    dest_folder = '/home/workspace/data/dataset/validation' 
 
 
     # create_no_orient_body(src_folder)
@@ -306,5 +306,5 @@ if __name__ == '__main__':
     # verify_poses(src_folder)
     # create_garment_type_table()
     # generate_faces()
-    generate_frames_file(src_folder, ratio=0.1)
+    generate_frames_file(src_folder, ratio=1)
     # generate_frames_file_filtered_cape()