Modifs dist_dataugv3 (-copy/+rapide) + Legere modif TF

This commit is contained in:
Harle, Antoine (Contracteur) 2020-01-15 16:55:03 -05:00
parent e291bc2e44
commit 75901b69b4
6 changed files with 198 additions and 83 deletions

View file

@ -19,8 +19,8 @@ tf_names = [
'Color',
'Brightness',
'Sharpness',
#'Posterize',
#'Solarize', #=>Image entre [0,1] #Pas opti pour des batch
'Posterize',
'Solarize', #=>Image entre [0,1] #Pas opti pour des batch
#Color TF (Common mag scale)
#'+Contrast',
@ -67,7 +67,7 @@ if __name__ == "__main__":
'aug_model'
}
n_inner_iter = 1
epochs = 100
epochs = 15
dataug_epoch_start=0
optim_param={
'Meta':{
@ -81,11 +81,13 @@ if __name__ == "__main__":
}
}
model = LeNet(3,10)
#model = LeNet(3,10)
#model = MobileNetV2(num_classes=10)
#model = ResNet(num_classes=10)
model = ResNet(num_classes=10)
#model = WideResNet(num_classes=10, wrn_size=32)
model = Higher_model(model) #run_dist_dataugV3
#### Classic ####
if 'classic' in tasks:
t0 = time.process_time()
@ -172,12 +174,12 @@ if __name__ == "__main__":
#aug_model = Augmented_model(RandAug(TF_dict=tf_dict, N_TF=2), model).to(device)
print("{} on {} for {} epochs - {} inner_it".format(str(aug_model), device_name, epochs, n_inner_iter))
log= run_dist_dataugV2(model=aug_model,
log= run_dist_dataugV3(model=aug_model,
epochs=epochs,
inner_it=n_inner_iter,
dataug_epoch_start=dataug_epoch_start,
opt_param=optim_param,
print_freq=10,
print_freq=1,
KLdiv=True,
loss_patience=None)
@ -187,7 +189,7 @@ if __name__ == "__main__":
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, "Device": device_name, "Param_names": aug_model.TF_names(), "Log": log}
print(str(aug_model),": acc", out["Accuracy"], "in:", out["Time"][0], "+/-", out["Time"][1])
filename = "{}-{} epochs (dataug:{})- {} in_it".format(str(aug_model),epochs,dataug_epoch_start,n_inner_iter)+"demi_mag"
filename = "{}-{} epochs (dataug:{})- {} in_it".format(str(aug_model),epochs,dataug_epoch_start,n_inner_iter)#+"demi_mag"
with open("res/log/%s.json" % filename, "w+") as f:
json.dump(out, f, indent=True)
print('Log :\"',f.name, '\" saved !')