calculate errors

aaa_helpers.txt

@@ -1,8 +1,17 @@
-python merge_data.py -fi '/home/workspace/data/dataset/train' -fo '/home/workspace/local-data/train' -s 0 -e 1500
+nohup python cvae.py --name="lhunor_abl_all_10p_curv_10_r2" > nohup/review/abl_all_10p_curv_10_r2.out 2>&1 &
-nohup python auto_encoder_curv.py --name="lhunor_curv_raw_r2" > nohup/review/curv_raw_r2.out 2>&1 &
+nohup python auto_encoder_curv.py --name="lhunor_ae_curv_1_orig_curv_10_10p_r2" > nohup/review/curv_1_orig_curv_10_10p_r2.out 2>&1 &
-nohup python cvae.py --name="lhunor_abl_all_raw_r2" > nohup/review/abl_all_raw_r2.out 2>&1 &
+nohup python auto_encoder_curv.py --name="lhunor_ae_curv_1_orig_curv_25_10p_r2" > nohup/review/curv_1_orig_curv_25_10p_r2.out 2>&1 &
-nohup python evaluate_ae.py --name abl_all_raw_r2_70k > nohup/evaluate/abl_all_raw_r2_70k.out 2>&1 &
+nohup python auto_encoder_curv.py --name="lhunor_ae_curv_1_orig_curv_100_10p_r2_2" > nohup/review/curv_1_orig_curv_100_10p_r2_2.out 2>&1 &
-nohup python calculate_error.py --name error_abl_all_raw_r2 > nohup/error/abl_all_raw_r2_70k.out 2>&1 &
+nohup python cvae.py --name="lhunor_abl_all_10p_curv_10_r2" > nohup/review/abl_all_10p_curv_10_r2.out 2>&1 &
+nohup python cvae.py --name="lhunor_abl_all_10p_curv_25_r2" > nohup/review/abl_all_10p_curv_25_r2.out 2>&1 &
+nohup python cvae.py --name="lhunor_abl_all_10p_curv_100_r2" > nohup/review/abl_all_10p_curv_100_r2.out 2>&1 &
+nohup python evaluate_ae.py --name="lhunor_abl_all_10p_curv_100_r2" > nohup/evaluate/lhunor_abl_all_10p_curv_100_r2.out 2>&1 &
+nohup python evaluate_ae.py --name="lhunor_abl_all_10p_curv_10_r2" > nohup/evaluate/lhunor_abl_all_10p_curv_10_r2.out 2>&1 &
+nohup python evaluate_ae.py --name="lhunor_abl_all_10p_curv_25_r2" > nohup/evaluate/lhunor_abl_all_10p_curv_25_r2.out 2>&1 &
+nohup python calculate_error.py --name="lhunor_abl_all_10p_curv_100_r2" > nohup/error/abl_all_10p_curv_100_r2.out 2>&1 &
+nohup python calculate_error.py --name="lhunor_abl_all_10p_curv_10_r2" > nohup/error/abl_all_10p_curv_10_r2.out 2>&1 &
+nohup python calculate_error.py --name="lhunor_abl_all_10p_curv_25_r2" > nohup/error/abl_all_10p_curv_25_r2.out 2>&1 &
+
 
 
 one final convolutional layer for smoothing, on the final coordinates

auto_encoder_curv.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_ae_curv_post import config
+from configs.config_ae_curv_1_orig_curv_10_10p_r2_2 import config
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 
 import tensorflow as tf
@@ -31,7 +31,7 @@ import plotly.express as ex
 from tf_utils import check_tf_version, allow_memory_growth
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.custom_utils import batch_to_dict
-from models.cond_encoder import AutoEncoderNew as AutoEncoder
+from models.cond_encoder import AutoEncoder
 
 
 testing = False
@@ -101,50 +101,86 @@ def dice_dense(prediction, ground_truth, weight_map=None):
 def train_step(batch):	
     with tf.GradientTape() as tape:	
         pred = model([batch['uv_curvature'], batch['uv_mask']], training=True)	
-
+        ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)	
-        ce_uv_loss = tf.reduce_mean(tf.abs(batch['uv_curvature'] - pred))
+        ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))	
-        ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred, batch['uv_curvature'], max_val=1))
+        loss = ce_uv_loss	
-
+    pred_mesh = tf.math.argmax(uv2mesh(pred), axis=-1)	
-        mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
+    mean_iou = get_mean_iou(tf.math.argmax(batch['uv_curvature'], axis=-1), tf.math.argmax(pred, axis=-1))	
-        ce_mesh_loss = tf.reduce_mean(tf.abs(batch['mesh_curvature'] - mesh_pred[:,:,0]))
+    mean_iou_mesh = get_mean_iou(tf.cast(batch['mesh_curvature'], tf.float32) * batch['mesh_mask'], tf.cast(pred_mesh, tf.float32) * batch['mesh_mask'])	
-
+    dice = dice_dense(pred, batch['uv_curvature'])	
-        loss = ce_uv_loss + ce_mesh_loss
     	
     gradients = tape.gradient(loss, model.trainable_variables)	
     optimizer.apply_gradients(zip(gradients, model.trainable_variables))	
-    return { 'train/loss': loss, 'train/uv_l1': ce_uv_loss, 'train/ssim': ms_ssim, 
+    return { 'train/loss': loss, 'train/ce_uv_loss': ce_uv_loss, 'train/ssim': ms_ssim, 'train/mean_iou': mean_iou, 'train/mean_iou_mesh': mean_iou_mesh, 'train/dice': dice }	
-             'train/mesh_l1': ce_mesh_loss }
-        
-
         	
 @tf.function	
 def valid_step(batch):	
     pred = model([batch['uv_curvature'], batch['uv_mask']], training=False)	
+    ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)	
+    ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))	
+    loss = ce_uv_loss	
+    pred_mesh = tf.math.argmax(uv2mesh(pred), axis=-1)	
+    mean_iou = get_mean_iou(tf.math.argmax(batch['uv_curvature'], axis=-1), tf.math.argmax(pred, axis=-1))	
+    mean_iou_mesh = get_mean_iou(tf.cast(batch['mesh_curvature'], tf.float32) * batch['mesh_mask'], tf.cast(pred_mesh, tf.float32) * batch['mesh_mask'])	
+    dice = dice_dense(pred, batch['uv_curvature'])	
+    return { 'valid/loss': loss, 'valid/ce_uv_loss': ce_uv_loss, 'valid/ssim': ms_ssim, 'valid/mean_iou': mean_iou, 'valid/mean_iou_mesh': mean_iou_mesh, 'valid/dice': dice }
 
-    ce_uv_loss = tf.reduce_mean(tf.abs(batch['uv_curvature'] - pred))
+# def train_step(batch):
-    ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred, batch['uv_curvature'], max_val=1))
+#     with tf.GradientTape() as tape:
+#         pred = model([batch['uv_curvature'], batch['uv_mask']], training=True)
 
-    mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
+#         ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)
-    ce_mesh_loss = tf.reduce_mean(tf.abs(batch['mesh_curvature'] - mesh_pred[:,:,0]))
+#         ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))
-    loss = ce_uv_loss + ce_mesh_loss
 
-    return { 'valid/loss': loss, 'valid/uv_l1': ce_uv_loss, 'valid/ssim': ms_ssim, 'valid/mesh_l1': ce_mesh_loss }
+#         mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
+#         mesh_orig = tf.cast(uv2mesh(tf.math.argmax(batch['uv_curvature'], axis=-1, output_type=tf.int32)), tf.float32) * batch['mesh_mask']
+#         ce_mesh_loss = scce(mesh_orig, mesh_pred)
+
+#         loss = ce_uv_loss + ce_mesh_loss
+
+#     mean_iou = get_mean_iou(tf.math.argmax(batch['uv_curvature'], axis=-1), tf.math.argmax(pred, axis=-1))
+#     dice = dice_dense(pred, batch['uv_curvature'])
+    
+#     gradients = tape.gradient(loss, model.trainable_variables)
+#     optimizer.apply_gradients(zip(gradients, model.trainable_variables))
+#     return { 'train/loss': loss, 'train/ce_uv_loss': ce_uv_loss, 'train/ssim': ms_ssim, 'train/mean_iou': mean_iou,
+#              'train/dice': dice, 'train/ce_mesh_loss': ce_mesh_loss }
+        
+
+
+# @tf.function
+# def valid_step(batch):
+#     pred = model([batch['uv_curvature'], batch['uv_mask']], training=False)
+
+#     ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)
+#     ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))
+
+#     mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
+#     mesh_orig = tf.cast(uv2mesh(tf.math.argmax(batch['uv_curvature'], axis=-1, output_type=tf.int32)), tf.float32) * batch['mesh_mask']
+#     ce_mesh_loss = scce(mesh_orig, mesh_pred)
+#     loss = ce_uv_loss + ce_mesh_loss
+
+#     mean_iou = get_mean_iou(tf.math.argmax(batch['uv_curvature'], axis=-1), tf.math.argmax(pred, axis=-1))
+#     dice = dice_dense(pred, batch['uv_curvature'])
+
+#     return { 'valid/loss': loss, 'valid/ce_uv_loss': ce_uv_loss, 'valid/ssim': ms_ssim, 'valid/mean_iou': mean_iou,
+#              'valid/dice': dice, 'valid/ce_mesh_loss': ce_mesh_loss }
         
 
 def plot_everything(batch: dict, type: str):
     pred = model([batch['uv_curvature'], batch['uv_mask']], training=False)
     
-    orig_img = batch['uv_curvature']
+    orig_img = tf.math.argmax(batch['uv_curvature'], axis=-1, output_type=tf.dtypes.int32)
-    pred_img = pred
+    pred_img = tf.math.argmax(pred, axis=-1, output_type=tf.dtypes.int32)
     img = tf.concat((orig_img, pred_img), axis=2).numpy()
 
-    # colors = np.array([cm.color('jet', 1 - i) for i in np.linspace(0, 1, 6+1)])
+    colors = np.array([cm.color('jet', 1 - i) for i in np.linspace(0, 1, 6+1)])
-    # color_img = np.zeros((img.shape[0], img.shape[1], img.shape[2], 3), np.uint8)
+    color_img = np.zeros((img.shape[0], img.shape[1], img.shape[2], 3), np.uint8)
-    # for i in range(7):
+    for i in range(7):
-    #     color_img[img == i, :] = colors[i]
+        color_img[img == i, :] = colors[i]
-    # color_img = [wandb.Image(color_img[i]) for i in range(4)]
+    color_img = [wandb.Image(color_img[i]) for i in range(4)]
 
-    imgs = { type + '/images': [wandb.Image((img[i,:,:,np.newaxis]-img[i,:,:,np.newaxis].min()) / (img[i,:,:,np.newaxis].max()-img[i,:,:,np.newaxis].min())) for i in range(img.shape[0])],  } # type + '/color_images': color_img
+    imgs = { type + '/images': [wandb.Image(img[i,:,:,np.newaxis] / 6.0) for i in range(img.shape[0])], type + '/color_images': color_img }
 
     return imgs
 
@@ -219,7 +255,8 @@ if __name__ == '__main__':
                                         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'])
+                                        is_cape=config['is_cape'],
+                                        curv_neighbourhood=config['curv_neighbourhood'])
     static_dataset_train = StaticDataset(folder=config['train_dir'],
                                          signature=config['signature_static'], 
                                          resolutions=[config['resolution']], 
@@ -233,7 +270,8 @@ if __name__ == '__main__':
                                         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'])
+                                        is_cape=config['is_cape'],
+                                        curv_neighbourhood=config['curv_neighbourhood'])
     static_dataset_valid = StaticDataset(folder=config['valid_dir'],
                                          signature=config['signature_static'], 
                                          resolutions=[config['resolution']], 

calculate_error.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_all_post import config
+from configs.config_abl_all_10p_curv_25_r2 import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 # import tensorflow as tf
@@ -59,7 +59,7 @@ if __name__ == '__main__':
     folder = config['test_dir']
 
     checkpoint_name = config['name']
-    iteration = ''
+    iteration = '70000'
 
     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()

configs/config_abl_all_10p_curv_100_r2.py

@@ -0,0 +1,125 @@
+config = dict()
+
+# 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 AVG GARMENT USED
+
+config['use_skinning'] =              True # and deshaping
+config['remove_global_orientation'] = True
+config['use_curvature'] =             True
+config['use_extra_losses'] =          True # edge, collision, 3d mesh
+config['use_offsets'] =               True
+
+config['use_norm_loss'] =             True
+config['only_curvatures'] =           False
+
+config['curv_neighbourhood'] = 100
+
+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'] = '1'
+config['name'] = 'abl_all_10p_curv_100_r2'
+config['notes'] = ''
+config['tags'] = ['review_2']
+
+config['avg_garment_path'] = 'custom_data/train_no_shape_skirt_avg_uv.npy' #custom_data/train_no_shape_avg_uv.npy # train_no_shape_avg_uv  train_no_shape_one_hot_avg_uv
+if config['use_skinning']:
+  assert (config['use_offsets'] and config['avg_garment_path'] != '') or (not config['use_offsets'] and config['avg_garment_path'] == '')
+
+config['reg_loss_coeff'] = 0.1 # set to 0 if don't want to use edge+collision
+
+config['batch_size'] = 4
+config['resolution'] = 512
+config['is_skirt'] = True
+config['dataset_in_memory'] = False
+config['is_cape'] = False
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+# config['frames_file_test'] = 'frames_dress_30k.txt'
+
+config['static_model'] = 'checkpoints/static_1_skirt'
+config['body_model'] = 'checkpoints/body_1_skirt_2_2'
+config['curvature_model'] = 'checkpoints/post/curv_1_orig_curv_100_10p_r2_2'
+
+
+config['smpl_res'] = 14475
+if config['is_cape']:
+  config['smpl_res'] = 3638
+
+
+config['pretrained_model'] = ''
+config['latent_dim'] = 128
+
+###############    
+config['lr'] = 0.0001#                 0.0001
+###############
+config['starting_balancing_coeff'] = 0.001
+
+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,),
+                          'uv_curvature': (512, 256, 7),
+                        }
+config['signature_static'] = { 'uv_static': (512, 256, 3),
+                              'mesh_mask': (config['smpl_res'],),
+                              'uv_mask': (512, 256,),
+                              }
+
+if config['use_skinning']:
+  config['signature_dynamic']['uv_unposed'] = (512, 256, 3)
+  config['signature_dynamic']['mesh_unposed'] = (config['smpl_res'], 3,)
+else:
+  config['signature_dynamic']['uv_posed'] = (512, 256, 3)
+
+
+config['upscale_enhancer'] = ''
+config['freeze_encoders'] = True
+config['use_one_hot'] = False
+
+config['cvae'] = dict()
+config['cvae']['is_label'] = False
+config['cvae']['latent_dim'] = config['latent_dim']
+config['cvae']['add_noise'] = True
+config['cvae']['noise_amount'] = 0.025
+
+config['cvae']['kernel_size'] = 7
+config['cvae']['encoder_depths'] = [3, 3, 9, 3]
+config['cvae']['encoder_dims'] = [32, 64, 128, 256]
+config['cvae']['decoder_input'] = (16, 8, 80)
+config['cvae']['decoder_depths'] = [3, 3, 9, 3]
+config['cvae']['decoder_dims'] = [256, 128, 64, 16]
+
+
+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_all_10p_curv_10_r2.py

@@ -0,0 +1,125 @@
+config = dict()
+
+# 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 AVG GARMENT USED
+
+config['use_skinning'] =              True # and deshaping
+config['remove_global_orientation'] = True
+config['use_curvature'] =             True
+config['use_extra_losses'] =          True # edge, collision, 3d mesh
+config['use_offsets'] =               True
+
+config['use_norm_loss'] =             True
+config['only_curvatures'] =           False
+
+config['curv_neighbourhood'] = 10
+
+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'] = '6'
+config['name'] = 'abl_all_10p_curv_10_r2_2'
+config['notes'] = ''
+config['tags'] = ['review_2']
+
+config['avg_garment_path'] = 'custom_data/train_no_shape_skirt_avg_uv.npy' #custom_data/train_no_shape_avg_uv.npy # train_no_shape_avg_uv  train_no_shape_one_hot_avg_uv
+if config['use_skinning']:
+  assert (config['use_offsets'] and config['avg_garment_path'] != '') or (not config['use_offsets'] and config['avg_garment_path'] == '')
+
+config['reg_loss_coeff'] = 0.1 # set to 0 if don't want to use edge+collision
+
+config['batch_size'] = 4
+config['resolution'] = 512
+config['is_skirt'] = True
+config['dataset_in_memory'] = True
+config['is_cape'] = False
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+# config['frames_file_test'] = 'frames_dress_30k.txt'
+
+config['static_model'] = 'checkpoints/static_1_skirt'
+config['body_model'] = 'checkpoints/body_1_skirt_2_2'
+config['curvature_model'] = 'checkpoints/post/curv_1_orig_curv_10_10p_r2_2'
+
+
+config['smpl_res'] = 14475
+if config['is_cape']:
+  config['smpl_res'] = 3638
+
+
+config['pretrained_model'] = ''
+config['latent_dim'] = 128
+
+###############    
+config['lr'] = 0.0001#                 0.0001
+###############
+config['starting_balancing_coeff'] = 0.001
+
+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,),
+                          'uv_curvature': (512, 256, 7),
+                        }
+config['signature_static'] = { 'uv_static': (512, 256, 3),
+                              'mesh_mask': (config['smpl_res'],),
+                              'uv_mask': (512, 256,),
+                              }
+
+if config['use_skinning']:
+  config['signature_dynamic']['uv_unposed'] = (512, 256, 3)
+  config['signature_dynamic']['mesh_unposed'] = (config['smpl_res'], 3,)
+else:
+  config['signature_dynamic']['uv_posed'] = (512, 256, 3)
+
+
+config['upscale_enhancer'] = ''
+config['freeze_encoders'] = True
+config['use_one_hot'] = False
+
+config['cvae'] = dict()
+config['cvae']['is_label'] = False
+config['cvae']['latent_dim'] = config['latent_dim']
+config['cvae']['add_noise'] = True
+config['cvae']['noise_amount'] = 0.025
+
+config['cvae']['kernel_size'] = 7
+config['cvae']['encoder_depths'] = [3, 3, 9, 3]
+config['cvae']['encoder_dims'] = [32, 64, 128, 256]
+config['cvae']['decoder_input'] = (16, 8, 80)
+config['cvae']['decoder_depths'] = [3, 3, 9, 3]
+config['cvae']['decoder_dims'] = [256, 128, 64, 16]
+
+
+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_all_10p_curv_25_r2.py

@@ -0,0 +1,125 @@
+config = dict()
+
+# 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 AVG GARMENT USED
+
+config['use_skinning'] =              True # and deshaping
+config['remove_global_orientation'] = True
+config['use_curvature'] =             True
+config['use_extra_losses'] =          True # edge, collision, 3d mesh
+config['use_offsets'] =               True
+
+config['use_norm_loss'] =             True
+config['only_curvatures'] =           False
+
+config['curv_neighbourhood'] = 25
+
+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'] = '0'
+config['name'] = 'abl_all_10p_curv_25_r2'
+config['notes'] = ''
+config['tags'] = ['review_2']
+
+config['avg_garment_path'] = 'custom_data/train_no_shape_skirt_avg_uv.npy' #custom_data/train_no_shape_avg_uv.npy # train_no_shape_avg_uv  train_no_shape_one_hot_avg_uv
+if config['use_skinning']:
+  assert (config['use_offsets'] and config['avg_garment_path'] != '') or (not config['use_offsets'] and config['avg_garment_path'] == '')
+
+config['reg_loss_coeff'] = 0.1 # set to 0 if don't want to use edge+collision
+
+config['batch_size'] = 4
+config['resolution'] = 512
+config['is_skirt'] = True
+config['dataset_in_memory'] = True
+config['is_cape'] = False
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+# config['frames_file_test'] = 'frames_dress_30k.txt'
+
+config['static_model'] = 'checkpoints/static_1_skirt'
+config['body_model'] = 'checkpoints/body_1_skirt_2_2'
+config['curvature_model'] = 'checkpoints/post/curv_1_orig_curv_25_10p_r2'
+
+
+config['smpl_res'] = 14475
+if config['is_cape']:
+  config['smpl_res'] = 3638
+
+
+config['pretrained_model'] = ''
+config['latent_dim'] = 128
+
+###############    
+config['lr'] = 0.0001#                 0.0001
+###############
+config['starting_balancing_coeff'] = 0.001
+
+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,),
+                          'uv_curvature': (512, 256, 7),
+                        }
+config['signature_static'] = { 'uv_static': (512, 256, 3),
+                              'mesh_mask': (config['smpl_res'],),
+                              'uv_mask': (512, 256,),
+                              }
+
+if config['use_skinning']:
+  config['signature_dynamic']['uv_unposed'] = (512, 256, 3)
+  config['signature_dynamic']['mesh_unposed'] = (config['smpl_res'], 3,)
+else:
+  config['signature_dynamic']['uv_posed'] = (512, 256, 3)
+
+
+config['upscale_enhancer'] = ''
+config['freeze_encoders'] = True
+config['use_one_hot'] = False
+
+config['cvae'] = dict()
+config['cvae']['is_label'] = False
+config['cvae']['latent_dim'] = config['latent_dim']
+config['cvae']['add_noise'] = True
+config['cvae']['noise_amount'] = 0.025
+
+config['cvae']['kernel_size'] = 7
+config['cvae']['encoder_depths'] = [3, 3, 9, 3]
+config['cvae']['encoder_dims'] = [32, 64, 128, 256]
+config['cvae']['decoder_input'] = (16, 8, 80)
+config['cvae']['decoder_depths'] = [3, 3, 9, 3]
+config['cvae']['decoder_dims'] = [256, 128, 64, 16]
+
+
+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_all_post.py

@@ -19,10 +19,9 @@ config['only_curvatures'] =           False
 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'] = '3'
+config['gpu'] = '1'
-config['name'] = 'abl_all_raw_r2'
+config['name'] = 'al_all_post'
 config['notes'] = ''
-config['tags'] = ['review_2']
 
 config['avg_garment_path'] = 'custom_data/train_no_shape_avg_uv.npy' #custom_data/train_no_shape_avg_uv.npy # train_no_shape_avg_uv  train_no_shape_one_hot_avg_uv
 if config['use_skinning']:
@@ -46,7 +45,7 @@ config['test_dir'] = '/home/workspace/data/dataset/test_ready'
 
 config['static_model'] = 'checkpoints/post/static_post_2'
 config['body_model'] = 'checkpoints/post/body_post_2'
-config['curvature_model'] = 'checkpoints/post/curv_raw_r2'
+config['curvature_model'] = 'checkpoints/post/curv_post_1'
 
 
 config['smpl_res'] = 14475

configs/config_abl_pyr_32.py

@@ -1,7 +1,7 @@
 config = dict()
 
 config['gpu'] = '0'
-config['name'] = 'pyr_abl_32'
+config['name'] = 'pyr_abl_32_r1'
 config['notes'] = ''
 
 # DON'T FORGET TO RESET SSIM LOSS USAGE

configs/config_abl_pyr_32_skirt.py

@@ -1,8 +1,8 @@
 config = dict()
 
 config['gpu'] = '3'
-config['name'] = 'pyr_abl_32_skirt_2'
+config['name'] = 'pyr_abl_32_skirt_r1'
-config['notes'] = 'continued from pyr_abl_32_skirt-180k'
+config['notes'] = ''
 
 # DON'T FORGET TO RESET SSIM LOSS USAGE
 # DON'T FORGET TO CHECK MODEL LOADING
@@ -24,7 +24,10 @@ config['pyramid']['resolutions'] = [32]
 config['pyramid']['pretrained_pyramid'] = ''
 config['pyramid']['final_upscale_enhancer'] = 'checkpoints/32_512_skirt'
 
-config['train_dir'] = '/home/workspace/local-data/train_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
@@ -35,7 +38,7 @@ 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'] = False
+config['dataset_in_memory'] = True
 config['resolution'] = None
 config['latent_dim'] = 128
 
@@ -65,6 +68,7 @@ config['signature_static'] = { 'uv_static': (512, 256, 3),
 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]
 

configs/config_ae_curv.py

@@ -1,13 +1,23 @@
 from configs.config_base import config
 
-config['gpu'] = '5'
+config['gpu'] = '4'
 config['lr'] = 0.001
-config['name'] = 'curv_1' #'ae_curv_9'
+config['name'] = 'curv_1_orig_r2' #'ae_curv_9'
 config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
 | \
   '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
 
 config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 10
 
 config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
                           'uv_curvature': (512, 256, 7),

configs/config_ae_curv_1_orig_curv_100_10p_r2.py

@@ -0,0 +1,30 @@
+from configs.config_base import config
+
+config['gpu'] = '1'
+config['lr'] = 0.001
+config['name'] = 'curv_1_orig_curv_100_10p_r2' #'ae_curv_9'
+config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
+| \
+  '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
+config['dataset_in_memory'] = True
+
+config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 100
+
+config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
+                          'uv_curvature': (512, 256, 7),
+                          'mesh_curvature':  (config['smpl_res'])
+                        }
+config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),
+                         'uv_mask': (512, 256,),
+                        }
+

configs/config_ae_curv_1_orig_curv_100_10p_r2_2.py

@@ -0,0 +1,30 @@
+from configs.config_base import config
+
+config['gpu'] = '1'
+config['lr'] = 0.001
+config['name'] = 'curv_1_orig_curv_100_10p_r2_2' #'ae_curv_9'
+config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
+| \
+  '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
+config['dataset_in_memory'] = True
+
+config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 100
+
+config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
+                          'uv_curvature': (512, 256, 7),
+                          'mesh_curvature':  (config['smpl_res'])
+                        }
+config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),
+                         'uv_mask': (512, 256,),
+                        }
+

configs/config_ae_curv_1_orig_curv_10_10p_r2.py

@@ -0,0 +1,30 @@
+from configs.config_base import config
+
+config['gpu'] = '4'
+config['lr'] = 0.001
+config['name'] = 'curv_1_orig_curv_10_10p_r2' #'ae_curv_9'
+config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
+| \
+  '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
+config['dataset_in_memory'] = True
+
+config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 10
+
+config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
+                          'uv_curvature': (512, 256, 7),
+                          'mesh_curvature':  (config['smpl_res'])
+                        }
+config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),
+                         'uv_mask': (512, 256,),
+                        }
+

configs/config_ae_curv_1_orig_curv_10_10p_r2_2.py

@@ -0,0 +1,30 @@
+from configs.config_base import config
+
+config['gpu'] = '4'
+config['lr'] = 0.001
+config['name'] = 'curv_1_orig_curv_10_10p_r2_2' #'ae_curv_9'
+config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
+| \
+  '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
+config['dataset_in_memory'] = True
+
+config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 10
+
+config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
+                          'uv_curvature': (512, 256, 7),
+                          'mesh_curvature':  (config['smpl_res'])
+                        }
+config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),
+                         'uv_mask': (512, 256,),
+                        }
+

configs/config_ae_curv_1_orig_curv_25_10p_r2.py

@@ -0,0 +1,30 @@
+from configs.config_base import config
+
+config['gpu'] = '6'
+config['lr'] = 0.001
+config['name'] = 'curv_1_orig_curv_25_10p_r2' #'ae_curv_9'
+config['notes'] = 'convnext + convnext, 16*8*32, ce loss. flattened latent dim of 128. trained on 100 garments. switched back to sparse CCE, normal one was giving NaN | \
+| \
+  '
+config['tags'] = ['review_2']
+config['remove_global_orientation'] = True
+config['dataset_in_memory'] = True
+
+config['cond_ae']['is_label'] = True
+config['is_skirt'] = True
+
+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['frames_file'] = 'frames_skirt_10p.txt'
+config['frames_file_valid'] = 'frames_skirt_10p.txt'
+config['curv_neighbourhood'] = 25
+
+config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
+                          'uv_curvature': (512, 256, 7),
+                          'mesh_curvature':  (config['smpl_res'])
+                        }
+config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),
+                         'uv_mask': (512, 256,),
+                        }
+

configs/config_ae_curv_post.py

@@ -31,18 +31,22 @@ config['cond_ae']['decoder_dims'] = config['cond_ae']['encoder_dims']
 config['cond_ae']['activation'] = 'tanh'
 
 
-config['gpu'] = '1'
+config['gpu'] = '3'
 config['lr'] = 0.001
-config['name'] = 'curv_raw_r2'
+config['name'] = 'curv_post_1'
-config['notes'] = '' 
+config['notes'] = 'convnext + convnext, | \
-config['tags'] = ['review_2']
+ \
+| \
+    deeper model | \
+| \
+    ' 
 
 config['cond_ae']['upscale_output'] = False
 config['pretrained_model'] = ''
 
 
 config['signature_dynamic'] = { 'id': (), 'frame_nr': (),
-                          'uv_curvature': (512, 256, 1),
+                          'uv_curvature': (512, 256, 7),
                           'mesh_curvature':  (config['smpl_res'])
                         }
 config['signature_static'] = { 'mesh_mask': (config['smpl_res'],),

convert_to_uv.py

@@ -266,9 +266,7 @@ def convert_to_uv_batch(res, m2uv, uv_map, verts, neighbours=15, mask=None, meth
 
 def convert_to_uv_batch_label(res, m2uv, uv_map, values, neighbours=15, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=None):
     batch = values.shape[0]
-    x = np.zeros((batch,14475))
+    values = (values + 1) * mask
-    x[:,mask] = values
-    values = x
     values_uv = np.zeros((batch, res * 2, res))
     missing = np.zeros((res * 2, res))
     uv_values = np.zeros((batch, uv_map.shape[0]))
@@ -316,8 +314,7 @@ def convert_to_uv_batch_label(res, m2uv, uv_map, values, neighbours=15, mask=Non
     final = []
     for i in range(batch):
         print('processing frame: ' + str(i))
-        # interpolator =  spi.NearestNDInterpolator(x=uv_map_discreet_unique_unique, y=unique_uv_values[i,:])
+        interpolator =  spi.NearestNDInterpolator(x=uv_map_discreet_unique_unique, y=unique_uv_values[i,:])
-        interpolator =  spi.RBFInterpolator(y=uv_map_discreet_unique_unique, d=unique_uv_values[i,:], neighbors=neighbours, kernel='linear')
         final.append(interpolator(rbf_dest_current))
     final = np.asarray(final)
 
@@ -453,7 +450,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument("-f", "--folder", help = "end of range", default='/home/workspace/data/dataset/train')
     parser.add_argument("-s", "--start", help = "start of range", default=0)
-    parser.add_argument("-e", "--end", help = "end of range", default=1)
+    parser.add_argument("-e", "--end", help = "end of range", default=10)
     parser.add_argument("-n", "--name", help = "end of range", default='lhunor')
     parser.add_argument("-sk", "--skirt", help = "end of range", default=0)
     args = parser.parse_args()
@@ -529,17 +526,17 @@ if __name__ == '__main__':
         offsets_static = sio.loadmat(os.path.join(folder, id, garment + '_offsets_static.mat'))['label'][:,:3]
         body_static = sio.loadmat(os.path.join(garment_dir, 'info_body.mat'))['B']
         mask = np.squeeze(sio.loadmat(os.path.join(garment_dir, garment + '_mask.mat'))['mask'].astype(bool))
-        # body = readPC2(os.path.join(folder, id, 'Body_posed.pc16'),  True)['V']
+        body = readPC2(os.path.join(folder, id, 'Body_posed.pc16'),  True)['V']
         # gt = readPC2(os.path.join(folder, id, garment + '_registered.pc16'),  True)['V']
-        curvature = np.load(os.path.join(folder, id, 'curvature_25_raw.npy'))
+        # curvature = np.load(os.path.join(folder, id, 'curvature_label_' + curvature_label_type + '.npy'))
         # mesh_unposed = [np.load(os.path.join(folder, id, 'mesh_unposed',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # mesh_unposed = np.stack([mesh_unposed[i]['mesh_unposed'] for i in range(gt.shape[0])])
         # mesh_unposed_no_shape = [np.load(os.path.join(folder, id, 'mesh_unposed_no_shape',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # mesh_unposed_no_shape = np.stack([mesh_unposed_no_shape[i]['mesh_unposed_no_shape'] for i in range(gt.shape[0])])
         # body_no_orient = [np.load(os.path.join(folder, id, 'mesh_posed_body_no_orient',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # body_no_orient = np.stack([body_no_orient[i]['mesh_posed_body_no_orient'] for i in range(gt.shape[0])])
-        # mesh_unposed_no_shape_one_hot = [np.load(os.path.join(folder, id, 'mesh_unposed_no_shape_one_hot',  id + '_' + str(i) + '.npz')) for i in range(body.shape[0])]
+        mesh_unposed_no_shape_one_hot = [np.load(os.path.join(folder, id, 'mesh_unposed_no_shape_one_hot',  id + '_' + str(i) + '.npz')) for i in range(body.shape[0])]
-        # mesh_unposed_no_shape_one_hot = np.stack([mesh_unposed_no_shape_one_hot[i]['mesh_unposed_no_shape'] for i in range(body.shape[0])])
+        mesh_unposed_no_shape_one_hot = np.stack([mesh_unposed_no_shape_one_hot[i]['mesh_unposed_no_shape'] for i in range(body.shape[0])])
 
 
         verts_static = (body_static + offsets_static) # * mask[:, np.newaxis]
@@ -611,10 +608,10 @@ if __name__ == '__main__':
         # uv_body = convert_to_uv_batch(uv_res, m2uv, uv_map, body[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_posed_body_no_orient = convert_to_uv_batch(uv_res, m2uv, uv_map, body_no_orient[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_gt = convert_to_uv_batch(uv_res, m2uv, uv_map, gt[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
-        uv_curvature_raw = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
+        # uv_curvature = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='nearest', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed_no_shape = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
-        # uv_unposed_no_shape_one_hot = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape_one_hot[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
+        uv_unposed_no_shape_one_hot = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape_one_hot[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_shaped_body = convert_to_uv(uv_res, m2uv, uv_map, shaped_body, neighbours=3, mask=None, method='rbf', garment_uv_mask=None).astype(np.float32)
         print(time.perf_counter() - start)
 
@@ -635,9 +632,9 @@ if __name__ == '__main__':
         # for i in range(uv_gt.shape[0]):
         #     np.savez_compressed(os.path.join(folder, id, 'gt_uv', garment + '_' + str(i) + '.npz'), uv_gt=uv_gt[i, :, :, :])
 
-        os.makedirs(os.path.join(folder, id, 'curvature_uv_raw'), exist_ok=True)
+        # os.makedirs(os.path.join(folder, id, 'curvature_uv'), exist_ok=True)
-        for i in range(uv_curvature_raw.shape[0]):
+        # for i in range(uv_curvature.shape[0]):
-            np.savez_compressed(os.path.join(folder, id, 'curvature_uv_raw', garment + '_' + str(i) + '.npz'), curvature_uv_raw=uv_curvature_raw[i, :, :])
+        #     np.savez_compressed(os.path.join(folder, id, 'curvature_uv', garment + '_' + str(i) + '.npz'), curvature_uv=uv_curvature[i, :, :])
 
         # os.makedirs(os.path.join(folder, id, 'uv_unposed'), exist_ok=True)
         # for i in range(uv_unposed.shape[0]):
@@ -647,9 +644,9 @@ if __name__ == '__main__':
         # for i in range(uv_unposed_no_shape.shape[0]):
         #     np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape[i, :, :, :])
 
-        # os.makedirs(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot'), exist_ok=True)
+        os.makedirs(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot'), exist_ok=True)
-        # for i in range(uv_unposed_no_shape_one_hot.shape[0]):
+        for i in range(uv_unposed_no_shape_one_hot.shape[0]):
-        #     np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape_one_hot[i, :, :, :])
+            np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape_one_hot[i, :, :, :])
 
         # os.makedirs(os.path.join(folder, id, 'uv_shaped_body'), exist_ok=True)
         # np.savez_compressed(os.path.join(folder, id, 'uv_shaped_body.npz'), uv_shaped_body=uv_shaped_body)

convert_to_uv_local.py

@@ -416,7 +416,7 @@ def test(verts, faces, values):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument("-f", "--folder", help = "end of range", default='/home/workspace/local-data/train')
+    parser.add_argument("-f", "--folder", help = "end of range", default='/home/workspace/data/dataset/train')
     parser.add_argument("-s", "--start", help = "start of range", default=0)
     parser.add_argument("-e", "--end", help = "end of range", default=10)
     parser.add_argument("-n", "--name", help = "end of range", default='lhunor')
@@ -499,15 +499,15 @@ if __name__ == '__main__':
         mask = np.load(os.path.join(local_folder, 'mesh_mask', id + '.npy')).astype(bool)
         # body = readPC2(os.path.join(folder, id, 'Body_posed.pc16'),  True)['V']
         # gt = readPC2(os.path.join(folder, id, garment + '_registered.pc16'),  True)['V']
-        curvature = np.load(os.path.join(folder, id, 'curvature_raw.npy'))
+        # curvature = np.load(os.path.join(folder, id, 'curvature_label_' + curvature_label_type + '.npy'))
         # mesh_unposed = [np.load(os.path.join(folder, id, 'mesh_unposed',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # mesh_unposed = np.stack([mesh_unposed[i]['mesh_unposed'] for i in range(gt.shape[0])])
         # mesh_unposed_no_shape = [np.load(os.path.join(folder, id, 'mesh_unposed_no_shape',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # mesh_unposed_no_shape = np.stack([mesh_unposed_no_shape[i]['mesh_unposed_no_shape'] for i in range(gt.shape[0])])
         # body_no_orient = [np.load(os.path.join(folder, id, 'mesh_posed_body_no_orient',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # body_no_orient = np.stack([body_no_orient[i]['mesh_posed_body_no_orient'] for i in range(gt.shape[0])])
-        # mesh_unposed_no_shape_one_hot = [np.load(os.path.join(local_folder, 'mesh_unposed_no_shape_one_hot',  id + '_' + str(i) + '.npz')) for i in range(frames)]
+        mesh_unposed_no_shape_one_hot = [np.load(os.path.join(local_folder, 'mesh_unposed_no_shape_one_hot',  id + '_' + str(i) + '.npz')) for i in range(frames)]
-        # mesh_unposed_no_shape_one_hot = np.stack([mesh_unposed_no_shape_one_hot[i]['mesh_unposed_no_shape'] for i in range(frames)])
+        mesh_unposed_no_shape_one_hot = np.stack([mesh_unposed_no_shape_one_hot[i]['mesh_unposed_no_shape'] for i in range(frames)])
 
 
         # verts_dynamic = gt
@@ -561,10 +561,10 @@ if __name__ == '__main__':
         # uv_body = convert_to_uv_batch(uv_res, m2uv, uv_map, body[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_posed_body_no_orient = convert_to_uv_batch(uv_res, m2uv, uv_map, body_no_orient[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_gt = convert_to_uv_batch(uv_res, m2uv, uv_map, gt[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
-        uv_curvature_raw = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
+        # uv_curvature = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='nearest', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed_no_shape = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
-        # uv_unposed_no_shape_one_hot = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape_one_hot[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
+        uv_unposed_no_shape_one_hot = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape_one_hot[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_shaped_body = convert_to_uv(uv_res, m2uv, uv_map, shaped_body, neighbours=3, mask=None, method='rbf', garment_uv_mask=None).astype(np.float32)
         print(time.perf_counter() - start)
 
@@ -585,9 +585,9 @@ if __name__ == '__main__':
         # for i in range(uv_gt.shape[0]):
         #     np.savez_compressed(os.path.join(folder, id, 'gt_uv', garment + '_' + str(i) + '.npz'), uv_gt=uv_gt[i, :, :, :])
 
-        os.makedirs(os.path.join(folder, id, 'curvature_uv_raw'), exist_ok=True)
+        # os.makedirs(os.path.join(folder, id, 'curvature_uv'), exist_ok=True)
-        for i in range(uv_curvature_raw.shape[0]):
+        # for i in range(uv_curvature.shape[0]):
-            np.savez_compressed(os.path.join(folder, id, 'curvature_uv_raw', garment + '_' + str(i) + '.npz'), curvature_uv_raw=uv_curvature_raw[i, :, :])
+        #     np.savez_compressed(os.path.join(folder, id, 'curvature_uv', garment + '_' + str(i) + '.npz'), curvature_uv=uv_curvature[i, :, :])
 
         # os.makedirs(os.path.join(folder, id, 'uv_unposed'), exist_ok=True)
         # for i in range(uv_unposed.shape[0]):
@@ -597,9 +597,9 @@ if __name__ == '__main__':
         # for i in range(uv_unposed_no_shape.shape[0]):
         #     np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape[i, :, :, :])
 
-        # os.makedirs(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot'), exist_ok=True)
+        os.makedirs(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot'), exist_ok=True)
-        # for i in range(uv_unposed_no_shape_one_hot.shape[0]):
+        for i in range(uv_unposed_no_shape_one_hot.shape[0]):
-        #     np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape_one_hot[i, :, :, :])
+            np.savez_compressed(os.path.join(folder, id, 'uv_unposed_no_shape_one_hot', garment + '_' + str(i) + '.npz'), uv_unposed_no_shape=uv_unposed_no_shape_one_hot[i, :, :, :])
 
         # os.makedirs(os.path.join(folder, id, 'uv_shaped_body'), exist_ok=True)
         # np.savez_compressed(os.path.join(folder, id, 'uv_shaped_body.npz'), uv_shaped_body=uv_shaped_body)

convert_to_uv_local_single.py

@@ -202,9 +202,7 @@ def convert_to_uv_batch(res, m2uv, uv_map, verts, neighbours=15, mask=None, meth
 
 def convert_to_uv_batch_label(res, m2uv, uv_map, values, neighbours=15, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=None):
     batch = values.shape[0]
-    x = np.zeros((batch,14475))
+    values = (values + 1) * mask
-    x[:,mask] = values
-    values = x
     values_uv = np.zeros((batch, res * 2, res))
     missing = np.zeros((res * 2, res))
     uv_values = np.zeros((batch, uv_map.shape[0]))
@@ -252,8 +250,7 @@ def convert_to_uv_batch_label(res, m2uv, uv_map, values, neighbours=15, mask=Non
     final = []
     for i in range(batch):
         print('processing frame: ' + str(i))
-        interpolator =  spi.RBFInterpolator(y=uv_map_discreet_unique_unique, d=unique_uv_values[i,:], neighbors=neighbours, kernel='linear')
+        interpolator =  spi.NearestNDInterpolator(x=uv_map_discreet_unique_unique, y=unique_uv_values[i,:])
-        # interpolator =  spi.NearestNDInterpolator(x=uv_map_discreet_unique_unique, y=unique_uv_values[i,:])
         final.append(interpolator(rbf_dest_current))
     final = np.asarray(final)
 
@@ -387,17 +384,16 @@ def test(verts, faces, values):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument("-f", "--folder", help = "end of range", default='/home/workspace/local-data/train')
+    parser.add_argument("-f", "--folder", help = "end of range", default='/home/workspace/local-data/valid')
     parser.add_argument("-s", "--start", help = "start of range", default=0)
     parser.add_argument("-e", "--end", help = "end of range", default=1500)
     parser.add_argument("-n", "--name", help = "end of range", default='lhunor')
-    parser.add_argument("-sk", "--skirt", help = "end of range", default=0)
+    parser.add_argument("-sk", "--skirt", help = "end of range", default=1)
     args = parser.parse_args()
 
     # smpl = SMPL('FeatureLines/superSMPL')
 
     local_folder = args.folder 
-    remote_folder = '/home/workspace/data/dataset/test'
     os.makedirs(os.path.join(local_folder, 'uv_posed_no_orient'), exist_ok=True)
     # os.makedirs(os.path.join(local_folder, 'uv_unposed_no_shape_one_hot_2'), exist_ok=True)
 
@@ -465,7 +461,7 @@ if __name__ == '__main__':
         mask = np.load(os.path.join(local_folder, 'mesh_mask', id + '.npy')).astype(bool)
         # body = readPC2(os.path.join(folder, id, 'Body_posed.pc16'),  True)['V']
         # gt = readPC2(os.path.join(folder, id, garment + '_registered.pc16'),  True)['V']
-        curvature = np.load(os.path.join(remote_folder, id, 'curvature_25_raw.npy'))
+        # curvature = np.load(os.path.join(folder, id, 'curvature_label_' + curvature_label_type + '.npy'))
         # mesh_unposed = [np.load(os.path.join(folder, id, 'mesh_unposed',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
         # mesh_unposed = np.stack([mesh_unposed[i]['mesh_unposed'] for i in range(gt.shape[0])])
         # mesh_unposed_no_shape = [np.load(os.path.join(folder, id, 'mesh_unposed_no_shape',  id + '_' + str(i) + '.npz')) for i in range(gt.shape[0])]
@@ -474,8 +470,8 @@ if __name__ == '__main__':
         # body_no_orient = np.stack([body_no_orient[i]['mesh_posed_body_no_orient'] for i in range(gt.shape[0])])
         # mesh_unposed_no_shape_one_hot = [np.load(os.path.join(local_folder, 'mesh_unposed_no_shape_one_hot',  id + '_' + str(i) + '.npz')) for i in range(frames)]
         # mesh_unposed_no_shape_one_hot = [mesh_unposed_no_shape_one_hot[i]['mesh_unposed_no_shape'] for i in range(frames)]
-        # mesh_posed_no_orient = [np.load(os.path.join(local_folder, 'mesh_posed_no_orient',  id + '_' + str(i) + '.npz')) for i in range(frames)]
+        mesh_posed_no_orient = [np.load(os.path.join(local_folder, 'mesh_posed_no_orient',  id + '_' + str(i) + '.npz')) for i in range(frames)]
-        # mesh_posed_no_orient = [mesh_posed_no_orient[i]['mesh_posed_no_orient'] for i in range(frames)]
+        mesh_posed_no_orient = [mesh_posed_no_orient[i]['mesh_posed_no_orient'] for i in range(frames)]
 
 
         # verts_dynamic = gt
@@ -495,11 +491,11 @@ if __name__ == '__main__':
         # uv_body = convert_to_uv_batch(uv_res, m2uv, uv_map, body[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_posed_body_no_orient = convert_to_uv_batch(uv_res, m2uv, uv_map, body_no_orient[:, :, :], neighbours=3, mask=None, method='rbf', garment_uv_mask=None, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_gt = convert_to_uv_batch(uv_res, m2uv, uv_map, gt[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
-        uv_curvature_raw = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
+        # uv_curvature = convert_to_uv_batch_label(uv_res, m2uv, uv_map, curvature[:, :], neighbours=3, mask=mask, method='nearest', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed_no_shape = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape[:, :, :], neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border).astype(np.float32)
         # uv_unposed_no_shape_one_hot = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_unposed_no_shape_one_hot, neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border, id=id)
-        # uv_posed_no_orient = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_posed_no_orient, neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border, id=id)
+        uv_posed_no_orient = convert_to_uv_batch(uv_res, m2uv, uv_map, mesh_posed_no_orient, neighbours=3, mask=mask, method='rbf', garment_uv_mask=garment_uv_mask, garment_uv_mask_border=garment_uv_mask_border, id=id)
         # uv_shaped_body = convert_to_uv(uv_res, m2uv, uv_map, shaped_body, neighbours=3, mask=None, method='rbf', garment_uv_mask=None).astype(np.float32)
         print(time.perf_counter() - start)
 
@@ -520,9 +516,9 @@ if __name__ == '__main__':
         # for i in range(uv_gt.shape[0]):
         #     np.savez_compressed(os.path.join(folder, id, 'gt_uv', garment + '_' + str(i) + '.npz'), uv_gt=uv_gt[i, :, :, :])
 
-        os.makedirs(os.path.join(local_folder, 'curvature_uv_raw'), exist_ok=True)
+        # os.makedirs(os.path.join(folder, id, 'curvature_uv'), exist_ok=True)
-        for i in range(uv_curvature_raw.shape[0]):
+        # for i in range(uv_curvature.shape[0]):
-            np.savez_compressed(os.path.join(local_folder, 'curvature_uv_raw', id + '_' + str(i) + '.npz'), curvature_uv_raw=uv_curvature_raw[i, :, :])
+        #     np.savez_compressed(os.path.join(folder, id, 'curvature_uv', garment + '_' + str(i) + '.npz'), curvature_uv=uv_curvature[i, :, :])
 
         # os.makedirs(os.path.join(folder, id, 'uv_unposed'), exist_ok=True)
         # for i in range(uv_unposed.shape[0]):

convnext/models/convnext_tf.py

@@ -338,7 +338,7 @@ class ConvNeXtReverseLabels(tf.keras.Model):
     """
 
     def __init__(self, 
-                 depths=[3, 3, 9, 3], dims=[96, 192, 384, 768], kernel_size=7,
+                 depths=[3, 3, 9, 3], dims=[96, 192, 384, 768],
                  drop_path_rate=0., layer_scale_init_value=1e-6, head_init_scale=1.,
                  nr_of_classes=7):
         super().__init__()
@@ -360,14 +360,14 @@ class ConvNeXtReverseLabels(tf.keras.Model):
         cur = 0
         for i in range(len(depths)):
             stage = tf.keras.Sequential(
-                [Block(dim=dims[i], drop_path=dp_rates[cur + j], kernel_size=kernel_size,
+                [Block(dim=dims[i], drop_path=dp_rates[cur + j],
                        layer_scale_init_value=layer_scale_init_value, prefix=f'block{i}') for j in range(depths[i])]
             )
             self.stages.append(stage)
             cur += depths[i]
 
-        # self.last = Dense(nr_of_classes, activation='softmax')
+        self.last = Dense(nr_of_classes, activation='softmax')
-        self.last = Dense(1, activation='sigmoid')
+        # self.last = Dense(nr_of_classes - 1)
 
     def call(self, x, training):
         for i in reversed(range(len(self.downsample_layers))):

curvature_labels.py

@@ -275,7 +275,6 @@ def read_raw_curvatures(folder):
             continue
 
         curv = np.load(garment_dir + '/curvature_25_raw.npy')
-        print(curv.max())
         curvatures_all.append(curv)
     
     return curvatures_all
@@ -283,24 +282,24 @@ def read_raw_curvatures(folder):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument("-f", "--folder", help = "process the given folder", default=r'/home/workspace/data/dataset/train')
+    parser.add_argument("-f", "--folder", help = "process the given folder", default=r'/home/workspace/data/dataset/test')
     parser.add_argument("-s", "--start", help = "start of range", default=0)
     parser.add_argument("-e", "--end", help = "end of range", default=1500)
     parser.add_argument("-n", "--name", help = "end of range", default="lhunor")
     args = parser.parse_args()
 
-    # F = np.load("FeatureLines/superSMPL/smpl_faces.npy")
+    F = np.load("FeatureLines/superSMPL/smpl_faces.npy")
     # k_neighbours(k=25)
 
     folder = args.folder
     nr_of_labels = 6
     neighbourhood = 25
     temp_file = 'temp/' + ''.join(random.choice(string.ascii_lowercase) for i in range(10)) + '.ply'
-    # dist = np.load('MeshUtils/dijsktra.npy')
+    dist = np.load('MeshUtils/dijsktra.npy')
     # dist = np.load('MeshUtils/dijkstra_skirt.npy')
 
-    # generate_curvatures(folder, neighbourhood)
+    generate_curvatures(folder, neighbourhood)
-    curvatures = read_raw_curvatures(folder)
+    # curvatures = read_raw_curvatures(folder)
     # bins = get_bins(curvatures, nr_of_labels)
     # np.save('train_bins_skirt.npy', bins)
     # bins = np.load('train_bins.npy')

cvae.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_all_post import config
+from configs.config_abl_all_10p_curv_100_r2 import config
 
 os.environ["CUDA_VISIBLE_DEVICES"] = config['gpu']
 import tensorflow as tf
@@ -41,11 +41,11 @@ 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():
-    run = wandb.init(project='ablation', name=config['name'], notes=config['notes'], dir='/wandb', tags=config['tags'])
+    run = wandb.init(project='ablation', name=config['name'], notes=config['notes'], dir='/wandb')
     artifact = wandb.Artifact('code', type='code')
     artifact.add_file('cvae.py')
     artifact.add_file('models/cvae_model.py')
@@ -58,9 +58,7 @@ def init_wandb():
     artifact.add_file('convnext/models/convnext_tf.py')
     config_file_names = [key for key in sys.modules.keys()  if key.startswith('configs.')]
     for config_file_name in config_file_names:
-        file_name = '/'.join(config_file_name.split('.')) + '.py'
+        artifact.add_file('/'.join(config_file_name.split('.')) + '.py')
-        if os.path.exists(file_name):
-            artifact.add_file(file_name)
     run.log_artifact(artifact)
 
 uv2mesh = UV2Mesh(res=256, is_skirt=config['is_skirt'], is_adaptive=False, is_smpl_orig=config['is_cape'])
@@ -496,7 +494,8 @@ if __name__ == '__main__':
                                         use_one_hot=config['use_one_hot'],
                                         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'])
+                                        is_cape=config['is_cape'],
+                                        curv_neighbourhood=config['curv_neighbourhood'])
     static_dataset_train = StaticDataset(folder=config['train_dir'],
                                          signature=config['signature_static'], 
                                          resolutions=[config['resolution']], 
@@ -511,7 +510,8 @@ if __name__ == '__main__':
                                         use_one_hot=config['use_one_hot'],
                                         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'])
+                                        is_cape=config['is_cape'],
+                                        curv_neighbourhood=config['curv_neighbourhood'])
     static_dataset_valid = StaticDataset(folder=config['valid_dir'],
                                          signature=config['signature_static'], 
                                          resolutions=[config['resolution']], 

cvae_pyramid.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.post.config_abl_pyr_64_128_5 import config
+from configs.config_abl_pyr_32_skirt 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
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.smpl import SMPL
-from models.pyramid_model_optimized import PyramidNew as Pyramid
+from models.pyramid_model_optimized import Pyramid
 from postprocessing import fix_collision
 
 
@@ -59,9 +59,11 @@ def init_wandb():
     artifact.add_file('models/cond_encoder.py')
     artifact.add_file('dataset.py')
     artifact.add_file('convnext/models/convnext_tf.py')
-    config_file_names = [key for key in sys.modules.keys()  if key.startswith('configs.post.')]
+    config_file_names = [key for key in sys.modules.keys()  if key.startswith('configs')]
     for config_file_name in config_file_names:
-        artifact.add_file('/'.join(config_file_name.split('.')) + '.py')
+        file_name = '/'.join(config_file_name.split('.')) + '.py'
+        if os.path.exists(file_name):
+            artifact.add_file(file_name)
     run.log_artifact(artifact)
 
 uv2mesh = UV2Mesh(res=256, is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
@@ -208,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)
 
@@ -261,8 +263,8 @@ def train_step(batch):
         else:
             reconstr_loss_total = reconstr_loss_total + config['pyramid']['loss_weights'][i] * (l2_loss)
 
-        if config['use_norm_loss'] and step > 2000:
+        # if config['use_norm_loss'] and step > 2000:
-            reconstr_loss_total = reconstr_loss_total + n_loss * config['reg_loss_coeff']
+        #     reconstr_loss_total = reconstr_loss_total + n_loss * config['reg_loss_coeff']
         
         kl_total += kl
 
@@ -334,8 +336,8 @@ def valid_step(batch):
     else:
         reconstr_loss_total = reconstr_loss_total + config['pyramid']['loss_weights'][i] * (l2_loss)
     
-    if config['use_norm_loss'] and step > 2000:
+    # if config['use_norm_loss'] and step > 2000:
-        reconstr_loss_total = reconstr_loss_total + n_loss * config['reg_loss_coeff']
+    #     reconstr_loss_total = reconstr_loss_total + n_loss * config['reg_loss_coeff']
         
     kl_total += kl
 
@@ -731,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())
@@ -790,7 +792,7 @@ if __name__ == '__main__':
     # generate_results()
 
     ckpt = tf.train.Checkpoint(model=model)
-    manager = tf.train.CheckpointManager(ckpt, 'checkpoints/post/' + config['name'], max_to_keep=20)
+    manager = tf.train.CheckpointManager(ckpt, 'checkpoints/' + config['name'], max_to_keep=20)
 
     # load_model(model, 'checkpoints/pyr_abl_32_skirt', iteration='180000')
 
@@ -807,18 +809,18 @@ if __name__ == '__main__':
         model.static_enc.trainable = False
         model.body_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'])
     # model.levels[0].upscale_enhancer.trainable = False
 
 
-    for i in range(len(model.levels)):
+    for i in range(len(model.levels)-1):
         load_model(model.levels[i].upscale_enhancer, config['pyramid']['levels'][i]['upscale_enhancer'])
         model.levels[i].upscale_enhancer.trainable = False
-    # if config['pyramid']['resolutions'][-1] != 512:
+    if config['pyramid']['resolutions'][-1] != 512:
-    #     load_model(model.upscale_enhancer, config['pyramid']['final_upscale_enhancer'])
+        load_model(model.upscale_enhancer, config['pyramid']['final_upscale_enhancer'])
-    #     model.upscale_enhancer.trainable = False
+        model.upscale_enhancer.trainable = False
 
     for i in range(len(model.levels)-1):
         model.levels[i].trainable = False

dataset.py

@@ -176,7 +176,7 @@ class DatasetFactory():
             elif key == 'frame_nr':
                 tf_signature.append(tf.TensorSpec(shape = (), dtype = tf.string))
             elif key == 'mesh_curvature':
-                tf_signature.append(tf.TensorSpec(shape = signature[key], dtype = tf.float32))
+                tf_signature.append(tf.TensorSpec(shape = signature[key], dtype = tf.int32))
             else:
                 tf_signature.append(tf.TensorSpec(shape = signature[key], dtype = tf.float32))
         return tf_signature
@@ -194,7 +194,8 @@ class DatasetFactory():
                     use_one_hot=False,
                     use_no_orient=True,
                     testing=False,
-                    frames_file=None):
+                    frames_file=None,
+                    curv_neighbourhood=25):
         assert set(resolutions).issubset(set([32, 64, 128, 256, 512]))
 
         dataset_idx = DatasetIdx(folder, shuffle, is_cape=is_cape, testing=testing, frames_file=frames_file)
@@ -260,8 +261,8 @@ class DatasetFactory():
 
 
             if 'mesh_curvature' in signature.keys():
-                mesh_curvature = np.load(os.path.join(folder, 'mesh_curvature_raw', id + separator + frame_nr + '.npz')); mesh_curvature = mesh_curvature['mesh_curvature_raw']
+                mesh_curvature = np.load(os.path.join(folder, f'mesh_curvature_{curv_neighbourhood}_2' if curv_neighbourhood != 25 else 'mesh_curvature', id + separator + frame_nr + '.npz')); mesh_curvature = mesh_curvature['mesh_curvature']
-                item['mesh_curvature'] = mesh_curvature
+                item['mesh_curvature'] = mesh_curvature.astype(np.int32)
 
 
             for res in resolutions:
@@ -270,13 +271,14 @@ class DatasetFactory():
                     res_string = '_' + str(res)
 
                 if 'uv_curvature' + res_string in signature.keys():
-                    uv_curvature = np.load(os.path.join(folder, 'curvature_uv_raw' + res_string, id + separator + frame_nr + '.npz')); 
+                    # print(os.path.join(folder, (f'uv_curvature_{curv_neighbourhood}_2' if curv_neighbourhood != 25 else 'uv_curvature')+ res_string, id + separator + frame_nr + '.npz'))
+                    uv_curvature = np.load(os.path.join(folder, (f'uv_curvature_{curv_neighbourhood}_2' if curv_neighbourhood != 25 else 'uv_curvature')+ res_string, id + separator + frame_nr + '.npz')); 
                     if res_string != '':
                         uv_curvature = uv_curvature['uv_curvature'] 
                     else:
-                        uv_curvature = uv_curvature['curvature_uv_raw']
+                        uv_curvature = uv_curvature['curvature_uv']
-                    # uv_curvature = tf.one_hot(uv_curvature, 7)
+                    uv_curvature = tf.one_hot(uv_curvature, 7)
-                    item['uv_curvature' + res_string] = uv_curvature[:,:,tf.newaxis]
+                    item['uv_curvature' + res_string] = uv_curvature
 
                 if 'uv_unposed' + res_string in signature.keys():
                     uv_unposed_no_shape = np.load(os.path.join(folder, 'uv_unposed_no_shape' + one_hot_2 + res_string, id + separator + frame_nr + '.npz')); uv_unposed_no_shape = uv_unposed_no_shape['uv_unposed_no_shape']
@@ -370,8 +372,8 @@ if __name__ == '__main__':
                         #   'mesh_unposed': (14475, 3,),
                           'uv_unposed': (512, 256, 3),
                         #   'uv_unposed_32': (3, 32, 16,),
-                          'uv_curvature': (512, 256, 1),
+                          'uv_curvature': (512, 256, 7),
-                          'mesh_curvature':  (14475)
+                        #   'mesh_curvature':  (14475)
                         }
     signature_static = { #'uv_static': (3, 512, 256,),
                         #  'uv_static_32': (3, 32, 16,),
@@ -381,14 +383,16 @@ if __name__ == '__main__':
                         #  'uv_shaped_body': (3, 512, 256,),
                           }
 
-    dataset = factory.get_dataset(folder='/home/workspace/local-data/train',
+    dataset = factory.get_dataset(folder='/home/workspace/data/dataset/local-cache/train_skirt',
                                   batch_size=1,
                                   signature=signature_dynamic,
                                   resolutions=[512],
                                   do_repeat=False,
                                   use_one_hot=False,
-                                  is_cape=False,)
+                                  is_cape=False,
-    static_dataset = StaticDataset(folder='/home/workspace/local-data/train',
+                                  frames_file='frames_skirt_10p.txt',
+                                  curv_neighbourhood=25)
+    static_dataset = StaticDataset(folder='/home/workspace/data/dataset/local-cache/train_skirt',
                                    signature=signature_static,
                                    resolutions=[512],
                                   is_cape=False)
@@ -403,7 +407,7 @@ if __name__ == '__main__':
     for i, batch in enumerate(dataset):
         print(i)
         batch = static_dataset.expand_batch(batch_to_dict(batch, signature_dynamic))
-        ex.imshow(batch['uv_curvature'][0,:,:,0].numpy()).show()
+        ex.imshow(batch['uv_curvature'][0].numpy().argmax(-1) / 6.0).show()
         sum_uv += batch['uv_unposed'].numpy().sum(axis=0)
         sum_mask += batch['uv_mask'].numpy().sum(axis=0)
 

evaluate_ae.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from configs.config_abl_all_post import config
+from configs.config_abl_all_10p_curv_25_r2 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
 
@@ -102,7 +102,7 @@ if __name__ == '__main__':
     ids = [id.split('_')[0] for id in ids]
     ids = set(ids)
 
-    iteration = ''
+    iteration = '70000'
 
     load_model(model, 'checkpoints/post/' + checkpoint_name, iteration=iteration)
     # load_model(model, 'checkpoints/' + 'abl_all_120k')

merge_data.py

@@ -179,7 +179,7 @@ if __name__ == '__main__':
         start = time.perf_counter()
         # offsets_static = sio.loadmat(os.path.join(folder, id, garment + '_offsets_static.mat'))['label'][:,:3]
         # body_static = sio.loadmat(os.path.join(garment_dir, 'info_body.mat'))['B']
-        mask = np.squeeze(sio.loadmat(os.path.join(garment_dir, garment + '_mask.mat'))['mask'].astype(bool))
+        # mask = np.squeeze(sio.loadmat(os.path.join(garment_dir, garment + '_mask.mat'))['mask'].astype(bool))
         # verts_static = (body_static + offsets_static) * mask[:, np.newaxis]
         # # dfassert verts_static.min() > -1 and verts_static.max() < 1
 
@@ -257,12 +257,10 @@ if __name__ == '__main__':
         # for i in range(body_posed.shape[0]):
         #     shutil.copyfile(os.path.join(garment_dir, 'curvature_uv', garment + '_' + str(i) + '.npz'), os.path.join(output_folder, 'uv_curvature', id + '_' + str(i) + '.npz'))
        
-        os.makedirs(os.path.join(output_folder, 'mesh_curvature_raw'), exist_ok=True)
+        os.makedirs(os.path.join(output_folder, 'mesh_curvature'), exist_ok=True)
-        data = np.load(os.path.join(garment_dir, 'curvature_25_raw.npy'))
+        mesh_curvature = np.load(os.path.join(garment_dir, 'curvature_label_6_25.npy'))
-        mesh_curvature_raw = np.zeros((data.shape[0], 14475), dtype=np.float32)
-        mesh_curvature_raw[:, mask] = data
         for i in range(pose.shape[1]):
-            np.savez_compressed(os.path.join(output_folder, 'mesh_curvature_raw', id + '_' + str(i) + '.npz'), mesh_curvature_raw=mesh_curvature_raw[i])
+            np.savez_compressed(os.path.join(output_folder, 'mesh_curvature', id + '_' + str(i) + '.npz'), mesh_curvature=mesh_curvature[i])
        
 
         # os.makedirs(os.path.join(output_folder, 'uv_posed_body_no_orient'), exist_ok=True)

models/base.py

@@ -190,7 +190,13 @@ class DecoderNew(tf.keras.Model):
 
         x = self.decoder(x, training=training)
 
-        # if self.is_label:
+        if self.is_label:
+            x = x * mask[:,:,:,tf.newaxis]
+
+            background = tf.ones((mask.shape[0],512,256,1)) * (1 - mask[:,:,:,tf.newaxis])
+            x = tf.concat((background, x), axis=-1)
+
+            x = tf.math.softmax(x)
 
         if len(inputs) == 2:
             if len(mask.shape) == 2:

models/cvae_model.py

@@ -43,7 +43,7 @@ class CVAE(tf.keras.Model):
         self.cond_encoder = tf.keras.Sequential([tf.keras.layers.Dense(512, activation='relu'),
                                                  tf.keras.layers.Dense(256, activation='relu'),
                                                  tf.keras.layers.Dense(128, activation='relu'),
-                                                 tf.keras.layers.Lambda(lambda x: x / 1000),
+                                                #  tf.keras.layers.Lambda(lambda x: x / 1000),
                                                  tf.keras.layers.Dense(config['latent_dim'], activation='tanh')])
 
         self.encoder = VariationalEncoder(config['cvae']['latent_dim'], config['cvae']['encoder_depths'], config['cvae']['encoder_dims'], kernel_size=config['cvae']['kernel_size'])

run_parallel.py

@@ -4,24 +4,24 @@ import os
 
 if __name__ == '__main__':
 
-    # folder = '/home/workspace/data/dataset/test_skirt_ready_2'
+    folder = '/home/workspace/data/dataset/test_skirt_ready_2'
     # folder = '/home/workspace/local-data/cape_processed/train/male'
     # folder = '/home/workspace/local-data/valid_skirt'
-    folder = '/home/workspace/data/dataset/test_ready'
+    # folder = '/home/workspace/local-data/valid'
-    ids = os.listdir(folder)
+    # ids = os.listdir(folder)
-    # ids = os.listdir('/home/workspace/data/dataset/validation')#[280000:]
+    ids = os.listdir(folder + '/mesh_posed_no_orient')#[280000:]
     skirt = 0
 
     count = 0
-    step = 25
+    step = 2000
 
     # !!!!!!! change skirt parameter in script
 
-    while count < 400:
+    while count < len(ids):
         # os.system('nohup python convert_to_uv_cape.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_2_cape_train_male_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_2_cape_train_male_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
         # os.system('nohup python convert_to_uv.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_train_unposed_onehot_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_train_unposed_onehot_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
         # os.system('nohup python convert_to_uv_local.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_train_local_unposed_onehot_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_train_local_unposed_onehot_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
-        os.system('nohup python convert_to_uv_local_single.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_curv_raw_test_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_curv_raw_test_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
+        os.system('nohup python convert_to_uv_local_single.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_posed_no_orient_test_skirt_ready_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_posed_no_orient_test_skirt_ready_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
         # os.system('nohup python convert_to_uv_local_single.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_train_skirt_local_unposed_onehot_3_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_train_skirt_local_unposed_onehot_3_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
         # os.system('nohup python convert_to_uv_local_single.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'to_uv_valid_skirt_local_unposed_onehot_3_' + str(count) + '_' + str(count+step) + ' > nohup/to_uv_valid_skirt_local_unposed_onehot_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')
         # os.system('nohup python downscale.py -f ' + folder + ' -s ' + str(count) + ' -e ' + str(count + step) + ' -n ' + 'downscale_valid_posed_no_orient_' + str(count) + '_' + str(count+step) + ' > nohup/downscale_valid_posed_no_orient_' + str(count) + '_' + str(count+step) + '.out' + ' 2>&1 &')