Skip to content
Snippets Groups Projects
Commit 2cda896b authored by Léo Schneider's avatar Léo Schneider
Browse files

output args

parent 163eb002
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ def load_args(): ...@@ -23,6 +23,7 @@ def load_args():
parser.add_argument('--dataset_train', type=str, default='database/data_DIA_ISA_55_train.pkl') parser.add_argument('--dataset_train', type=str, default='database/data_DIA_ISA_55_train.pkl')
parser.add_argument('--dataset_val', type=str, default='database/data_DIA_ISA_55_test.pkl') parser.add_argument('--dataset_val', type=str, default='database/data_DIA_ISA_55_test.pkl')
parser.add_argument('--dataset_test', type=str, default='database/data_DIA_ISA_55_test.pkl') parser.add_argument('--dataset_test', type=str, default='database/data_DIA_ISA_55_test.pkl')
parser.add_argument('--output', type=str, default='output/out.csv')
parser.add_argument('--norm_first', action=argparse.BooleanOptionalAction) parser.add_argument('--norm_first', action=argparse.BooleanOptionalAction)
parser.add_argument('--activation', type=str,default='relu') parser.add_argument('--activation', type=str,default='relu')
args = parser.parse_args() args = parser.parse_args()
......
...@@ -174,7 +174,7 @@ def eval(model, data_val, epoch, criterion_rt, criterion_intensity, metric_rt, m ...@@ -174,7 +174,7 @@ def eval(model, data_val, epoch, criterion_rt, criterion_intensity, metric_rt, m
def run(epochs, eval_inter, save_inter, model, data_train, data_val, data_test, optimizer, criterion_rt, def run(epochs, eval_inter, save_inter, model, data_train, data_val, data_test, optimizer, criterion_rt,
criterion_intensity, metric_rt, metric_intensity, forward, wandb=None): criterion_intensity, metric_rt, metric_intensity, forward, wandb=None, output='output/out.csv'):
for e in range(1, epochs + 1): for e in range(1, epochs + 1):
train(model, data_train, e, optimizer, criterion_rt, criterion_intensity, metric_rt, metric_intensity, forward, train(model, data_train, e, optimizer, criterion_rt, criterion_intensity, metric_rt, metric_intensity, forward,
wandb=wandb) wandb=wandb)
...@@ -183,7 +183,7 @@ def run(epochs, eval_inter, save_inter, model, data_train, data_val, data_test, ...@@ -183,7 +183,7 @@ def run(epochs, eval_inter, save_inter, model, data_train, data_val, data_test,
wandb=wandb) wandb=wandb)
if e % save_inter == 0: if e % save_inter == 0:
save(model, 'model_common_' + str(e) + '.pt') save(model, 'model_common_' + str(e) + '.pt')
save_pred(model, data_val, forward, 'output/out.csv') save_pred(model, data_val, forward, output)
def main(args): def main(args):
...@@ -221,7 +221,7 @@ def main(args): ...@@ -221,7 +221,7 @@ def main(args):
run(epochs=args.epochs, eval_inter=args.eval_inter, save_inter=args.save_inter, model=model, data_train=data_train, run(epochs=args.epochs, eval_inter=args.eval_inter, save_inter=args.save_inter, model=model, data_train=data_train,
data_val=data_val, data_test=data_test, optimizer=optimizer, criterion_rt=torch.nn.MSELoss(), data_val=data_val, data_test=data_test, optimizer=optimizer, criterion_rt=torch.nn.MSELoss(),
criterion_intensity=masked_cos_sim, metric_rt=distance, metric_intensity=masked_spectral_angle, criterion_intensity=masked_cos_sim, metric_rt=distance, metric_intensity=masked_spectral_angle,
wandb=args.wandb, forward=args.forward) wandb=args.wandb, forward=args.forward, output=args.output)
if args.wandb is not None: if args.wandb is not None:
wdb.finish() wdb.finish()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment