diff --git a/aaa_helpers.txt b/aaa_helpers.txt index 32abb84..acc33f2 100644 --- a/aaa_helpers.txt +++ b/aaa_helpers.txt @@ -1,4 +1,4 @@ -nohup python cvae.py --name="lhunor_weights_test_6" > nohup/iccv/weights_test_6.out 2>&1 & +nohup python cvae.py --name="lhunor_weights_test_10_2" > nohup/iccv/weights_test_10_2.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 calculate_error.py --name iccv_weights_test_6 > nohup/iccv/error_iccv_weights_test_6.out 2>&1 & diff --git a/configs/config_abl_all_post.py b/configs/config_abl_all_post.py index cdc6a48..4be38f2 100644 --- a/configs/config_abl_all_post.py +++ b/configs/config_abl_all_post.py @@ -19,13 +19,13 @@ 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'] = '5' -config['name'] = 'iccv_weights_test_11' -config['notes'] = 'smaller weight loss coeff, 1e-6, convolutional weight learning, add gnn but smaller and remove softmac from weights convnext' +config['gpu'] = '6' +config['name'] = 'iccv_weights_test_10_3' +config['notes'] = 'smaller weight loss coeff, 1e-6, convolutional weight learning, add gnn but smaller, same as 10 but training from zero and no avg garment' -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']: - assert (config['use_offsets'] and config['avg_garment_path'] != '') or (not config['use_offsets'] and config['avg_garment_path'] == '') +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']: +# 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 diff --git a/convnext/models/convnext_tf.py b/convnext/models/convnext_tf.py index c8999cf..e2e7e8c 100644 --- a/convnext/models/convnext_tf.py +++ b/convnext/models/convnext_tf.py @@ -258,8 +258,8 @@ class ConvNeXtReverse(tf.keras.Model): if not learn_weights: self.last = Dense(3, activation='tanh') else: - # self.last = Activation('softmax') - self.last = lambda x, training: x + self.last = Activation('softmax') + # self.last = lambda x, training: x # self.last = Dense(24, activation='softmax')