Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Max Ehrlich
cdcnn
Commits
e29753b4
Verified
Commit
e29753b4
authored
Dec 04, 2018
by
Max Ehrlich
Browse files
Fix bugs in jpeg data loading
parent
3b8e93f7
Changes
4
Hide whitespace changes
Inline
Side-by-side
data/__init__.py
View file @
e29753b4
from
.datasets
import
*
\ No newline at end of file
data/datasets.py
View file @
e29753b4
import
torch
from
torchvision
import
datasets
,
transforms
from
jpeg_dataset
import
JpegDataset
from
.
jpeg_dataset
import
JpegDataset
def
spatial_data
(
batch_size
,
root
,
name
,
dataset
,
transform
,
shuffle_train
):
...
...
@@ -64,3 +64,31 @@ def cifar10_jpeg(batch_size, root, shuffle_train=True):
def
cifar100_jpeg
(
batch_size
,
root
,
shuffle_train
=
True
):
directory
=
'{}/{}'
.
format
(
root
,
'CIFAR100'
)
return
jpeg_data
(
batch_size
,
directory
,
shuffle_train
)
spatial_dataset_map
=
{
'MNIST'
:
mnist_spatial
,
'CIFAR10'
:
cifar10_spatial
,
'CIFAR100'
:
cifar100_spatial
}
jpeg_dataset_map
=
{
'MNIST'
:
mnist_jpeg
,
'CIFAR10'
:
cifar10_jpeg
,
'CIFAR100'
:
cifar100_jpeg
}
dataset_info
=
{
'MNIST'
:
{
'channels'
:
1
,
'classes'
:
10
},
'CIFAR10'
:
{
'channels'
:
3
,
'classes'
:
10
},
'CIFAR100'
:
{
'channels'
:
3
,
'classes'
:
100
,
}
}
data/jpeg_dataset.py
View file @
e29753b4
import
torch
from
jpeg_readwrite
import
load_jpeg
from
.
jpeg_readwrite
import
load_jpeg
class
JpegDataset
(
torch
.
utils
.
data
.
Dataset
):
...
...
@@ -10,4 +10,4 @@ class JpegDataset(torch.utils.data.Dataset):
return
self
.
data
.
shape
[
0
]
def
__getitem__
(
self
,
idx
):
return
self
.
data
set
[
idx
],
self
.
labels
[
idx
]
return
self
.
data
[
idx
],
self
.
labels
[
idx
]
data/jpeg_readwrite.py
View file @
e29753b4
...
...
@@ -13,10 +13,9 @@ def write_jpeg(data, labels, directory, fname):
def
load_jpeg
(
directory
,
fname
):
path
=
'{}/{}'
.
format
(
directory
,
fname
)
with
open
(
path
)
as
f
:
with
open
(
path
,
'rb'
)
as
f
:
dl
=
np
.
load
(
f
)
data
=
dl
[
'data'
]
labels
=
dl
[
'labels'
]
data
=
dl
[
'data'
]
label
=
dl
[
'label'
]
return
torch
.
Tensor
(
data
),
torch
.
Tensor
(
label
)
return
torch
.
Tensor
(
data
),
torch
.
Tensor
(
labels
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment