Merge remote-tracking branch 'origin/iccv' into new_model

aaa_helpers.txt

@@ -1,8 +1,6 @@
-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_weights_test_6" > nohup/iccv/weights_test_6.out 2>&1 &
-nohup python auto_encoder_curv.py --name="lhunor_curv_raw_r2" > nohup/review/curv_raw_r2.out 2>&1 &
+nohup python evaluate_ae.py --name iccv_weights_test_6 > nohup/iccv/evaluate_iccv_weights_test_6.out 2>&1 &
-nohup python cvae.py --name="lhunor_abl_all_raw_r2" > nohup/review/abl_all_raw_r2.out 2>&1 &
+nohup python calculate_error.py --name iccv_weights_test_6 > nohup/iccv/error_iccv_weights_test_6.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 calculate_error.py --name error_abl_all_raw_r2 > nohup/error/abl_all_raw_r2_70k.out 2>&1 &
 
 
 one final convolutional layer for smoothing, on the final coordinates

auto_encoder_curv.py

@@ -37,7 +37,7 @@ from models.cond_encoder import AutoEncoderNew as AutoEncoder
 testing = False
 def init_wandb():
     if not testing:
-        run = wandb.init(project='ae', name=config['name'], notes=config['notes'], dir='/home/workspace/local-data/temp/', tags=config['tags'])
+        run = wandb.init(project='ae', name=config['name'], notes=config['notes'], dir='/home/workspace/local-data/temp/')
         artifact = wandb.Artifact('code', type='code')
         artifact.add_file('auto_encoder_curv.py')
         artifact.add_file('losses.py')
@@ -47,9 +47,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 = UV2MeshLabel(res=256, is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
@@ -102,18 +100,22 @@ def train_step(batch):
     with tf.GradientTape() as tape:
         pred = model([batch['uv_curvature'], batch['uv_mask']], training=True)
 
-        ce_uv_loss = tf.reduce_mean(tf.abs(batch['uv_curvature'] - pred))
+        ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)
-        ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred, batch['uv_curvature'], max_val=1))
+        ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))
 
         mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
-        ce_mesh_loss = tf.reduce_mean(tf.abs(batch['mesh_curvature'] - mesh_pred[:,:,0]))
+        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/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/mesh_l1': ce_mesh_loss }
+             'train/dice': dice, 'train/ce_mesh_loss': ce_mesh_loss }
         
 
 
@@ -121,30 +123,35 @@ def train_step(batch):
 def valid_step(batch):
     pred = model([batch['uv_curvature'], batch['uv_mask']], training=False)
 
-    ce_uv_loss = tf.reduce_mean(tf.abs(batch['uv_curvature'] - pred))
+    ce_uv_loss = scce(tf.math.argmax(batch['uv_curvature'], axis=-1), pred)
-    ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred, batch['uv_curvature'], max_val=1))
+    ms_ssim = tf.reduce_mean(tf.image.ssim(pred, batch['uv_curvature'], max_val=1))
 
     mesh_pred = uv2mesh(pred) * batch['mesh_mask'][:,:,tf.newaxis]
-    ce_mesh_loss = tf.reduce_mean(tf.abs(batch['mesh_curvature'] - mesh_pred[:,:,0]))
+    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
 
-    return { 'valid/loss': loss, 'valid/uv_l1': ce_uv_loss, 'valid/ssim': ms_ssim, 'valid/mesh_l1': 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
 
@@ -199,7 +206,7 @@ def test():
 
 if __name__ == '__main__':
     init_wandb()
-    # allow_memory_growth()
+    allow_memory_growth()
     parser = argparse.ArgumentParser(description='')
     parser.add_argument('--name', type=str)
     args = vars(parser.parse_args())

compare_models_saved.py

@@ -0,0 +1,188 @@
+import os
+import sys
+from configs.config_abl_all_post import config as config_a
+
+os.environ["CUDA_VISIBLE_DEVICES"] = '5'
+import tensorflow as tf
+
+gpus = tf.config.experimental.list_physical_devices('GPU')
+if gpus:
+    try:
+        # Currently, memory growth needs to be the same across GPUs
+        for gpu in gpus:
+            tf.config.experimental.set_memory_growth(gpu, True)
+        logical_gpus = tf.config.experimental.list_logical_devices('GPU')
+        print(len(gpus), "Physical GPUs,", len(logical_gpus), "Logical GPUs")
+    except RuntimeError as e:
+        # Memory growth must be set before GPUs have been initialized
+        print(e)
+
+import glob
+import time
+import argparse
+import wandb
+import tqdm
+import random
+import numpy as np
+import plotly.graph_objects as go
+import plotly.express as ex
+from PIL import Image
+from postprocessing import fix_collision
+
+if config_a['is_skirt']:
+    from losses import edge_loss_skirt as edge_loss
+else:
+    from losses import edge_loss
+
+
+
+from losses import collision_ratio, kl_loss #, concept_loss
+# from losses import collision_penalty as collision_penalty
+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 CVAE
+from custom_utils.supersmpl_io import writeOBJ
+from plotly.subplots import make_subplots
+
+
+# uv2mesh = UV2Mesh(res=256, is_skirt=config_a['is_skirt'], is_adaptive=False)
+
+
+
+def plot(mesh_gt, pred_a, pred_b, body, mask):
+    fig = make_subplots(rows=1, cols=3, start_cell="top-left", specs = [ [{ 'type': 'scene' } for _ in range(3)] ])
+    
+    _, faces_garment = _maskFaces(np.zeros((14475, 3), np.float32), F, mask)
+    faces = np.concatenate((F, faces_garment + 14475), axis=0)
+    mesh_gt = np.concatenate((body, mesh_gt[mask, :]), axis=0)
+    pred_a = np.concatenate((body, pred_a), axis=0)
+    pred_b = np.concatenate((body, pred_b), axis=0)
+    colors = np.concatenate((np.ones_like(body, dtype=np.int32)*100, np.ones_like(mesh_gt, dtype=np.int32)*230), axis=0)
+    # colors = np.ones_like(mesh_gt, dtype=np.int32)*230
+
+    fig.add_trace(go.Mesh3d(
+            x=mesh_gt[:,0],
+            y=mesh_gt[:,2],
+            z=mesh_gt[:,1],
+            i = faces[:,0],
+            j = faces[:,1],
+            k = faces[:,2],
+            text="Ground Truth",
+            vertexcolor=colors,
+        ),
+        row=1, col=1)
+
+    fig.add_trace(go.Mesh3d(
+            x=pred_a[:,0],
+            y=pred_a[:,2],
+            z=pred_a[:,1],
+            i = faces[:,0],
+            j = faces[:,1],
+            k = faces[:,2],
+            text="Pred A",
+            vertexcolor=colors,
+        ),
+        row=1, col=2)
+
+    fig.add_trace(go.Mesh3d(
+            x=pred_b[:,0],
+            y=pred_b[:,2],
+            z=pred_b[:,1],
+            i = faces[:,0],
+            j = faces[:,1],
+            k = faces[:,2],
+            text="Pred B",
+            vertexcolor=colors,
+        ),
+        row=1, col=3)
+
+
+
+    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), 
+                    )
+    helper = dict(xaxis = dict(nticks=4, range=[-1,1],),
+                yaxis = dict(nticks=4, range=[-1,1],),
+                zaxis = dict(nticks=4, range=[-1,1],),)
+    fig.update_layout(scene = helper,
+                        scene2 = helper,
+                        scene3 = helper,
+                        )
+
+    return fig
+
+
+
+if __name__ == '__main__':
+    run = wandb.init(project='plots', name=config_a['name'], notes=config_a['notes'], dir='/wandb')
+
+    parser = argparse.ArgumentParser(description='')
+    parser.add_argument('--name', type=str)
+    args = vars(parser.parse_args())
+
+    skirt_modifier = '_skirt' if config_a['is_skirt'] else ''
+
+    folder = config_a['test_dir']
+    # smpl = SMPL(use_one_hot=False)
+
+    F = np.load("custom_utils/smpl_faces" + skirt_modifier + ".npy").astype(np.int32)
+
+    iteration = ''
+
+    # load_model(model, 'checkpoints/' + 'abl_all_120k')
+
+
+    factory = DatasetFactory()
+    dataset_a = factory.get_dataset(folder=config_a['test_dir'], 
+                                       batch_size=config_a['batch_size'], 
+                                       signature=config_a['signature_dynamic'], 
+                                       resolutions=[config_a['resolution']], 
+                                       in_memory=False, 
+                                       do_repeat=False,
+                                       use_one_hot=config_a['use_one_hot'],
+                                       use_no_orient=config_a['remove_global_orientation'],
+                                       shuffle=False,
+                                       testing=True,
+                                    #    frames_file='frames_abl.txt',
+                                       )
+    static_dataset_a = StaticDataset(folder=config_a['test_dir'], 
+                                        signature=config_a['signature_static'], 
+                                        resolutions=[config_a['resolution']], 
+                                        in_memory=True)
+
+    iterator_a = iter(dataset_a)
+    
+
+    faces_folder = '/home/workspace/data/results/support/faces' + ('_skirt' if config_a['is_skirt'] else '')
+    ids = os.listdir(faces_folder)
+    ids = [id.split('.')[0] for id in ids]
+    faces = {id : np.load(faces_folder + '/' + id + '.npy') for id in ids }
+
+    results_folder = '/home/workspace/data/results/post'
+
+    count = 0
+    while True:
+        batch = iterator_a.get_next()
+
+        batch = static_dataset_a.expand_batch(batch_to_dict(batch, config_a['signature_dynamic']))
+
+        mask = batch['mesh_mask'].numpy().astype(bool)
+        gt = batch['mesh_posed'].numpy()
+        body = batch['mesh_body_posed'].numpy()
+
+        for i in range(mask.shape[0]):
+            id, frame_nr = batch['id'][i].numpy().decode("utf-8"), batch['frame_nr'][i].numpy().decode("utf-8")
+            pred_a = np.load(results_folder + '/al_all_post-/' + id + '_' + frame_nr + '.npy')
+            pred_b = np.load(results_folder + '/iccv_weights_test_6-/' + id + '_' + frame_nr + '.npy')
+            # pred_c = np.load(results_folder + '/iccv_weights_test_6-/' + id + '_' + frame_nr + '.npy')
+
+            fig = plot(gt[i], pred_a, pred_b, body[i], mask[i])
+
+            wandb.log({f'{id}_{frame_nr}': fig}, step = count)
+            count += 1
+
+            print(count)
+

configs/config_abl_all_post.py

@@ -7,7 +7,7 @@ config = dict()
 # 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['use_skinning'] =              False # and deshaping
 config['remove_global_orientation'] = True
 config['use_curvature'] =             True
 config['use_extra_losses'] =          True # edge, collision, 3d mesh
@@ -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'] = '5'
-config['name'] = 'abl_all_raw_r2'
+config['name'] = 'iccv_weights_test_8'
-config['notes'] = ''
+config['notes'] = 'smaller weight loss coeff, 1e-6, convolutional weight learning, changed convnext reverse'
-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
@@ -87,14 +86,15 @@ config['use_one_hot'] = False
 config['cvae'] = dict()
 config['cvae']['is_label'] = False
 config['cvae']['add_noise'] = True
-config['cvae']['noise_amount'] = 0.001
+config['cvae']['noise_amount'] = 0.00001
 
 config['cvae']['kernel_size'] = 7
 config['cvae']['encoder_depths'] = [3, 3, 3, 9, 3]
 config['cvae']['encoder_dims'] = [32, 64, 128, 256, 64]
-config['cvae']['decoder_depths'] = config['cvae']['encoder_depths']
+config['cvae']['decoder_depths'] = [3, 9, 3, 3, 3, 3]
-config['cvae']['decoder_dims'] = config['cvae']['encoder_dims']
+config['cvae']['decoder_dims'] = [3, 32, 128, 128, 256, 512]
-
+config['cvae']['decoder_weights_depths'] = [3, 9, 3, 3, 3]
+config['cvae']['decoder_weights_dims'] = [24, 32, 64, 128, 256]
 
 config['cond_ae_static'] = dict()
 config['cond_ae_static']['is_label'] = False

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

@@ -2,7 +2,7 @@ from unittest import skip
 import numpy as np
 import tensorflow as tf
 from tensorflow.keras.layers import (Conv2D, Conv2DTranspose, Dense, DepthwiseConv2D,
-                                     GlobalAveragePooling2D, Layer,
+                                     GlobalAveragePooling2D, Layer, Activation, Lambda,
                                      LayerNormalization, Flatten, Reshape, UpSampling2D)
 
 def drop_path(inputs, drop_prob, is_training):
@@ -222,29 +222,31 @@ class ConvNeXtReverse(tf.keras.Model):
 
     def __init__(self, 
                  depths=[3, 3, 9, 3], dims=[96, 192, 384, 768], kernel_size=7,
-                 drop_path_rate=0., layer_scale_init_value=1e-6, head_init_scale=1.,
+                 drop_path_rate=0., layer_scale_init_value=1e-6, head_init_scale=1., learn_weights=False,
                  ):
         super().__init__()
-        self.upsample_layers = []  # stem and 3 intermediate downsampling conv layers
+        self.upsample_layers = [] 
+
         stem = tf.keras.Sequential([
-            Conv2DTranspose(dims[0], kernel_size=4, strides=4, padding='same'),
+            LayerNormalization(epsilon=1e-6),
-            # UpSampling2D((4, 4), interpolation='nearest'),
+            Conv2DTranspose(dims[0], kernel_size=2, strides=2, padding='same'),
-            # Conv2D(dims[0], kernel_size=4, strides=1, padding='same'),
+        ])
-            # Dense(dims[0]),
-            LayerNormalization(epsilon=1e-6)]
-        )
         self.upsample_layers.append(stem)
-        for i in range(len(depths) - 1):
+
+        for i in range(len(depths) - 2):
             downsample_layer = tf.keras.Sequential([
                 LayerNormalization(epsilon=1e-6),
-                Conv2DTranspose(dims[i+1], kernel_size=2, strides=2, padding='same')
+                Conv2DTranspose(dims[i+1], kernel_size=2, strides=2, padding='same'),
-                # UpSampling2D((2,2), interpolation='nearest'),
-                # Conv2D(dims[i+1], kernel_size=2, strides=1, padding='same'),
-                # Dense(dims[i+1]),
             ])
             self.upsample_layers.append(downsample_layer)
 
-        self.stages = []  # 4 feature resolution stages, each consisting of multiple residual blocks
+        downsample_layer = tf.keras.Sequential([
+            Conv2DTranspose(dims[i+2], kernel_size=2, strides=2, padding='same'),
+            LayerNormalization(epsilon=1e-6),
+        ])
+        self.upsample_layers.append(downsample_layer)
+
+        self.stages = []  
         dp_rates = [x for x in np.linspace(0, drop_path_rate, sum(depths))]
         cur = 0
         for i in range(len(depths)):
@@ -255,12 +257,19 @@ class ConvNeXtReverse(tf.keras.Model):
             self.stages.append(stage)
             cur += depths[i]
 
+        if not learn_weights:
             self.last = Dense(3, activation='tanh')
+            # self.last = Activation('tanh')
+        else:
+            self.last = Activation('softmax')
+            # self.last = Dense(24, activation='softmax')
+
 
     def call(self, x, training):
         for i in reversed(range(len(self.upsample_layers))):
             x = self.upsample_layers[i](x, training=training)
             x = self.stages[i](x, training=training)
+
         x = self.last(x, training=training)
         return x
 
@@ -338,7 +347,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 +369,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(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')

custom_utils/custom_utils.py

@@ -2,6 +2,7 @@ import json
 import numpy as np
 import tensorflow as tf
 import scipy as sp
+import cmapy as cm
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 
@@ -216,6 +217,35 @@ def plot_3d(mesh_gt, mesh_pred_unposed, faces, collision, collision_faces, colli
     return fig
 
 
+def plot_weights(weights, body, faces):
+    fig = go.Figure()
+    colors = np.array([cm.color('jet', 1 - w) for w in weights.numpy()])
+
+    # if flip_xy:
+    #     mesh_gt = flip_axis(mesh_gt)
+    #     mesh_pred_unposed = flip_axis(mesh_pred_unposed)
+    #     collision = flip_axis(collision, ind=14475)
+
+    fig.add_trace(go.Mesh3d(
+                x=body[:,0],
+                y=body[:,2],
+                z=body[:,1],
+                i = faces[:,0],
+                j = faces[:,1],
+                k = faces[:,2],
+                vertexcolor=colors
+            ))
+    
+
+    fig.update_layout(scene_aspectmode='manual', scene_aspectratio=dict(x=1, y=1, z=1),)
+    helper = dict(xaxis = dict(nticks=4, range=[-1,1],),
+                yaxis = dict(nticks=4, range=[-1,1],),
+                zaxis = dict(nticks=4, range=[-1,1],),)
+    fig.update_layout(scene = helper,)
+
+    return fig
+
+
 def plot_3d_collision(gt, collision_1, collision_2, collision_faces, collision_color, flip_xy=False):
     fig = make_subplots(rows=1, cols=3, start_cell="top-left", specs = [ [{ 'type': 'scene' } for _ in range(3)] ])
 

custom_utils/smpl.py

@@ -406,7 +406,8 @@ class SMPL:
         return T_out, J_out
 
 
-    def run_garment_with_weights(self, R, betas, v_cloth, weights, J=None):
+    def run_garment_with_weights(self, pose, betas, v_cloth, weights, J=None):
+        R = self.run_rodrigues(pose)
         
         if J is None:
             J = self.get_joints_template(betas)
@@ -430,13 +431,12 @@ class SMPL:
             J = tf.gather(J, tf.constant([0, 1, 2], tf.int32), axis=1)
             
             T = tf.tensordot(weights, results, axes=((1), (0)))
-            rest_shape_h = tf.concat((v_cloth, tf.ones((v_cloth.get_shape().as_list()[0], 1), dtype=tf.float32)), axis=1)
+            rest_shape_h = tf.concat((v_cloth, tf.ones((v_cloth.shape[0], 1), dtype=tf.float32)), axis=1)
             v = tf.matmul(T, tf.reshape(rest_shape_h, (-1, 4, 1)))
             v = tf.reshape(v, (-1, 4))[:, :3]
 
             return v, tf.squeeze(J)
 
-        # gender = tf.cast(tf.greater_equal(betas[:, 10] , 0), tf.int32)
         T_out, J_out = tf.map_fn(single_run, (R, J, v_cloth, weights), (tf.float32, tf.float32))
         
         J0 = tf.reshape(J_out[:,0,:], (-1, 1, 3))

cvae.py

@@ -38,14 +38,14 @@ else:
 from losses import collision_ratio, kl_loss, normal_loss #, concept_loss
 # from losses import collision_penalty as collision_penalty
 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 custom_utils.custom_utils import batch_to_dict, load_model, plot_3d, UV2Mesh, UV2MeshLabel, get_summary_html, maskFacesBatch, _maskFaces, plot_3d_collision, plot_weights
 from dataset import DatasetFactory, StaticDataset
 from custom_utils.smpl import SMPL
 from models.cvae_model import CVAENew as 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,12 +58,11 @@ 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'])
+uv2mesh_label = UV2MeshLabel(res=256, is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
 
 
 def kl_loss(mean, logvar):
@@ -73,6 +72,12 @@ def kl_loss(mean, logvar):
     return kl_loss
 
 
+def blend_weights_reg(pred_w, gender=None):
+    orig = smpl.weights
+    l1 = tf.reduce_mean(tf.abs(pred_w - orig[None, 0, :, :]))
+    return l1
+
+
 # 3d loss on posed !!!!!!!!!!!!
 
 @tf.function
@@ -84,9 +89,10 @@ def train_step(batch):
         else:
             mesh_orig, uv_orig = batch['mesh_posed'], batch['uv_posed']
 
-        pred, mean, logvar = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=True)
+        pred, mean, logvar, weights = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=True)
 
         mesh_pred = uv2mesh(pred)
+        mesh_weigths = uv2mesh_label(weights)
 
         if config['use_skinning']:
             shape = batch['pose_shape'][:, 72:]
@@ -96,25 +102,31 @@ def train_step(batch):
             mesh_pred_shaped = mesh_pred + shape_offsets * batch['mesh_mask'][:,:,tf.newaxis]
             mesh_pred_posed = smpl.run_garment(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped)
         else:
-            mesh_pred_posed = mesh_pred
+            shape = batch['pose_shape'][:, 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 * batch['mesh_mask'][:,:,tf.newaxis]
+            mesh_pred_posed = smpl.run_garment_with_weights(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped, mesh_weigths)
 
         # is the output already masked?
 
         e_loss = tf.reduce_mean(edge_loss(mesh_pred, mesh_orig, batch['mesh_mask']))
         c_loss, c_ratio = collision_penalty(mesh_pred_posed, batch['mesh_body_posed'], batch['mesh_mask'])
         c_loss, c_ratio = tf.reduce_mean(c_loss), tf.reduce_mean(c_ratio)
-        l2_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(((uv_orig - pred) ** 2), axis=-1), axis=[1, 2]))
+        # l2_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(((uv_orig - pred) ** 2), axis=-1), axis=[1, 2]))
         l2_mesh_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (batch['mesh_posed'] - mesh_pred_posed) ** 2, axis=-1), axis=-1))
         n_loss = normal_loss(mesh_pred_posed, batch['mesh_posed'], batch['mesh_mask'], is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
         # conc_loss = concept_loss(pred, batch['uv_unposed'])
         kl = kl_loss(mean, logvar)
+        weights_l = blend_weights_reg(mesh_weigths)
 
-        reconstr_loss = l2_loss
+        reconstr_loss = l2_mesh_loss + 1e-6 * weights_l
         if config['use_extra_losses']:
             if 'block_collision_loss' in config.keys() and config['block_collision_loss'] == True:
-                reconstr_loss = reconstr_loss + l2_mesh_loss + (e_loss) * config['reg_loss_coeff']
+                reconstr_loss = reconstr_loss + (e_loss) * config['reg_loss_coeff']
             else:
-                reconstr_loss = reconstr_loss + l2_mesh_loss + (e_loss + c_loss) * config['reg_loss_coeff']
+                reconstr_loss = reconstr_loss + (e_loss + c_loss) * config['reg_loss_coeff']
         if config['use_norm_loss'] and step > 2000:
             reconstr_loss = reconstr_loss + n_loss * config['reg_loss_coeff']
 
@@ -124,14 +136,14 @@ def train_step(batch):
         logvar = tf.reduce_mean(logvar)
 
     # ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred + 5, batch['uv_unposed'] + 5, max_val=10, power_factors=(0.5, 0.2, 0.1, 0.1, 0.1)))
-    metric = tf.reduce_sum(tf.math.sqrt(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (mesh_orig - mesh_pred) ** 2, axis=-1))) / tf.reduce_sum(batch['mesh_mask'])
+    metric = tf.reduce_sum(tf.math.sqrt(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (mesh_orig - mesh_pred_posed) ** 2, axis=-1))) / tf.reduce_sum(batch['mesh_mask'])
     gradients = tape.gradient(loss, model.trainable_variables)
     optimizer.apply_gradients(zip(gradients, model.trainable_variables))
     return { 'train/loss': loss, 'train/edge_loss': e_loss, 'train/collision_loss': c_loss, 'train/euclid_error': metric,
              'train/reconstr_loss': reconstr_loss, 'train/collision_ratio': c_ratio,
              'train/mean': mean, 'train/logvar': logvar, 'train/kl_loss': kl, 'train/var': np.e ** logvar,
-             'train/l2_loss': l2_loss, 'train/l2_mesh_loss': l2_mesh_loss, 'train/normal_loss': n_loss,
+             'train/l2_mesh_loss': l2_mesh_loss, 'train/normal_loss': n_loss, 'train/weights_loss': weights_l,
-             # 'train/ms_ssim': ms_ssim, 
+             # 'train/ms_ssim': ms_ssim, 'train/l2_loss': l2_loss, 
             }
 
 
@@ -142,9 +154,10 @@ def valid_step(batch):
     else:
         mesh_orig, uv_orig = batch['mesh_posed'], batch['uv_posed']
 
-    pred, mean, logvar = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
+    pred, mean, logvar, weights = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
 
     mesh_pred = uv2mesh(pred)
+    mesh_weigths = uv2mesh_label(weights)
 
     if config['use_skinning']:
         shape = batch['pose_shape'][:, 72:]
@@ -154,22 +167,28 @@ def valid_step(batch):
         mesh_pred_shaped = mesh_pred + shape_offsets * batch['mesh_mask'][:,:,tf.newaxis]
         mesh_pred_posed = smpl.run_garment(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped)
     else:
-        mesh_pred_posed = mesh_pred
+        shape = batch['pose_shape'][:, 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 * batch['mesh_mask'][:,:,tf.newaxis]
+        mesh_pred_posed = smpl.run_garment_with_weights(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped, mesh_weigths)
 
     # is the output already masked?
 
     e_loss = tf.reduce_mean(edge_loss(mesh_pred, mesh_orig, batch['mesh_mask']))
     c_loss, c_ratio = collision_penalty(mesh_pred_posed, batch['mesh_body_posed'], batch['mesh_mask'])
     c_loss, c_ratio = tf.reduce_mean(c_loss), tf.reduce_mean(c_ratio)
-    l2_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(((uv_orig - pred) ** 2), axis=-1), axis=[1, 2]))
+    # l2_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(((uv_orig - pred) ** 2), axis=-1), axis=[1, 2]))
     l2_mesh_loss = tf.reduce_mean(1e3 * tf.reduce_mean(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (batch['mesh_posed'] - mesh_pred_posed) ** 2, axis=-1), axis=-1))
     n_loss = normal_loss(mesh_pred_posed, batch['mesh_posed'], batch['mesh_mask'], is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
     # conc_loss = concept_loss(pred, batch['uv_unposed'])
     kl = kl_loss(mean, logvar)
+    weights_l = blend_weights_reg(mesh_weigths)
 
-    reconstr_loss = l2_loss
+    reconstr_loss = l2_mesh_loss + 1e-6 * weights_l
     if config['use_extra_losses']:
-        reconstr_loss = reconstr_loss + l2_mesh_loss + (e_loss + c_loss) * config['reg_loss_coeff']
+        reconstr_loss = reconstr_loss + (e_loss + c_loss) * config['reg_loss_coeff']
     if config['use_norm_loss']:
         reconstr_loss = reconstr_loss + n_loss * config['reg_loss_coeff']
 
@@ -179,12 +198,12 @@ def valid_step(batch):
     logvar = tf.reduce_mean(logvar)
 
     # ms_ssim = tf.reduce_mean(tf.image.ssim_multiscale(pred + 5, batch['uv_unposed'] + 5, max_val=10, power_factors=(0.5, 0.2, 0.1, 0.1, 0.1)))
-    metric = tf.reduce_sum(tf.math.sqrt(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (mesh_orig - mesh_pred) ** 2, axis=-1))) / tf.reduce_sum(batch['mesh_mask'])
+    metric = tf.reduce_sum(tf.math.sqrt(tf.reduce_sum(batch['mesh_mask'][:,:,tf.newaxis] * (mesh_orig - mesh_pred_posed) ** 2, axis=-1))) / tf.reduce_sum(batch['mesh_mask'])
     # c_ratio = tf.reduce_mean(collision_ratio(mesh_pred_posed, batch['mesh_body_posed'], batch['mesh_mask']))
 
     return { 'valid/loss': loss, 'valid/edge_loss': e_loss, 'valid/collision_loss': c_loss, 'valid/euclid_error': metric, 
              'valid/reconstr_loss': reconstr_loss, 'valid/l2_mesh_loss': l2_mesh_loss, 'valid/collision_ratio': c_ratio,
-             'valid/mean': mean, 'valid/logvar': logvar, 'valid/kl_loss': kl, 'valid/var': np.e ** logvar,
+             'valid/mean': mean, 'valid/logvar': logvar, 'valid/kl_loss': kl, 'valid/var': np.e ** logvar, 'valid/weights_loss': weights_l,
               'valid/normal_loss': n_loss,# 'valid/ms_ssim': ms_ssim, 
               }
 
@@ -196,7 +215,7 @@ def test_step(batch):
     else:
         mesh_orig, uv_orig = batch['mesh_posed'], batch['uv_posed']
     
-    pred, mean, logvar = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
+    pred, mean, logvar, weights = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
 
     mesh_pred = uv2mesh(pred)
 
@@ -210,7 +229,7 @@ def test_step(batch):
         mesh_orig_shaped = mesh_orig + shape_offsets * batch['mesh_mask'][:,:,tf.newaxis]
         mesh_orig_posed = smpl.run_garment(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_orig_shaped)
     else:
-        mesh_pred_posed = mesh_pred
+        mesh_pred_posed = smpl.run_garment_with_weights(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred, weights)
         mesh_orig_posed = mesh_orig
     
     mesh_pred_posed_fixed = fix_collision(mesh_pred_posed, batch['mesh_body_posed'], batch['mesh_mask'])
@@ -252,9 +271,10 @@ def plot_everything(batch: dict, type: str):
     else:
         mesh_orig, uv_orig = batch['mesh_posed'], batch['uv_posed']
 
-    pred, mean, logvar = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
+    pred, mean, logvar, weights = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
     
     mesh_pred = uv2mesh(pred).numpy()
+    mesh_weigths = uv2mesh_label(weights)
     
     orig_img = uv_orig
     uv_static_img = batch['uv_static']
@@ -279,7 +299,12 @@ def plot_everything(batch: dict, type: str):
             mesh_pred[i, mask[i], :] += shape_offsets.numpy()[i, mask[i], :]
         mesh_posed = smpl.run_garment(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred).numpy()
     else:
-        mesh_posed = mesh_pred
+        shape = batch['pose_shape'][:, 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 * batch['mesh_mask'][:,:,tf.newaxis]
+        mesh_posed = smpl.run_garment_with_weights(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped, mesh_weigths).numpy()
         gt = [mesh_orig[i].numpy()[mask[i], :] for i in range(pred.shape[0])]
         garment_unposed, faces = maskFacesBatch(mesh_pred, F, mask)
 
@@ -298,13 +323,16 @@ def plot_everything(batch: dict, type: str):
     collision_fixed = [np.concatenate((body[i], garment_posed_fixed[i]), axis=0) for i in range(len(garment_posed))]
     collision_gt = [np.concatenate((body[i], gt_posed[i]), axis=0) for i in range(len(garment_posed))]
 
-    figs = { type + "/garment_" + str(i): plot_3d(gt[i], garment_unposed[i], faces[i], collision[i], collision_faces[i], collision_color[i], flip_xy=(not config['use_skinning'] and config['remove_global_orientation'])) for i in range(4) }
+    # figs = { type + "/garment_" + str(i): plot_3d(gt[i], garment_unposed[i], faces[i], garment_posed[i], faces[i], collision_color[i], flip_xy=(not config['use_skinning'] and config['remove_global_orientation'])) for i in range(4) }
-    figs_coll = { type + "/garment_" + str(i) + '_collision': plot_3d_collision(collision_gt[i], collision[i], collision_fixed[i], collision_faces[i], collision_color[i], flip_xy=(not config['use_skinning'] and config['remove_global_orientation'])) for i in range(4) }
+    figs = { type + "/garment_" + str(i): plot_3d(gt[i], garment_unposed[i], faces[i], collision[i], collision_faces[i], collision_color[i],) for i in range(4) }
+    figs_coll = { type + "/garment_" + str(i) + '_collision': plot_3d_collision(collision_gt[i], collision[i], collision_fixed[i], collision_faces[i], collision_color[i],) for i in range(4) }
+    figs_weights = { type + '/weights_' + str(i): plot_weights(mesh_weigths[0,:,i], body[0], F) for i in range(24) }
+    # figs_weights = { type + '/weights_' + str(i): plot_weights(smpl.weights[0,:,i], body[0], F) for i in range(24) }
 
     mean_hist = wandb.Histogram(sequence=mean.numpy().mean(axis=0))
     logvar_hist = wandb.Histogram(sequence=logvar.numpy().mean(axis=0))
 
-    return { **figs, **figs_coll, **{ type + '/images': imgs, type + '/mean_hist': mean_hist, type + '/logvar_hist': logvar_hist } }
+    return { **figs, **figs_coll, **figs_weights, **{ type + '/images': imgs, type + '/mean_hist': mean_hist, type + '/logvar_hist': logvar_hist } }
 
 
 def sample(folder): 

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
@@ -260,8 +260,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, '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 +270,13 @@ 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')); 
+                    uv_curvature = np.load(os.path.join(folder, '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 +370,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 +381,15 @@ 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/local-data/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_dress_30k.txt')
+    static_dataset = StaticDataset(folder='/home/workspace/local-data/train_skirt',
                                    signature=signature_static,
                                    resolutions=[512],
                                   is_cape=False)
@@ -403,7 +404,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)
 

docker/Dockerfile

@@ -2,9 +2,41 @@ FROM tensorflow/tensorflow:2.9.0-gpu
 
 RUN apt-get update
 RUN apt-get upgrade -y
+
+# Add the current user to the image
+ARG USER_NAME=lhunor
+ARG USER_ID=11017
+ARG GROUP_NAME=guest
+ARG GROUP_ID=11000
+
+# Update the system and install required packages
+RUN apt-get update && apt-get upgrade -y && apt-get install -y sudo git
+
+# Create a new group with the same GID as the host
+RUN groupadd --gid $GROUP_ID $GROUP_NAME
+
+# Create a new user with the same UID and GID as the host
+RUN useradd --uid $USER_ID --gid $GROUP_ID --shell /bin/bash --create-home $USER_NAME
+
+# don't require password with sudo, for convenience
+# not the safest thing to do, but hopefully okay inside the container
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# Add the new user to the sudo group
+RUN usermod -aG sudo $USER_NAME
+
+# Set the default user to the new user
+USER $USER_NAME
+
+WORKDIR //home-net
+
 RUN apt-get install git ffmpeg libsm6 libxext6 libopenexr-dev zip unzip htop nano -y
 RUN pip install numpy matplotlib opencv-python wandb OpenEXR tensorflow-graphics scipy plotly pandas tensorboardX opencv-python cmapy
 
+# defining the volumes that will be mounted
+VOLUME [ "/data-net" ]
+VOLUME [ "/data-local" ]
+VOLUME [ "/home-net" ]
 
-WORKDIR /home/workspace/data
+# Start the container with a bash shell
-# RUN wandb login
+CMD ["/bin/bash"]

evaluate_ae.py

@@ -39,7 +39,7 @@ else:
 from losses import collision_ratio, kl_loss #, concept_loss
 # from losses import collision_penalty as collision_penalty
 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 custom_utils.custom_utils import batch_to_dict, load_model, plot_3d, UV2Mesh, UV2MeshLabel, 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
@@ -48,6 +48,7 @@ from custom_utils.supersmpl_io import writeOBJ
 
 
 uv2mesh = UV2Mesh(res=256, is_skirt=config['is_skirt'], is_adaptive=False, is_smpl_orig=config['is_cape'])
+uv2mesh_label = UV2MeshLabel(res=256, is_skirt=config['is_skirt'], is_smpl_orig=config['is_cape'])
 
 @tf.function
 def step(batch):
@@ -56,9 +57,10 @@ def step(batch):
     else:
         uv_orig =  batch['uv_posed']
     
-    pred, _, _ = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
+    pred, _, _, weights = model([uv_orig, batch['uv_static'], batch['uv_body_posed'], batch['uv_curvature'], batch['uv_mask']], training=False)
 
     mesh_pred = uv2mesh(pred)
+    mesh_weigths = uv2mesh_label(weights)
 
     if config['use_skinning']:
         shape = batch['pose_shape'][:, 72:]
@@ -68,7 +70,13 @@ def step(batch):
         mesh_pred_shaped = mesh_pred + shape_offsets * batch['mesh_mask'][:,:,tf.newaxis]
         mesh_pred_posed = smpl.run_garment(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped)
     else:
-        mesh_pred_posed = mesh_pred
+        shape = batch['pose_shape'][:, 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 * batch['mesh_mask'][:,:,tf.newaxis]
+        mesh_pred_posed = smpl.run_garment_with_weights(batch['pose_shape'][:, :72], batch['pose_shape'][:, 72:], mesh_pred_shaped, mesh_weigths)
+
         
     # mesh_pred_posed_fixed = fix_collision(mesh_pred_posed, batch['mesh_body_posed'], batch['mesh_mask'])
 

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

@@ -171,13 +171,13 @@ class AEEncoderNew(tf.keras.Model):
 
 class DecoderNew(tf.keras.Model):
     
-    def __init__(self, depths, dims, kernel_size=7, is_label=False):
+    def __init__(self, depths, dims, kernel_size=7, is_label=False, learn_weights=False):
         super(DecoderNew, self).__init__()
 
         self.is_label = is_label
 
         if not is_label:
-            self.decoder = ConvNeXtReverse(depths=depths, dims=dims, kernel_size=kernel_size)
+            self.decoder = ConvNeXtReverse(depths=depths, dims=dims, kernel_size=kernel_size, learn_weights=learn_weights)
         else:
             self.decoder = ConvNeXtReverseLabels(depths=depths, dims=dims, nr_of_classes=7)
             
@@ -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

@@ -181,6 +181,7 @@ class CVAENew(tf.keras.Model):
 
         self.encoder = VariationalEncoderNew(config['cvae']['encoder_depths'], config['cvae']['encoder_dims'], kernel_size=config['cvae']['kernel_size'])
         self.decoder = DecoderNew(config['cvae']['decoder_depths'], config['cvae']['decoder_dims'], config['cvae']['kernel_size'])
+        self.decoder_weights = DecoderNew(config['cvae']['decoder_weights_depths'], config['cvae']['decoder_weights_dims'], config['cvae']['kernel_size'], learn_weights=True)
 
         self.reshape = tf.keras.layers.Reshape((8, 4, 64))
 
@@ -193,12 +194,12 @@ class CVAENew(tf.keras.Model):
         self.noise_amount = config['cvae']['noise_amount']
         self.use_curvature = config['use_curvature']
         self.only_curvatures = config['only_curvatures'] if 'only_curvatures' in config.keys() and config['only_curvatures'] == True else None
-        self.use_offsets_over_body = not config['use_skinning']
+        self.use_offsets_over_body = False
 
         if self.use_offsets_over_body:
             assert self.avg_garment is None, 'When we are not using skinning, we can\'t use avg_garment!'
-        if self.avg_garment is not None:
+        # if self.avg_garment is not None:
-            assert not self.use_offsets_over_body, 'When avg_garment is given, we must use skinning!'
+        #     assert not self.use_offsets_over_body, 'When avg_garment is given, we must use skinning!'
 
     # @tf.function
     def sample(self, uv_template, uv_body_posed, uv_curv, uv_mask, noise=None, add_noise=False):
@@ -214,6 +215,7 @@ class CVAENew(tf.keras.Model):
         z = tf.concat([eps, z_cond], axis=-1)
 
         x = self.decoder(z, training=False)
+        weights = self.decoder_weights(z, training=False)
         
         if self.avg_garment is not None:
             x = x + self.avg_garment[tf.newaxis,:,:,:]
@@ -223,7 +225,7 @@ class CVAENew(tf.keras.Model):
 
         x = x * uv_mask[:,:,:,tf.newaxis]
 
-        return x
+        return x, weights
 
 
     def reparameterize(self, mean, logvar, training, fix_noise=False):
@@ -272,6 +274,7 @@ class CVAENew(tf.keras.Model):
 
         z = tf.concat([z, z_cond], axis=-1)
         x = self.decoder(z, training=training)
+        weights = self.decoder_weights(z, training=training)
 
         if self.avg_garment is not None:
             x = x + self.avg_garment[tf.newaxis,:,:,:]
@@ -281,5 +284,5 @@ class CVAENew(tf.keras.Model):
 
         x = x * uv_mask[:,:,:,tf.newaxis]
 
-        return x, mean, logvar
+        return x, mean, logvar, weights
 

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 &')