Skip to content

WIP: Use NumPy's fromfile and tofile #494

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

Closed
jakirkham wants to merge 2 commits into from
Closed

WIP: Use NumPy's fromfile and tofile #494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3768f6
Use NumPy's `fromfile` and `tofile`
jakirkham Oct 28, 2019
fbc91df
Let NumPy handle opening/closing files
jakirkham Oct 28, 2019
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
8 changes: 4 additions & 4 deletions zarr/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
from threading import Lock, RLock
import uuid

import numpy

from numcodecs.compat import ensure_bytes, ensure_contiguous_ndarray
from numcodecs.registry import codec_registry

Expand Down Expand Up @@ -740,8 +742,7 @@ def __init__(self, path):
def __getitem__(self, key):
filepath = os.path.join(self.path, key)
if os.path.isfile(filepath):
with open(filepath, 'rb') as f:
return f.read()
return numpy.fromfile(filepath, dtype='u1')
else:
raise KeyError(key)

Expand Down Expand Up @@ -773,8 +774,7 @@ def __setitem__(self, key, value):
temp_name = file_name + '.' + uuid.uuid4().hex + '.partial'
temp_path = os.path.join(dir_path, temp_name)
try:
with open(temp_path, mode='wb') as f:
f.write(value)
value.tofile(temp_path)

# move temporary file into place
replace(temp_path, file_path)
Expand Down