Skip to content

Add zlib #3164

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
karlhigley merged 3 commits into from
Mar 11, 2020
Merged

Add zlib #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e20e3
Add zlib compression
refactormyself Mar 8, 2020
33726e8
Update syft/serde/compression.py
refactormyself Mar 11, 2020
39bffb5
Update syft/serde/compression.py
refactormyself Mar 11, 2020
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
20 changes: 19 additions & 1 deletion syft/serde/compression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file exists to provide one common place for all compression methods used in
simplifying and serializing PySyft objects.
"""

import zlib
import lz4
from lz4 import ( # noqa: F401
frame,
Expand All @@ -13,9 +13,11 @@
# COMPRESSION SCHEME INT CODES
NO_COMPRESSION = 40
LZ4 = 41
ZLIB = 42
scheme_to_bytes = {
NO_COMPRESSION: NO_COMPRESSION.to_bytes(1, byteorder="big"),
LZ4: LZ4.to_bytes(1, byteorder="big"),
ZLIB: ZLIB.to_bytes(1, byteorder="big"),
}

## SECTION: chosen Compression Algorithm
Expand All @@ -32,6 +34,20 @@ def _apply_compress_scheme(decompressed_input_bin) -> tuple:
return apply_lz4_compression(decompressed_input_bin)


def apply_zlib_compression(uncompressed_input_bin) -> tuple:
"""
Apply zlib compression to the input

Args:
decompressed_input_bin: the binary to be compressed

Returns:
a tuple (compressed_result, ZLIB)
"""

return zlib.compress(uncompressed_input_bin), ZLIB


def apply_lz4_compression(decompressed_input_bin) -> tuple:
"""
Apply LZ4 compression to the input
Expand Down Expand Up @@ -101,6 +117,8 @@ def _decompress(binary: bin) -> bin:
# 1) Decompress or return the original stream
if compress_scheme == LZ4:
return lz4.frame.decompress(binary)
elif compress_scheme == ZLIB:
return zlib.decompress(binary)
elif compress_scheme == NO_COMPRESSION:
return binary
else:
Expand Down
16 changes: 14 additions & 2 deletions test/serde/msgpack/test_msgpack_serde.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,14 @@ def test_ndarray_serde(compress):
assert numpy.array_equal(arr, arr_serialized_deserialized)


@pytest.mark.parametrize("compress_scheme", [compression.LZ4, compression.NO_COMPRESSION])
@pytest.mark.parametrize(
"compress_scheme", [compression.LZ4, compression.ZLIB, compression.NO_COMPRESSION]
)
def test_compress_decompress(compress_scheme):
if compress_scheme == compression.LZ4:
compression._apply_compress_scheme = compression.apply_lz4_compression
elif compress_scheme == compression.ZLIB:
compression._apply_compress_scheme = compression.apply_zlib_compression
else:
compression._apply_compress_scheme = compression.apply_no_compression

Expand All @@ -430,10 +434,14 @@ def test_compress_decompress(compress_scheme):
assert original == decompressed


@pytest.mark.parametrize("compress_scheme", [compression.LZ4, compression.NO_COMPRESSION])
@pytest.mark.parametrize(
"compress_scheme", [compression.LZ4, compression.ZLIB, compression.NO_COMPRESSION]
)
def test_compressed_serde(compress_scheme):
if compress_scheme == compression.LZ4:
compression._apply_compress_scheme = compression.apply_lz4_compression
elif compress_scheme == compression.ZLIB:
compression._apply_compress_scheme = compression.apply_zlib_compression
else:
compression._apply_compress_scheme = compression.apply_no_compression

Expand Down Expand Up @@ -618,6 +626,8 @@ def test_float(compress):
[
(True, compression.LZ4),
(False, compression.LZ4),
(True, compression.ZLIB),
(False, compression.ZLIB),
(True, compression.NO_COMPRESSION),
(False, compression.NO_COMPRESSION),
],
Expand All @@ -626,6 +636,8 @@ def test_hooked_tensor(compress, compress_scheme):
if compress:
if compress_scheme == compression.LZ4:
compression._apply_compress_scheme = compression.apply_lz4_compression
elif compress_scheme == compression.ZLIB:
compression._apply_compress_scheme = compression.apply_zlib_compression
else:
compression._apply_compress_scheme = compression.apply_no_compression
else:
Expand Down