Skip to content

Expandusr (fixed mistakes) #224

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
merged 3 commits into from
Aug 15, 2017
Merged

Expandusr (fixed mistakes) #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a52d76
enable ~ expression in datasets
moskomule Jun 11, 2017
77a0cee
Merge remote-tracking branch 'upstream/master' into expandusr
moskomule Aug 13, 2017
b7576b1
fixed root in __init__ to self.root
moskomule Aug 13, 2017
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
4 changes: 2 additions & 2 deletions torchvision/datasets/cifar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(self, root, train=True,
self.train_labels = []
for fentry in self.train_list:
f = fentry[0]
file = os.path.join(root, self.base_folder, f)
file = os.path.join(self.root, self.base_folder, f)
fo = open(file, 'rb')
if sys.version_info[0] == 2:
entry = pickle.load(fo)
Expand All @@ -86,7 +86,7 @@ def __init__(self, root, train=True,
self.train_data = self.train_data.transpose((0, 2, 3, 1)) # convert to HWC
else:
f = self.test_list[0][0]
file = os.path.join(root, self.base_folder, f)
file = os.path.join(self.root, self.base_folder, f)
fo = open(file, 'rb')
if sys.version_info[0] == 2:
entry = pickle.load(fo)
Expand Down
4 changes: 2 additions & 2 deletions torchvision/datasets/mnist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ def __init__(self, root, train=True, transform=None, target_transform=None, down

if self.train:
self.train_data, self.train_labels = torch.load(
os.path.join(root, self.processed_folder, self.training_file))
os.path.join(self.root, self.processed_folder, self.training_file))
else:
self.test_data, self.test_labels = torch.load(os.path.join(root, self.processed_folder, self.test_file))
self.test_data, self.test_labels = torch.load(os.path.join(self.root, self.processed_folder, self.test_file))

def __getitem__(self, index):
"""
Expand Down
6 changes: 3 additions & 3 deletions torchvision/datasets/phototour.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ class PhotoTour(data.Dataset):
def __init__(self, root, name, train=True, transform=None, download=False):
self.root = os.path.expanduser(root)
self.name = name
self.data_dir = os.path.join(root, name)
self.data_down = os.path.join(root, '{}.zip'.format(name))
self.data_file = os.path.join(root, '{}.pt'.format(name))
self.data_dir = os.path.join(self.root, name)
self.data_down = os.path.join(self.root, '{}.zip'.format(name))
self.data_file = os.path.join(self.root, '{}.pt'.format(name))

self.train = train
self.transform = transform
Expand Down
2 changes: 1 addition & 1 deletion torchvision/datasets/stl10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __init__(self, root, split='train',
self.test_list[0][0], self.test_list[1][0])

class_file = os.path.join(
root, self.base_folder, self.class_names_file)
self.root, self.base_folder, self.class_names_file)
if os.path.isfile(class_file):
with open(class_file) as f:
self.classes = f.read().splitlines()
Expand Down
2 changes: 1 addition & 1 deletion torchvision/datasets/svhn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def __init__(self, root, split='train',
import scipy.io as sio

# reading(loading) mat file as array
loaded_mat = sio.loadmat(os.path.join(root, self.filename))
loaded_mat = sio.loadmat(os.path.join(self.root, self.filename))

self.data = loaded_mat['X']
self.labels = loaded_mat['y']
Expand Down