diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/convert.c | 13 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 13 |
2 files changed, 23 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c index aae0cd5ce..1a87234ce 100644 --- a/numpy/core/src/multiarray/convert.c +++ b/numpy/core/src/multiarray/convert.c @@ -44,10 +44,21 @@ npy_fallocate(npy_intp nbytes, FILE * fp) if (nbytes < 16 * 1024 * 1024) { return 0; } + /* btrfs can take a while to allocate making release worthwhile */ NPY_BEGIN_ALLOW_THREADS; - r = fallocate(fileno(fp), 0, npy_ftell(fp), nbytes); + /* + * flush in case there might be some unexpected interactions between the + * fallocate call and unwritten data in the descriptor + */ + fflush(fp); + /* + * the flag "1" (=FALLOC_FL_KEEP_SIZE) is needed for the case of files + * opened in append mode (issue #8329) + */ + r = fallocate(fileno(fp), 1, npy_ftell(fp), nbytes); NPY_END_ALLOW_THREADS; + /* * early exit on no space, other errors will also get found during fwrite */ diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index 1b312ee1f..5dd790fce 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -3861,6 +3861,15 @@ class TestIO(object): f.seek(d.nbytes) d.tofile(f) assert_equal(os.path.getsize(self.filename), d.nbytes * 2) + # check append mode (gh-8329) + open(self.filename, "w").close() # delete file contents + with open(self.filename, "ab") as f: + d.tofile(f) + assert_array_equal(d, np.fromfile(self.filename)) + with open(self.filename, "ab") as f: + d.tofile(f) + assert_equal(os.path.getsize(self.filename), d.nbytes * 2) + def test_file_position_after_fromfile(self): # gh-4118 @@ -4124,7 +4133,7 @@ class TestResize(TestCase): x = np.eye(3) if IS_PYPY: x.resize(3, refcheck=False) - else: + else: x.resize(3) assert_array_equal(x, np.eye(3)[0,:]) @@ -4153,7 +4162,7 @@ class TestResize(TestCase): x = np.eye(3) if IS_PYPY: x.resize(2, 3, 3, refcheck=False) - else: + else: x.resize(2, 3, 3) assert_array_equal(x[0], np.eye(3)) assert_array_equal(x[1], np.zeros((3, 3))) |