chore(frontend-python): Run minimal tests on macos and gpu

zama-ai · Nov 29, 2024 · 4498781 · 4498781
1 parent 46c39b2
commit 4498781
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/frontends/concrete-python/Makefile b/frontends/concrete-python/Makefile
@@ -72,10 +72,10 @@ pytest-default: tfhers-utils
 		--key-cache "${KEY_CACHE_DIRECTORY}" \
 		-m "${PYTEST_MARKERS}"
 
-pytest-macos: tfhers-utils
+pytest-macos:
 	pytest tests -svv -n auto \
 		--key-cache "${KEY_CACHE_DIRECTORY}" \
-		-m "${PYTEST_MARKERS}"
+		-m "${PYTEST_MARKERS} minimal"
 
 pytest-single: tfhers-utils
 	eval $(shell make silent_cp_activate)
@@ -98,21 +98,12 @@ pytest-multi: tfhers-utils
 		--key-cache "${KEY_CACHE_DIRECTORY}" \
 		-m "${PYTEST_MARKERS}"
 
-pytest-gpu: tfhers-utils
+pytest-gpu:
 	eval $(shell make silent_cp_activate)
-	# test single precision
-	pytest tests -svv -n0 --use_gpu \
-		--key-cache "${KEY_CACHE_DIRECTORY}" \
-		-m "${PYTEST_MARKERS}"
-
 	# test multi precision
 	pytest tests -svv -n0 --use_gpu \
-		--precision=multi \
-		--cov=concrete.fhe \
-		--cov-fail-under=100 \
-		--cov-report=term-missing:skip-covered \
 		--key-cache "${KEY_CACHE_DIRECTORY}" \
-		-m "${PYTEST_MARKERS}"
+		-m "${PYTEST_MARKERS} minimal"
 
 benchmark:
 	eval $(shell make silent_cp_activate)

diff --git a/frontends/concrete-python/pytest.ini b/frontends/concrete-python/pytest.ini
@@ -2,3 +2,4 @@
 markers =
 	dataflow: mark the test as using dataflow parallelization.
 	graphviz: mark the test using graphviz package
+	minimal: mark the minimal test to run
diff --git a/frontends/concrete-python/tests/compilation/test_circuit.py b/frontends/concrete-python/tests/compilation/test_circuit.py
@@ -250,7 +250,7 @@ def function(x, y):
 
     assert np.array_equal(x_plus_y, x + np.array(y))
 
-
+@pytest.mark.minimal
 def test_client_server_api(helpers):
     """
     Test client/server API.

diff --git a/frontends/concrete-python/tests/compilation/test_modules.py b/frontends/concrete-python/tests/compilation/test_modules.py
@@ -657,7 +657,7 @@ def a(x, y):
 
     assert Fixed.compile(inputsets)
 
-
+@pytest.mark.minimal
 def test_client_server_api(helpers):
     """
     Test client/server API of modules.

diff --git a/frontends/concrete-python/tests/execution/test_add.py b/frontends/concrete-python/tests/execution/test_add.py
@@ -69,6 +69,7 @@
         },
     ],
 )
+@pytest.mark.minimal
 def test_constant_add(function, parameters, helpers):
     """
     Test add where one of the operators is a constant.
@@ -164,6 +165,7 @@ def test_constant_add(function, parameters, helpers):
         },
     ],
 )
+@pytest.mark.minimal
 def test_add(function, parameters, helpers):
     """
     Test add where both of the operators are dynamic.

diff --git a/frontends/concrete-python/tests/execution/test_direct_table_lookup.py b/frontends/concrete-python/tests/execution/test_direct_table_lookup.py
@@ -156,6 +156,7 @@ def negative_identity_table_lookup_generator(n):
         pytest.param(6, negative_identity_table_lookup_generator(6)),
     ],
 )
+@pytest.mark.minimal
 def test_direct_table_lookup(bits, function, helpers):
     """
     Test direct table lookup.

diff --git a/frontends/concrete-python/tests/execution/test_mul.py b/frontends/concrete-python/tests/execution/test_mul.py
@@ -174,6 +174,7 @@ def test_constant_mul(function, parameters, helpers):
         },
     ],
 )
+@pytest.mark.minimal
 def test_mul(function, parameters, helpers):
     """
     Test mul where both of the operators are dynamic.