Skip to content

fix cifar label dimension #33475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heavengate merged 1 commit into from
Jun 10, 2021
Merged

fix cifar label dimension #33475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions python/paddle/tests/test_dataset_cifar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 9)


Expand All @@ -49,6 +51,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 9)

# test cv2 backend
Expand All @@ -63,6 +67,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 99)

with self.assertRaises(ValueError):
Expand All @@ -83,6 +89,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 99)


Expand All @@ -100,6 +108,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 99)

# test cv2 backend
Expand All @@ -114,6 +124,8 @@ def test_main(self):
self.assertTrue(data.shape[2] == 3)
self.assertTrue(data.shape[1] == 32)
self.assertTrue(data.shape[0] == 32)
self.assertTrue(len(label.shape) == 1)
self.assertTrue(label.shape[0] == 1)
self.assertTrue(0 <= int(label) <= 99)

with self.assertRaises(ValueError):
Expand Down
7 changes: 4 additions & 3 deletions python/paddle/vision/datasets/cifar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ def _load_data(self):
six.b('labels'), batch.get(six.b('fine_labels'), None))
assert labels is not None
for sample, label in six.moves.zip(data, labels):
self.data.append((sample, label))
self.data.append((sample,
np.array([label]).astype('int64')))

def __getitem__(self, idx):
image, label = self.data[idx]
Expand All @@ -164,9 +165,9 @@ def __getitem__(self, idx):
image = self.transform(image)

if self.backend == 'pil':
return image, np.array(label).astype('int64')
return image, label.astype('int64')

return image.astype(self.dtype), np.array(label).astype('int64')
return image.astype(self.dtype), label.astype('int64')

def __len__(self):
return len(self.data)
Expand Down