Add mem_level argument

Author: rhpvorderman

src/isal/igzip_lib.pxd

@@ -494,8 +494,9 @@ cdef int mem_level_to_bufsize(int compression_level, int mem_level, unsigned int
 
 cpdef compress(data,
              int level= ?,
-             unsigned short flag = ?,
-             unsigned short hist_bits = ?,
+             int flag = ?,
+             int mem_level = ?,
+             int hist_bits = ?,
             )
 
 cpdef decompress(data,

src/isal/igzip_lib.pyi

@@ -48,6 +48,7 @@ IsalError: OSError
 
 def compress(data, level: int = ISAL_DEFAULT_COMPRESSION,
              flag: int = COMP_DEFLATE,
+             mem_level: int = MEM_LEVEL_DEFAULT,
              hist_bits: int = MAX_HIST_BITS) -> bytes: ...
 def decompress(data, flag: int = DECOMP_DEFLATE,
                hist_bits: int = MAX_HIST_BITS,

src/isal/igzip_lib.pyx

@@ -123,8 +123,9 @@ cdef void arrange_input_buffer(stream_or_state *stream, Py_ssize_t *remains):
 
 cpdef compress(data,
              int level=ISAL_DEFAULT_COMPRESSION_I,
-             unsigned short flag = IGZIP_DEFLATE,
-             unsigned short hist_bits = ISAL_DEF_MAX_HIST_BITS,
+             int flag = IGZIP_DEFLATE,
+             int mem_level = MEM_LEVEL_DEFAULT_I,
+             int hist_bits = ISAL_DEF_MAX_HIST_BITS,
             ):
     """
     Compresses the bytes in *data*. Returns a bytes object with the

src/isal/isal_zlib.pyx

@@ -209,7 +209,7 @@ def compress(data,
     wbits_to_flag_and_hist_bits_deflate(wbits,
                                         &hist_bits,
                                         &flag)
-    return igzip_compress(data, level, flag, hist_bits)
+    return igzip_compress(data, level, flag, MEM_LEVEL_DEFAULT_I, hist_bits)
 
 def decompress(data,
                  int wbits=ISAL_DEF_MAX_HIST_BITS,

tests/test_igzip_lib.py

@@ -22,6 +22,12 @@
 from typing import NamedTuple
 
 from isal import igzip_lib
+from isal.igzip_lib import (
+    COMP_DEFLATE, COMP_GZIP, COMP_GZIP_NO_HDR, COMP_ZLIB, COMP_ZLIB_NO_HDR,
+    DECOMP_DEFLATE, DECOMP_GZIP, DECOMP_GZIP_NO_HDR, DECOMP_GZIP_NO_HDR_VER,
+    DECOMP_ZLIB, DECOMP_ZLIB_NO_HDR, DECOMP_ZLIB_NO_HDR_VER, MEM_LEVEL_DEFAULT,
+    MEM_LEVEL_EXTRA_LARGE, MEM_LEVEL_LARGE, MEM_LEVEL_MEDIUM, MEM_LEVEL_MIN,
+    MEM_LEVEL_SMALL)
 
 import pytest
 
@@ -38,19 +44,22 @@ class Flag(NamedTuple):
 COMPRESS_LEVELS = list(range(4))
 HIST_BITS = list(range(16))
 FLAGS = [
-    Flag(igzip_lib.COMP_DEFLATE, igzip_lib.DECOMP_DEFLATE),
-    Flag(igzip_lib.COMP_ZLIB, igzip_lib.DECOMP_ZLIB),
-    Flag(igzip_lib.COMP_GZIP, igzip_lib.DECOMP_GZIP),
-    Flag(igzip_lib.COMP_ZLIB_NO_HDR, igzip_lib.DECOMP_ZLIB_NO_HDR),
-    Flag(igzip_lib.COMP_GZIP_NO_HDR, igzip_lib.DECOMP_GZIP_NO_HDR),
-    Flag(igzip_lib.COMP_ZLIB_NO_HDR, igzip_lib.DECOMP_ZLIB_NO_HDR_VER),
-    Flag(igzip_lib.COMP_GZIP_NO_HDR, igzip_lib.DECOMP_GZIP_NO_HDR_VER),
+    Flag(COMP_DEFLATE, DECOMP_DEFLATE),
+    Flag(COMP_ZLIB, DECOMP_ZLIB),
+    Flag(COMP_GZIP, DECOMP_GZIP),
+    Flag(COMP_ZLIB_NO_HDR, DECOMP_ZLIB_NO_HDR),
+    Flag(COMP_GZIP_NO_HDR, DECOMP_GZIP_NO_HDR),
+    Flag(COMP_ZLIB_NO_HDR, DECOMP_ZLIB_NO_HDR_VER),
+    Flag(COMP_GZIP_NO_HDR, DECOMP_GZIP_NO_HDR_VER),
 ]
+MEM_LEVELS = [MEM_LEVEL_DEFAULT, MEM_LEVEL_MIN, MEM_LEVEL_SMALL,
+              MEM_LEVEL_MEDIUM, MEM_LEVEL_LARGE, MEM_LEVEL_EXTRA_LARGE]
 
 
-@pytest.mark.parametrize(["level", "flag", "hist_bits"],
-                         itertools.product(COMPRESS_LEVELS, FLAGS, HIST_BITS))
-def test_compress_decompress(level, flag: Flag, hist_bits):
-    comp = igzip_lib.compress(DATA, level, flag.comp, hist_bits)
+@pytest.mark.parametrize(["level", "flag", "mem_level", "hist_bits"],
+                         itertools.product(
+                             COMPRESS_LEVELS, FLAGS, MEM_LEVELS, HIST_BITS))
+def test_compress_decompress(level, flag: Flag, mem_level, hist_bits):
+    comp = igzip_lib.compress(DATA, level, flag.comp, mem_level, hist_bits)
     decomp = igzip_lib.decompress(comp, flag.decomp, hist_bits)
     assert decomp == DATA