From 5557ac90c43a99c187c8aec6f7719f0136db1fe8 Mon Sep 17 00:00:00 2001 From: Michiel van der Meer Date: Tue, 30 Aug 2022 18:43:58 +0200 Subject: [PATCH 1/2] Fix left-over debug pdb command --- CollaborativeBuilding/builder/model.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/CollaborativeBuilding/builder/model.py b/CollaborativeBuilding/builder/model.py index eb209b0..f172490 100644 --- a/CollaborativeBuilding/builder/model.py +++ b/CollaborativeBuilding/builder/model.py @@ -4,7 +4,6 @@ import torch.nn.functional as F from torch.nn.utils.rnn import pack_padded_sequence, pad_packed_sequence from builder.dataloader_with_glove import BuilderDataset, RawInputs -import pdb sys.path.append('..') from utils import * @@ -27,7 +26,6 @@ def __init__(self, config, vocabulary): def forward(self, encoder_inputs, grid_repr_inputs, action_repr_inputs, label, location_mask=None, raw_input=None, dataset=None): dialogue_repr = self.encoder(encoder_inputs) - pdb.set_trace() loss, acc, predicted_seq = self.decoder(dialogue_repr, grid_repr_inputs, action_repr_inputs, label, location_mask, raw_input, dataset) return loss, acc, predicted_seq From 9890c4650289a55d5fdec23eaf9684fa809b7551 Mon Sep 17 00:00:00 2001 From: Michiel van der Meer Date: Mon, 5 Sep 2022 11:03:14 +0000 Subject: [PATCH 2/2] Fixed saving only best model and train for only 20 epochs max --- CollaborativeBuilding/builder/config.json | 2 +- CollaborativeBuilding/train.py | 6 +++--- CollaborativeBuilding/train_collab.sh | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100755 CollaborativeBuilding/train_collab.sh diff --git a/CollaborativeBuilding/builder/config.json b/CollaborativeBuilding/builder/config.json index f68da03..070b06e 100644 --- a/CollaborativeBuilding/builder/config.json +++ b/CollaborativeBuilding/builder/config.json @@ -2,7 +2,7 @@ "seed": 0, "train_config": { "batch_size": 50, - "num_epochs": 50, + "num_epochs": 20, "warm_up_steps": 1, "warm_up_factor": 0.1, "beta1": 0.9, diff --git a/CollaborativeBuilding/train.py b/CollaborativeBuilding/train.py index f3f0b67..ffd8ebf 100644 --- a/CollaborativeBuilding/train.py +++ b/CollaborativeBuilding/train.py @@ -114,6 +114,7 @@ def main(args, config): json.dump(config, f) optimizer = optim.Adam(model.parameters(), lr=train_config["lr"], betas=(train_config["beta1"], train_config["beta2"])) + max_f1 = 0 for epoch in range(train_config['num_epochs']): print("Training...") @@ -150,16 +151,15 @@ def main(args, config): total_actions += len(labels) train_loss = train_loss / len(train_items) - + print('Train | Loss: {}'.format(train_loss)) print('Train | Location Acc: {}, Action Type Acc: {}, Color Acc: {}'.format(total_location_correct/total_location, total_action_type_correct/total_actions, total_color_correct/total_color)) - f_output.write('Epoch {}\n'.format(epoch)) + f_output.write('Epoch {}\n'.format(epoch)) f_output.write('Train | Loss: {}\n'.format(train_loss)) f_output.write('Train | Location Acc: {}, Action Type Acc: {}, Color Acc: {}\n'.format(total_location_correct/total_actions, total_action_type_correct/total_actions, total_color_correct/total_color)) model.eval() valid_loss = 0 - max_f1 = 0 valid_pred_seqs = [] valid_raw_inputs = [] diff --git a/CollaborativeBuilding/train_collab.sh b/CollaborativeBuilding/train_collab.sh new file mode 100755 index 0000000..efcd6fa --- /dev/null +++ b/CollaborativeBuilding/train_collab.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +python3 train.py --json_data_dir builder_data_with_glove --saved_models_path saved_models_$1 --seed $1 \ No newline at end of file