github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-09 20:25:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: check error message when jit-exec DF on an unsupported runtime

Browse Source 
- factorize parallel tests
- define fixture to know if parallel tests have been selected
This commit is contained in:
youben11
2022-04-14 07:46:32 +01:00
committed by Ayoub Benaissa
parent c8ca318fde
commit 1b34388d6e
2 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/tests/python/conftest.py
View File

@@ -13,3 +13,19 @@ def pytest_configure(config):
@pytest.fixture(scope="session")
def keyset_cache():
return KeySetCache.new(KEY_SET_CACHE_PATH)
@pytest.fixture(scope="session")
def no_parallel(request):
"""Check if parallel tests have been selected."""
session = request.node
found_parallel = False
for item in session.items:
for marker in item.iter_markers():
if marker.name == "parallel":
found_parallel = True
break
if found_parallel:
break
print("no_parallel = ", not found_parallel)
return not found_parallel

96
compiler/tests/python/test_compilation.py
View File

@@ -121,6 +121,44 @@ end_to_end_fixture = [
),
]
end_to_end_parallel_fixture = [
pytest.param(
"""
func @main(%x: tensor<3x4x!FHE.eint<7>>, %y: tensor<3x4x!FHE.eint<7>>) -> tensor<3x2x!FHE.eint<7>> {
%c = arith.constant dense<[[1, 2], [3, 4], [5, 0], [1, 2]]> : tensor<4x2xi8>
%0 = "FHELinalg.matmul_eint_int"(%x, %c): (tensor<3x4x!FHE.eint<7>>, tensor<4x2xi8>) -> tensor<3x2x!FHE.eint<7>>
%1 = "FHELinalg.matmul_eint_int"(%y, %c): (tensor<3x4x!FHE.eint<7>>, tensor<4x2xi8>) -> tensor<3x2x!FHE.eint<7>>
%2 = "FHELinalg.add_eint"(%0, %1): (tensor<3x2x!FHE.eint<7>>, tensor<3x2x!FHE.eint<7>>) -> tensor<3x2x!FHE.eint<7>>
return %2 : tensor<3x2x!FHE.eint<7>>
}
""",
(
np.array([[1, 2, 3, 4], [4, 2, 1, 0], [2, 3, 1, 5]], dtype=np.uint8),
np.array([[1, 2, 3, 4], [4, 2, 1, 1], [2, 3, 1, 5]], dtype=np.uint8),
),
np.array([[52, 36], [31, 34], [42, 52]]),
id="matmul_eint_int_uint8",
),
pytest.param(
"""
func @main(%a0: tensor<4x!FHE.eint<6>>, %a1: tensor<4xi7>, %a2: tensor<4x!FHE.eint<6>>, %a3: tensor<4xi7>) -> tensor<4x!FHE.eint<6>> {
%1 = "FHELinalg.add_eint_int"(%a0, %a1) : (tensor<4x!FHE.eint<6>>, tensor<4xi7>) -> tensor<4x!FHE.eint<6>>
%2 = "FHELinalg.add_eint_int"(%a2, %a3) : (tensor<4x!FHE.eint<6>>, tensor<4xi7>) -> tensor<4x!FHE.eint<6>>
%res = "FHELinalg.add_eint"(%1, %2) : (tensor<4x!FHE.eint<6>>, tensor<4x!FHE.eint<6>>) -> tensor<4x!FHE.eint<6>>
return %res : tensor<4x!FHE.eint<6>>
}
""",
(
np.array([1, 2, 3, 4], dtype=np.uint8),
np.array([9, 8, 6, 5], dtype=np.uint8),
np.array([3, 2, 7, 0], dtype=np.uint8),
np.array([1, 4, 2, 11], dtype=np.uint8),
),
np.array([14, 16, 18, 20]),
id="add_eint_int_1D",
),
]
@pytest.mark.parametrize("mlir_input, args, expected_result", end_to_end_fixture)
def test_jit_compile_and_run(mlir_input, args, expected_result, keyset_cache):
@@ -147,44 +185,7 @@ def test_lib_compile_reload_and_run(mlir_input, args, expected_result, keyset_ca
@pytest.mark.parallel
@pytest.mark.parametrize(
"mlir_input, args, expected_result",
[
pytest.param(
"""
func @main(%x: tensor<3x4x!FHE.eint<7>>, %y: tensor<3x4x!FHE.eint<7>>) -> tensor<3x2x!FHE.eint<7>> {
%c = arith.constant dense<[[1, 2], [3, 4], [5, 0], [1, 2]]> : tensor<4x2xi8>
%0 = "FHELinalg.matmul_eint_int"(%x, %c): (tensor<3x4x!FHE.eint<7>>, tensor<4x2xi8>) -> tensor<3x2x!FHE.eint<7>>
%1 = "FHELinalg.matmul_eint_int"(%y, %c): (tensor<3x4x!FHE.eint<7>>, tensor<4x2xi8>) -> tensor<3x2x!FHE.eint<7>>
%2 = "FHELinalg.add_eint"(%0, %1): (tensor<3x2x!FHE.eint<7>>, tensor<3x2x!FHE.eint<7>>) -> tensor<3x2x!FHE.eint<7>>
return %2 : tensor<3x2x!FHE.eint<7>>
}
""",
(
np.array([[1, 2, 3, 4], [4, 2, 1, 0], [2, 3, 1, 5]], dtype=np.uint8),
np.array([[1, 2, 3, 4], [4, 2, 1, 1], [2, 3, 1, 5]], dtype=np.uint8),
),
np.array([[52, 36], [31, 34], [42, 52]]),
id="matmul_eint_int_uint8",
),
pytest.param(
"""
func @main(%a0: tensor<4x!FHE.eint<6>>, %a1: tensor<4xi7>, %a2: tensor<4x!FHE.eint<6>>, %a3: tensor<4xi7>) -> tensor<4x!FHE.eint<6>> {
%1 = "FHELinalg.add_eint_int"(%a0, %a1) : (tensor<4x!FHE.eint<6>>, tensor<4xi7>) -> tensor<4x!FHE.eint<6>>
%2 = "FHELinalg.add_eint_int"(%a2, %a3) : (tensor<4x!FHE.eint<6>>, tensor<4xi7>) -> tensor<4x!FHE.eint<6>>
%res = "FHELinalg.add_eint"(%1, %2) : (tensor<4x!FHE.eint<6>>, tensor<4x!FHE.eint<6>>) -> tensor<4x!FHE.eint<6>>
return %res : tensor<4x!FHE.eint<6>>
}
""",
(
np.array([1, 2, 3, 4], dtype=np.uint8),
np.array([9, 8, 6, 5], dtype=np.uint8),
np.array([3, 2, 7, 0], dtype=np.uint8),
np.array([1, 4, 2, 11], dtype=np.uint8),
),
np.array([14, 16, 18, 20]),
id="add_eint_int_1D",
),
],
"mlir_input, args, expected_result", end_to_end_parallel_fixture
)
@pytest.mark.parametrize(
"EngineClass",
@@ -204,6 +205,25 @@ def test_compile_and_run_auto_parallelize(
)
@pytest.mark.parametrize(
"mlir_input, args, expected_result", end_to_end_parallel_fixture
)
def test_compile_dataflow_and_fail_run(
mlir_input, args, expected_result, keyset_cache, no_parallel
):
if no_parallel:
engine = JITSupport.new()
options = CompilationOptions.new("main")
options.set_auto_parallelize(True)
with pytest.raises(
RuntimeError,
match="call: current runtime doesn't support dataflow execution",
):
compile_run_assert(
engine, mlir_input, args, expected_result, keyset_cache, options=options
)
@pytest.mark.parametrize(
"mlir_input, args, expected_result",
[