F1 par classes + plot OK

This commit is contained in:
Harle, Antoine (Contracteur) 2020-02-03 11:21:54 -05:00
parent 3ccacd0366
commit fcd0217d54
5 changed files with 57 additions and 22 deletions

View file

@ -79,7 +79,7 @@ if __name__ == "__main__":
}
#Parameters
n_inner_iter = 1
epochs = 2
epochs = 10
dataug_epoch_start=0
optim_param={
'Meta':{
@ -108,7 +108,7 @@ if __name__ == "__main__":
print("{} on {} for {} epochs".format(model_name, device_name, epochs))
log= train_classic(model=model, opt_param=optim_param, epochs=epochs, print_freq=5)
log= train_classic(model=model, opt_param=optim_param, epochs=epochs, print_freq=1)
#log= train_classic_higher(model=model, epochs=epochs)
exec_time=time.process_time() - t0
@ -116,13 +116,21 @@ if __name__ == "__main__":
print('-'*9)
times = [x["time"] for x in log]
out = {"Accuracy": max([x["acc"] for x in log]), "Time": (np.mean(times),np.std(times), exec_time), 'Optimizer': optim_param['Inner'], "Device": device_name, "Log": log}
print(str(model),": acc", out["Accuracy"], "in:", out["Time"][0], "+/-", out["Time"][1])
print(model_name,": acc", out["Accuracy"], "in:", out["Time"][0], "+/-", out["Time"][1])
filename = "{}-{} epochs".format(model_name,epochs)
with open("../res/log/%s.json" % filename, "w+") as f:
json.dump(out, f, indent=True)
print('Log :\"',f.name, '\" saved !')
try:
json.dump(out, f, indent=True)
print('Log :\"',f.name, '\" saved !')
except:
print("Failed to save logs :",f.name)
print(sys.exc_info()[1])
#plot_res(log, fig_name="../res/"+filename)
try:
plot_resV2(log, fig_name="../res/"+filename)
except:
print("Failed to plot res")
print(sys.exc_info()[1])
print('Execution Time : %.00f '%(exec_time))
print('-'*9)
@ -160,12 +168,12 @@ if __name__ == "__main__":
print('Log :\"',f.name, '\" saved !')
except:
print("Failed to save logs :",f.name)
print(sys.exc_info()[0])
print(sys.exc_info()[1])
try:
plot_resV2(log, fig_name="../res/"+filename, param_names=aug_model.TF_names())
except:
print("Failed to plot res")
print(sys.exc_info()[0])
print(sys.exc_info()[1])
print('Execution Time : %.00f '%(exec_time))
print('-'*9)