Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions dataset/cifar100.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,7 @@ class CIFAR100Instance(datasets.CIFAR100):
"""CIFAR100Instance Dataset.
"""
def __getitem__(self, index):
if self.train:
img, target = self.train_data[index], self.train_labels[index]
else:
img, target = self.test_data[index], self.test_labels[index]

# doing this so that it is consistent with all other datasets
# to return a PIL Image
img = Image.fromarray(img)

if self.transform is not None:
img = self.transform(img)

if self.target_transform is not None:
target = self.target_transform(target)

img, target = super().__getitem__(index)
return img, target, index


Expand Down
8 changes: 1 addition & 7 deletions dataset/imagenet.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@ def __getitem__(self, index):
Returns:
tuple: (image, target) where target is class_index of the target class.
"""
path, target = self.imgs[index]
img = self.loader(path)
if self.transform is not None:
img = self.transform(img)
if self.target_transform is not None:
target = self.target_transform(target)

img, target = super().__getitem__(index)
return img, target, index


Expand Down
2 changes: 1 addition & 1 deletion helper/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def accuracy(output, target, topk=(1,)):

res = []
for k in topk:
correct_k = correct[:k].view(-1).float().sum(0, keepdim=True)
correct_k = correct[:k].contiguous().view(-1).float().sum(0, keepdim=True)
res.append(correct_k.mul_(100.0 / batch_size))
return res

Expand Down