调整evaluation封装

This commit is contained in:
zhiyang7 2021-12-24 17:44:30 +08:00
parent f12e051100
commit bea0624a1e
1 changed files with 34 additions and 24 deletions

View File

@ -1,5 +1,6 @@
import os
import argparse
from pickle import FALSE
from douzero.evaluation.simulation import evaluate
@ -67,35 +68,44 @@ if __name__ == '__main__':
os.environ['KMP_DUPLICATE_LIB_OK'] = 'True'
os.environ["CUDA_VISIBLE_DEVICES"] = args.gpu_device
eval_list = [
{
'landlord': {'folder': 'baselines', 'prefix': 'resnet', 'frame': 119822400},
'farmer': {'folder': 'baselines', 'prefix': 'resnet', 'frame': 119822400},
'two_way': False
},
{
'farmer': { 'folder': 'baselines', 'prefix': 'legacy_general', 'frame': 143539200},
'landlord': { 'folder': 'baselines', 'prefix': 'resnet', 'frame': 119822400},
'two_way': True
},
# {
# 'landlord': {'folder': 'baselines', 'prefix': 'resnet', 'frame': 11534400},
# 'farmer': {'folder': 'baselines', 'prefix': 'resnet', 'frame': 11534400},
# 'two_way': False
# },
# {
# 'landlord': {'folder': 'baselines', 'prefix': 'legacy_resnet', 'frame': 11754400},
# 'farmer': {'folder': 'baselines', 'prefix': 'legacy_resnet', 'frame': 11754400},
# 'two_way': False
# },
# {
# 'landlord': {'folder': 'baselines', 'prefix': 'legacy_resnet', 'frame': 11754400},
# 'farmer': {'folder': 'baselines', 'prefix': 'resnet', 'frame': 11534400},
# 'two_way': True
# },
baselines = [
{'folder': 'baselines', 'prefix': 'legacy_general', 'frame': 736107200},
{'folder': 'baselines', 'prefix': 'legacy_general', 'frame': 479412800},
{'folder': 'baselines', 'prefix': 'legacy_general', 'frame': 262529600},
{'folder': 'baselines', 'prefix': 'legacy_general', 'frame': 143539200},
]
evaluations = [
{'folder': 'baselines', 'prefix': 'lite_general', 'frame': 299457600},
{'folder': 'baselines', 'prefix': 'lite_resnet', 'frame': 124064400},
]
for vs in reversed(eval_list):
eval_list = [
{
'farmer': baseline,
'landlord': evaluation,
'two_way': True
}
for evaluation in evaluations for baseline in baselines
]
eval_list.append([
{
'farmer': evaluation,
'landlord': evaluation,
'two_way': False
}
for evaluation in evaluations
])
# eval_list = [
# {
# 'farmer': { 'folder': 'baselines', 'prefix': 'lite_general', 'frame': 221553600},
# 'landlord': { 'folder': 'baselines', 'prefix': 'lite_resnet', 'frame': 102494400},
# 'two_way': False
# },
# ]
for vs in eval_list:
make_evaluate(args, vs)
if vs['two_way']:
vs['landlord_bak'] = vs['landlord']