diff --git a/torchvision/datasets/cifar.py b/torchvision/datasets/cifar.py index d7f88882028..c4d4cad350e 100644 --- a/torchvision/datasets/cifar.py +++ b/torchvision/datasets/cifar.py @@ -49,7 +49,10 @@ def __init__(self, root, train=True, transform=None, target_transform=None, down f = fentry[0] file = os.path.join(root, self.base_folder, f) fo = open(file, 'rb') - entry = pickle.load(fo) + if sys.version_info[0] == 2: + entry = pickle.load(fo) + else: + entry = pickle.load(fo, encoding='latin1') self.train_data.append(entry['data']) if 'labels' in entry: self.train_labels += entry['labels'] diff --git a/torchvision/datasets/lsun.py b/torchvision/datasets/lsun.py index b2be658af2b..748dd3b3672 100644 --- a/torchvision/datasets/lsun.py +++ b/torchvision/datasets/lsun.py @@ -71,7 +71,7 @@ def __init__(self, db_path, classes='train', for c in classes: c_short = c.split('_') c_short.pop(len(c_short) - 1) - c_short = string.join(c_short, '_') + c_short = '_'.join(c_short) if c_short not in categories: raise(ValueError('Unknown LSUN class: ' + c_short + '.'\ 'Options are: ' + str(categories))) diff --git a/torchvision/utils.py b/torchvision/utils.py index 75579492a80..e6921c2b537 100644 --- a/torchvision/utils.py +++ b/torchvision/utils.py @@ -28,8 +28,8 @@ def make_grid(tensor, nrow=8, padding=2): for x in range(xmaps): if k >= nmaps: break - grid.narrow(1, y*height+1+padding/2,height-padding)\ - .narrow(2, x*width+1+padding/2, width-padding)\ + grid.narrow(1, y*height+1+padding//2,height-padding)\ + .narrow(2, x*width+1+padding//2, width-padding)\ .copy_(tensor[k]) k = k + 1 return grid