Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 6 deletions numcodecs/astype.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ def encode(self, buf):
arr = ensure_ndarray(buf).view(self.decode_dtype)

# convert and copy
enc = arr.astype(self.encode_dtype)

return enc
return arr.astype(self.encode_dtype)

def decode(self, buf, out=None):
# normalise input
Expand All @@ -61,9 +59,7 @@ def decode(self, buf, out=None):
dec = enc.astype(self.decode_dtype)

# handle output
out = ndarray_copy(dec, out)

return out
return ndarray_copy(dec, out)

def get_config(self):
return {
Expand Down
3 changes: 1 addition & 2 deletions numcodecs/base64.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ def encode(self, buf):
# normalise inputs
buf = ensure_contiguous_ndarray(buf)
# do compression
compressed = _base64.standard_b64encode(buf)
return compressed
return _base64.standard_b64encode(buf)

def decode(self, buf, out=None):
# normalise inputs
Expand Down
7 changes: 2 additions & 5 deletions numcodecs/categorize.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,15 @@ def decode(self, buf, out=None):
dec[enc == (i + 1)] = label

# handle output
dec = ndarray_copy(dec, out)

return dec
return ndarray_copy(dec, out)

def get_config(self):
config = {
return {
'id': self.codec_id,
'labels': self.labels,
'dtype': self.dtype.str,
'astype': self.astype.str,
}
return config

def __repr__(self):
# make sure labels part is not too long
Expand Down
4 changes: 1 addition & 3 deletions numcodecs/delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ def decode(self, buf, out=None):
np.cumsum(enc, out=dec)

# handle output
out = ndarray_copy(dec, out)

return out
return ndarray_copy(dec, out)

def get_config(self):
# override to handle encoding dtypes
Expand Down
4 changes: 1 addition & 3 deletions numcodecs/fixedscaleoffset.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ def encode(self, buf):
enc = np.around(enc)

# convert dtype
enc = enc.astype(self.astype, copy=False)

return enc
return enc.astype(self.astype, copy=False)

def decode(self, buf, out=None):
# interpret buffer as numpy array
Expand Down
4 changes: 1 addition & 3 deletions numcodecs/gzip.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ def encode(self, buf):
compressed = io.BytesIO()
with _gzip.GzipFile(fileobj=compressed, mode='wb', compresslevel=self.level) as compressor:
compressor.write(buf)
compressed = compressed.getvalue()

return compressed
return compressed.getvalue()

# noinspection PyMethodMayBeStatic
def decode(self, buf, out=None):
Expand Down
4 changes: 1 addition & 3 deletions numcodecs/quantize.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ def encode(self, buf):
enc = np.around(scale * arr) / scale

# cast dtype
enc = enc.astype(self.astype, copy=False)

return enc
return enc.astype(self.astype, copy=False)

def decode(self, buf, out=None):
# filter is lossy, decoding is no-op
Expand Down
6 changes: 2 additions & 4 deletions numcodecs/tests/test_blosc.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,12 @@ def test_backwards_compatibility():

def _encode_worker(data):
compressor = Blosc(cname='zlib', clevel=9, shuffle=Blosc.SHUFFLE)
enc = compressor.encode(data)
return enc
return compressor.encode(data)


def _decode_worker(enc):
compressor = Blosc()
data = compressor.decode(enc)
return data
return compressor.decode(enc)


@pytest.mark.parametrize('pool', [Pool, ThreadPool])
Expand Down
6 changes: 2 additions & 4 deletions numcodecs/tests/test_shuffle.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,12 @@ def test_eq():

def _encode_worker(data):
compressor = Shuffle()
enc = compressor.encode(data)
return enc
return compressor.encode(data)


def _decode_worker(enc):
compressor = Shuffle()
data = compressor.decode(enc)
return data
return compressor.decode(enc)


@pytest.mark.parametrize('pool', [Pool, ThreadPool])
Expand Down
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ extend-select = [
"PIE",
"PT",
"PYI",
"RET",
"RSE",
"RUF",
"UP",
Expand All @@ -192,6 +193,9 @@ ignore = [
"PT004", # deprecated
"PT005", # deprecated
"PT011",
"PT012",
"RET505",
"RET506",
"RUF001",
"UP007",
"UP027", # deprecated
Expand Down
32 changes: 8 additions & 24 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def blosc_extension():
sources = ['numcodecs/blosc.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.blosc',
sources=sources + blosc_sources,
Expand All @@ -122,8 +122,6 @@ def blosc_extension():
),
]

return extensions


def zstd_extension():
info('setting up Zstandard extension')
Expand Down Expand Up @@ -153,7 +151,7 @@ def zstd_extension():
extra_objects = []

# define extension module
extensions = [
return [
Extension(
'numcodecs.zstd',
sources=sources + zstd_sources,
Expand All @@ -164,8 +162,6 @@ def zstd_extension():
),
]

return extensions


def lz4_extension():
info('setting up LZ4 extension')
Expand All @@ -182,7 +178,7 @@ def lz4_extension():
sources = ['numcodecs/lz4.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.lz4',
sources=sources + lz4_sources,
Expand All @@ -192,8 +188,6 @@ def lz4_extension():
),
]

return extensions


def vlen_extension():
info('setting up vlen extension')
Expand All @@ -209,7 +203,7 @@ def vlen_extension():
sources = ['numcodecs/vlen.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.vlen',
sources=sources,
Expand All @@ -219,8 +213,6 @@ def vlen_extension():
),
]

return extensions


def fletcher_extension():
info('setting up fletcher32 extension')
Expand All @@ -235,7 +227,7 @@ def fletcher_extension():
sources = ['numcodecs/fletcher32.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.fletcher32',
sources=sources,
Expand All @@ -245,8 +237,6 @@ def fletcher_extension():
),
]

return extensions


def jenkins_extension():
info('setting up jenkins extension')
Expand All @@ -261,7 +251,7 @@ def jenkins_extension():
sources = ['numcodecs/jenkins.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.jenkins',
sources=sources,
Expand All @@ -271,8 +261,6 @@ def jenkins_extension():
),
]

return extensions


def compat_extension():
info('setting up compat extension')
Expand All @@ -282,16 +270,14 @@ def compat_extension():
sources = ['numcodecs/compat_ext.pyx']

# define extension module
extensions = [
return [
Extension(
'numcodecs.compat_ext',
sources=sources,
extra_compile_args=extra_compile_args,
),
]

return extensions


def shuffle_extension():
info('setting up shuffle extension')
Expand All @@ -301,12 +287,10 @@ def shuffle_extension():
sources = ['numcodecs/_shuffle.pyx']

# define extension module
extensions = [
return [
Extension('numcodecs._shuffle', sources=sources, extra_compile_args=extra_compile_args),
]

return extensions


if sys.platform == 'win32':
ext_errors = (CCompilerError, ExecError, PlatformError, IOError, ValueError)
Expand Down
Loading