Skip to content

Remove hard file offset reset in load() #3695

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
soumith merged 5 commits into from
Nov 17, 2017
Merged

Remove hard file offset reset in load() #3695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1d03d8
improved file offset logic
philippslang Nov 14, 2017
e375906
load offset test
philippslang Nov 14, 2017
dd80e27
whitespace
philippslang Nov 14, 2017
b3c9857
needless exception handling
philippslang Nov 14, 2017
e95e2b8
test integer in binary
philippslang Nov 14, 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
13 changes: 13 additions & 0 deletions test/test_torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import tempfile
import unittest
import warnings
import pickle
from torch.utils.dlpack import from_dlpack, to_dlpack
from itertools import product, combinations
from common import TestCase, iter_indices, TEST_NUMPY, run_tests, download_file, skipIfNoLapack, \
Expand Down Expand Up @@ -4134,6 +4135,18 @@ def test_serialization(self):
rootview = c[8]
self.assertEqual(rootview.data_ptr(), c[0].data_ptr())

def test_serialization_offset(self):
a = torch.randn(5, 5)
i = 41
with tempfile.TemporaryFile() as f:
pickle.dump(i, f)
torch.save(a, f)
f.seek(0)
j = pickle.load(f)
b = torch.load(f)
self.assertTrue(torch.equal(a, b))
self.assertEqual(i, j)

def test_half_tensor(self):
x = torch.randn(5, 5).float()
y = torch.randn(5, 5).float()
Expand Down
14 changes: 8 additions & 6 deletions torch/serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,15 @@ def persistent_load(saved_id):
else:
raise RuntimeError("Unknown saved id type: %s" % saved_id[0])

# try the legacy loader first, which only works if f is a tarfile
try:
return legacy_load(f)
except tarfile.TarError:
pass
foffset = f.tell()
if foffset == 0:
# only if offset is zero we can attempt the legacy tar file loader
try:
return legacy_load(f)
except tarfile.TarError:
# if not a tarfile, reset file offset and proceed
f.seek(foffset)

f.seek(0)
magic_number = pickle_module.load(f)
if magic_number != MAGIC_NUMBER:
raise RuntimeError("Invalid magic number; corrupt file?")
Expand Down