Skip to content

Commit 38fbc5b

Browse files
authored
Merge pull request #8 from mirrorboat/main
fix bug for gen image eval
2 parents e52d16a + 88a1cd8 commit 38fbc5b

19 files changed

+136
-110
lines changed

configs/eval/gen_image.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
model_cache_path: '../ckpt' # Path to cache models
2+
num_workers: 2
3+
dependencies: [image]
4+
5+
# data:
6+
# image:
7+
# meta_data_path: "demos/image_eval/image.json"
8+
# data_path: "demos/image_eval/images"
9+
# ref_meta_data_path: "demos/image_eval/image_copy.json"
10+
# ref_data_path: "demos/image_eval/images"
11+
# image_key: 'image'
12+
# formatter: 'GenImageFormatter'
13+
14+
data:
15+
image:
16+
meta_data_path: "demos/image_eval/gen_image.json"
17+
data_path: "demos/image_eval/gen_images"
18+
ref_meta_data_path: "demos/image_eval/ref_image.json"
19+
ref_data_path: "demos/image_eval/images"
20+
image_key: 'image'
21+
formatter: 'GenImageFormatter'
22+
23+
scorers:
24+
ISScorer:
25+
batch_size: 32
26+
device: cpu
27+
dims: 2048
28+
resize: True
29+
splits: 10
30+
KIDScorer:
31+
batch_size: 50
32+
num_workers: 8
33+
dims: 2048
34+
device: cpu
35+
model: inception

configs/eval/gen_image_example.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

configs/eval/gen_image_new.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

configs/eval/image_eval.yaml

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ dependencies: [image]
44

55
data:
66
image:
7-
meta_data_path: "../data/image_data.json"
8-
data_path: "../data/images"
9-
ref_meta_data_path: "../data/data4IS2.jsonl"
10-
ref_data_path: "../data/synth_challenge"
7+
meta_data_path: "demos/image_eval/image.json"
8+
data_path: "demos/image_eval/images"
119
image_key: 'image'
1210
id_key: 'id'
1311
formatter: 'PureImageFormatter'
@@ -16,58 +14,58 @@ scorers:
1614
LiqeScorer:
1715
batch_size: 2
1816
device: "cuda"
19-
ArniqaScorer:
20-
batch_size: 2
21-
device: "cuda"
22-
TopiqScorer:
23-
batch_size: 2
24-
device: "cuda"
25-
ClipiqaScorer:
26-
batch_size: 2
27-
device: "cuda"
28-
QalignScorer:
29-
batch_size: 2
30-
device: "cuda"
31-
ManiqaScorer:
32-
batch_size: 2
33-
device: "cuda"
34-
MusiqScorer:
35-
batch_size: 2
36-
device: "cuda"
37-
DbcnnScorer:
38-
batch_size: 2
39-
device: "cuda"
40-
Pqa2piqScorer:
41-
batch_size: 2
42-
device: "cuda"
43-
HyperiqaScorer:
44-
batch_size: 2
45-
device: "cuda"
46-
NimaScorer:
47-
batch_size: 2
48-
device: "cuda"
49-
WadiqamScoreer:
50-
batch_size: 2
51-
device: "cuda"
52-
CnniqaScorer:
53-
batch_size: 2
54-
device: "cuda"
55-
NrqmScoreer:
56-
batch_size: 2
57-
device: "cuda"
58-
PiScorer:
59-
batch_size: 2
60-
device: "cuda"
61-
BrisqueScorer:
62-
batch_size: 2
63-
device: "cuda"
64-
IlniqeScorer:
65-
batch_size: 2
66-
device: "cuda"
67-
NiqeScorer:
68-
batch_size: 2
69-
device: "cuda"
70-
PiqeScorer:
71-
batch_size: 2
72-
device: "cuda"
17+
# ArniqaScorer:
18+
# batch_size: 2
19+
# device: "cuda"
20+
# TopiqScorer:
21+
# batch_size: 2
22+
# device: "cuda"
23+
# ClipiqaScorer:
24+
# batch_size: 2
25+
# device: "cuda"
26+
# QalignScorer:
27+
# batch_size: 2
28+
# device: "cuda"
29+
# ManiqaScorer:
30+
# batch_size: 2
31+
# device: "cuda"
32+
# MusiqScorer:
33+
# batch_size: 2
34+
# device: "cuda"
35+
# DbcnnScorer:
36+
# batch_size: 2
37+
# device: "cuda"
38+
# Pqa2piqScorer:
39+
# batch_size: 2
40+
# device: "cuda"
41+
# HyperiqaScorer:
42+
# batch_size: 2
43+
# device: "cuda"
44+
# NimaScorer:
45+
# batch_size: 2
46+
# device: "cuda"
47+
# WadiqamScoreer:
48+
# batch_size: 2
49+
# device: "cuda"
50+
# CnniqaScorer:
51+
# batch_size: 2
52+
# device: "cuda"
53+
# NrqmScoreer:
54+
# batch_size: 2
55+
# device: "cuda"
56+
# PiScorer:
57+
# batch_size: 2
58+
# device: "cuda"
59+
# BrisqueScorer:
60+
# batch_size: 2
61+
# device: "cuda"
62+
# IlniqeScorer:
63+
# batch_size: 2
64+
# device: "cuda"
65+
# NiqeScorer:
66+
# batch_size: 2
67+
# device: "cuda"
68+
# PiqeScorer:
69+
# batch_size: 2
70+
# device: "cuda"
7371

dataflow/Eval/image/is_scorer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def inception_score(self, sample, device, batch_size=32, resize=False, splits=1)
5656

5757
# Load inception model
5858
inception_model = inception_v3(pretrained=True, transform_input=False).type(dtype)
59-
inception_model.eval();
59+
inception_model.eval()
6060
up = nn.Upsample(size=(299, 299), mode='bilinear').type(dtype)
6161

6262
def get_pred(x):

dataflow/Eval/image/kid_scorer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from torch.nn.functional import adaptive_avg_pool2d
1414
import torchvision.transforms as transforms
1515
from dataflow.Eval.image.kid.inception import InceptionV3
16-
from dataflow.Eval.image..kid.lenet import LeNet5
16+
from dataflow.Eval.image.kid.lenet import LeNet5
1717
from PIL import Image
1818
import sys
1919

@@ -125,7 +125,6 @@ def calculate_kid_given_paths(self, sample, ref_sample, batch_size, cuda, dims,
125125
model.load_state_dict(torch.load('./kid/lenet.pth'))
126126
if cuda:
127127
model.cuda()
128-
129128
act_true = self._compute_activations(ref_sample, model, batch_size, dims, cuda, model_type)
130129
results = []
131130
actj = self._compute_activations(sample, model, batch_size, dims, cuda, model_type)

dataflow/core/scorer.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,6 @@ def evaluate(self, dataset):
333333
idx_list = list(range(len(dataset)))
334334
dataset.score_record.item_score[self.__class__.__name__]['Default'][idx_list] = score_list
335335

336-
# assert len(score_list) == len(id_list), "The number of scores and ids should be the same."
337-
# id_score_dict = dict(zip(id_list, score_list))
338-
# return id_score_dict
339-
# dataset.scores_list[self.__class__.__name__] = score_list
340336
return self.__class__.__name__, dataset.score_record.item_score[self.__class__.__name__]
341337

342338
def __call__(self, dataset):
@@ -387,14 +383,13 @@ def evaluate(self, datasets):
387383
else:
388384
ref_dataloader = DataLoader(ref_dataset, batch_size=len(ref_dataset), shuffle=False, num_workers=self.num_workers)
389385
for data, ref_data in zip(dataloader, ref_dataloader):
390-
scores = self.evaluate_batch(data[1], ref_data[1])
386+
scores = self.evaluate_batch(data, ref_data)
391387
if isinstance(scores, torch.Tensor):
392388
scores = scores.cpu().detach().numpy
393389
score_list.append(scores) # list
394390

395-
dataset.score_record.meta_score[self.scorer_name]['Default'] = score_list[0]
396-
# if ref_dataset is not None:
397-
# ref_dataset.meta_score[self.scorer_name] = score_list[0]
391+
dataset.score_record.meta_score[self.scorer_name] = score_list[0][0]
392+
398393
return self.scorer_name, dataset.score_record.meta_score[self.scorer_name]
399394

400395
class VideoScorer(Scorer):

demos/image_eval/gen_image.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[
2+
{
3+
"image": "1e558d58-f53e-422e-9715-19d4c12c093d.png"
4+
},
5+
{
6+
"image": "202a9b83-28e5-4002-9858-64a4cb734f91.png"
7+
},
8+
{
9+
"image": "65250ac7-c2ed-4ed1-b375-0916649c849b.png"
10+
},
11+
{
12+
"image": "d10f73b1-ecff-4562-a3b9-3d2d0fc0b82a.png"
13+
},
14+
{
15+
"image": "bda58b80-f069-45f5-9eb3-5d023fb731ec.png"
16+
},
17+
{
18+
"image": "a34a8f2f-e3f5-42b7-9f18-cad076ad70bb.png"
19+
},
20+
{
21+
"image": "67d2b934-2be9-470b-898e-98251a81e74d.png"
22+
},
23+
{
24+
"image": "1de8c101-7d18-45c9-90ad-6b27bc9b565f.png"
25+
},
26+
{
27+
"image": "cd2eed6b-8aea-40f1-a635-3cb9b4f1f460.png"
28+
},
29+
{
30+
"image": "e5a47fa8-f901-40cb-9f3d-39b048152fe2.png"
31+
}
32+
]
206 KB
Loading
300 KB
Loading

0 commit comments

Comments
 (0)