From c874a1535d9c6055f922bc419cb3ee83b770bc8a Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 12 Nov 2025 21:56:38 +0100 Subject: [PATCH] tests updated to meet expected math precision --- tests/test_compile_math.py | 12 ++----- tests/test_math.py | 68 ++++++++++++-------------------------- 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/tests/test_compile_math.py b/tests/test_compile_math.py index e8ff755..9be9a86 100644 --- a/tests/test_compile_math.py +++ b/tests/test_compile_math.py @@ -18,8 +18,6 @@ def run_command(command: list[str]) -> str: def test_compile_sqrt(): test_vals = [0.0, 0.0001, 0.1, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.28318530718, 100.0, 1000.0, 100000.0] - test_vals = [100000.0] - ret = [r for v in test_vals for r in (cp.sqrt(variable(v)),)] @@ -54,8 +52,6 @@ def test_compile_sqrt(): def test_compile_log(): test_vals = [0.0, 0.0001, 0.1, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.28318530718, 100.0, 1000.0, 100000.0] - test_vals = [100000.0] - ret = [r for v in test_vals for r in (cp.log(variable(v)),)] @@ -90,8 +86,6 @@ def test_compile_log(): def test_compile_sin(): test_vals = [0.0, 0.0001, 0.1, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.28318530718, 100.0, 1000.0, 100000.0] - test_vals = [100000.0] - ret = [r for v in test_vals for r in (cp.sin(variable(v)),)] @@ -109,7 +103,7 @@ def test_compile_sin(): il.write_com(_binwrite.Command.END_COM) print('* Data to runner:') - il.print() + #il.print() il.to_file('bin/test.copapy') @@ -123,6 +117,6 @@ def test_compile_sin(): if __name__ == "__main__": - #test_compile_sqrt() - #test_compile_log() + test_compile_sqrt() + test_compile_log() test_compile_sin() diff --git a/tests/test_math.py b/tests/test_math.py index 7e53b2e..76d21ee 100644 --- a/tests/test_math.py +++ b/tests/test_math.py @@ -4,33 +4,6 @@ import copapy as cp import math as ma import warnings - -def test_corse(): - a_i = 9 - a_f = 2.5 - c_i = variable(a_i) - c_f = variable(a_f) - # c_b = variable(True) - - ret_test = (c_f ** c_f, c_i ** c_i) # , c_i & 3) - ret_refe = (a_f ** a_f, a_i ** a_i) # , a_i & 3) - - tg = Target() - print('* compile and copy ...') - tg.compile(ret_test) - print('* run and copy ...') - tg.run() - print('* finished') - - for test, ref in zip(ret_test, ret_refe): - assert isinstance(test, cp.variable) - val = tg.read_value(test) - print('+', val, ref, type(val), test.dtype) - #for t in (int, float, bool): - # assert isinstance(val, t) == isinstance(ref, t), f"Result type does not match for {val} and {ref}" - assert val == pytest.approx(ref, 2), f"Result does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] - - def test_fine(): a_i = 9 a_f = 2.5 @@ -40,6 +13,8 @@ def test_fine(): ret_test = (c_f ** 2, c_i ** -1, + c_i ** 2.111, + c_f ** 2.111, cp.sqrt(c_i), cp.sqrt(c_f), cp.sin(c_f), @@ -48,6 +23,8 @@ def test_fine(): re2_test = (a_f ** 2, a_i ** -1, + a_i ** 2.111, + a_f ** 2.111, cp.sqrt(a_i), cp.sqrt(a_f), cp.sin(a_f), @@ -56,6 +33,8 @@ def test_fine(): ret_refe = (a_f ** 2, a_i ** -1, + a_i ** 2.111, + a_f ** 2.111, ma.sqrt(a_i), ma.sqrt(a_f), ma.sin(a_f), @@ -75,8 +54,8 @@ def test_fine(): print('+', val, ref, type(val), test.dtype) #for t in (int, float, bool): # assert isinstance(val, t) == isinstance(ref, t), f"Result type does not match for {val} and {ref}" - assert val == pytest.approx(ref, 1e-4), f"Result for {name} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] - assert val2 == pytest.approx(ref, 1e-4), f"Local result for {name} does not match: {val2} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] + assert val == pytest.approx(ref, abs=1e-3), f"Result for {name} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] + assert val2 == pytest.approx(ref, abs=1e-3), f"Local result for {name} does not match: {val2} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] def test_trig_precision(): @@ -96,9 +75,9 @@ def test_trig_precision(): assert isinstance(test, cp.variable) val = tg.read_value(test) print(f"+ Result of {func_name}: {val}; reference: {ref}") - #assert val == pytest.approx(ref, abs=1e-5), f"Result of {func_name} for input {test_vals[i // 3]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] - if not val == pytest.approx(ref, 1e-5): # pyright: ignore[reportUnknownMemberType] - warnings.warn(f"Result of {func_name} for input {test_vals[i // 3]} does not match: {val} and reference: {ref}", UserWarning) + assert val == pytest.approx(ref, abs=1e-5), f"Result of {func_name} for input {test_vals[i // 3]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] + #if not val == pytest.approx(ref, abs=1e-5): # pyright: ignore[reportUnknownMemberType] + # warnings.warn(f"Result of {func_name} for input {test_vals[i // 3]} does not match: {val} and reference: {ref}", UserWarning) def test_arcus_trig_precision(): @@ -109,13 +88,11 @@ def test_arcus_trig_precision(): ret_test = [r for v in test_vals for r in (cp.asin(variable(v)), cp.acos(variable(v)), cp.atan(variable(v)), - cp.atan2(variable(v), variable(0.7)), - cp.atan2(variable(v), variable(-0.2)))] + cp.atan2(variable(v), variable(3)),)] ret_refe = [r for v in test_vals for r in (ma.asin(v), ma.acos(v), ma.atan(v), - ma.atan2(v, 0.7), - ma.atan2(v, -0.2))] + ma.atan2(v, 3),)] tg = Target() tg.compile(ret_test) @@ -132,7 +109,6 @@ def test_arcus_trig_precision(): def test_sqrt_precision(): - test_vals = [0.0, 0.0001, 0.1, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.28318530718, 100.0, 1000.0, 100000.0] ret_test = [r for v in test_vals for r in (cp.sqrt(variable(v)),)] @@ -147,15 +123,15 @@ def test_sqrt_precision(): assert isinstance(test, cp.variable) val = tg.read_value(test) print(f"+ Result of {func_name}: {val}; reference: {ref}") - #assert val == pytest.approx(ref, 1e-5), f"Result of {func_name} for input {test_vals[i]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] - if not val == pytest.approx(ref, 1e-5): # pyright: ignore[reportUnknownMemberType] - warnings.warn(f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}", UserWarning) + assert val == pytest.approx(ref, rel=1e-5), f"Result of {func_name} for input {test_vals[i]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] + #if not val == pytest.approx(ref, abs=1e-5): # pyright: ignore[reportUnknownMemberType] + # warnings.warn(f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}", UserWarning) def test_log_exp_precision(): - test_vals = [0.1, 0.5, 0.9, 0.999, 1.0, 8.8, 12.0 - -0.1, -0.5, -0.9, -0.999, -1.0, 8.8, 12.0] + test_vals = [0.1, 0.5, 0.9, 0.999, 1.0, 2.5, + -0.1, -0.5, -0.9, -0.999, -1.0, 2.5] ret_test = [r for v in test_vals for r in (cp.log(variable(abs(v))), cp.exp(variable(v)))] @@ -171,13 +147,13 @@ def test_log_exp_precision(): assert isinstance(test, cp.variable) val = tg.read_value(test) print(f"+ Result of {func_name}: {val}; reference: {ref}") - #assert val == pytest.approx(ref, rel=4e-2), f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] - if not val == pytest.approx(ref, rel=4e-2): # pyright: ignore[reportUnknownMemberType] - warnings.warn(f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}", UserWarning) + assert val == pytest.approx(ref, abs=1e-5), f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}" # pyright: ignore[reportUnknownMemberType] + #if not val == pytest.approx(ref, abs=1e-5): # pyright: ignore[reportUnknownMemberType] + # warnings.warn(f"Result of {func_name} for input {test_vals[i // 2]} does not match: {val} and reference: {ref}", UserWarning) if __name__ == "__main__": - test_corse() test_fine() test_sqrt_precision() test_trig_precision() + test_log_exp_precision()