From aa78316cfce1228b3c205712ff35cae08ba0dc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:22:34 +0000 Subject: [PATCH 1/5] r.viewshed.exposure: Change number of processors used in tests --- .../r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py index 264a2e9afe..00fa599168 100755 --- a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py +++ b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py @@ -49,7 +49,7 @@ class TestFunctions(TestCase): sample_density=5, seed=50, memory=5000, - nprocs=10, + nprocs=4, quiet=True, overwrite=True, ) From 3331a2a1785597a63a996c28c79fe91b4291bae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:26:30 +0000 Subject: [PATCH 2/5] Change expected value --- .../testsuite/test_r_viewshed_exposure.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py index 00fa599168..ca3cbe02b8 100755 --- a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py +++ b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py @@ -137,7 +137,11 @@ class TestFunctions(TestCase): "stddev": 0.555438, "variance": 0.308511, "coeff_var": 131.549853569661, - "sum": 31834.1479829689, + "sum": 31834.1480175955, # average 1, 4 and 10 core + # "sum": 31834.1480048643, # average 4 and 10 core + # "sum": 31834.1480430579, # 1 core x64 + # "sum": 31834.1480267597, # 4 core x64 + # "sum": 31834.1479829689, # 10 core x64 }, "test_points": { "n": 97340, From 302c0949d1c872edcd187eb41908be5b32e880f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:29:33 +0000 Subject: [PATCH 3/5] CI: Always upload the test report, even on failure and when cancelling --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cfbaae65f..8f248bdadf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,6 +121,7 @@ jobs: ../.github/workflows/test.sh - name: Make HTML test report available + if: ${{ always() }} uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: testreport-grass-${{ matrix.grass-version }}-python-${{ matrix.python-version }} From 1686b9c52621bbaedd773463596b636786d5f826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 9 Feb 2025 21:06:27 +0000 Subject: [PATCH 4/5] r.viewshed.exposure: Set an expected value that is midpoint between the results of 1 and 10 core (x64) for test_lakes. The biggest precision gap (except for 20 core that is a bit off), is 3.00445E-05, so use a 4E-5 precision for that test instead of 1E-5 Results for test_lakes sum: "sum": 31834.1480130134, # midpoint of 1 and 10 core x64 "sum": 31834.1480232505, # average 1, 2, 4 and 10 core "sum": 31834.1480175955, # average 1, 4 and 10 core "sum": 31834.1480048643, # average 4 and 10 core "sum": 31834.1480430579, # 1 core x64 "sum": 31834.1480402155, # 2 core x64 "sum": 31834.1480267597, # 4 core x64 "sum": 31834.1480075223, # 8 core x64 "sum": 31834.1479829689, # 10 core x64 "sum": 31834.1479833564, # 12 core x64 "sum": 31834.1479394501, # 20 core x64 --- .../testsuite/test_r_viewshed_exposure.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py index ca3cbe02b8..4e69d359c3 100755 --- a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py +++ b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py @@ -137,11 +137,17 @@ class TestFunctions(TestCase): "stddev": 0.555438, "variance": 0.308511, "coeff_var": 131.549853569661, - "sum": 31834.1480175955, # average 1, 4 and 10 core - # "sum": 31834.1480048643, # average 4 and 10 core - # "sum": 31834.1480430579, # 1 core x64 - # "sum": 31834.1480267597, # 4 core x64 - # "sum": 31834.1479829689, # 10 core x64 + "sum": 31834.1480130134, # midpoint of 1 and 10 core x64 + # "sum": 31834.1480232505, # average 1, 2, 4 and 10 core + # "sum": 31834.1480175955, # average 1, 4 and 10 core + # "sum": 31834.1480048643, # average 4 and 10 core + # "sum": 31834.1480430579, # 1 core x64 + # "sum": 31834.1480402155, # 2 core x64 + # "sum": 31834.1480267597, # 4 core x64 + # "sum": 31834.1480075223, # 8 core x64 + # "sum": 31834.1479829689, # 10 core x64 + # "sum": 31834.1479833564, # 12 core x64 + # "sum": 31834.1479394501, # 20 core x64 }, "test_points": { "n": 97340, @@ -245,7 +251,7 @@ def test_lakes(self): self.assertRasterFitsUnivar( raster=output, reference=self.test_results_stats[output], - precision=1e-5, + precision=4e-5, ) def test_points(self): From 781a859fa6bfc961bc673db9def47b2c7c1dd6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 9 Feb 2025 21:25:24 +0000 Subject: [PATCH 5/5] r.viewshed.exposure: Removed commented results --- .../testsuite/test_r_viewshed_exposure.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py index 4e69d359c3..ef0aeab4b1 100755 --- a/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py +++ b/src/raster/r.viewshed.exposure/testsuite/test_r_viewshed_exposure.py @@ -138,16 +138,6 @@ class TestFunctions(TestCase): "variance": 0.308511, "coeff_var": 131.549853569661, "sum": 31834.1480130134, # midpoint of 1 and 10 core x64 - # "sum": 31834.1480232505, # average 1, 2, 4 and 10 core - # "sum": 31834.1480175955, # average 1, 4 and 10 core - # "sum": 31834.1480048643, # average 4 and 10 core - # "sum": 31834.1480430579, # 1 core x64 - # "sum": 31834.1480402155, # 2 core x64 - # "sum": 31834.1480267597, # 4 core x64 - # "sum": 31834.1480075223, # 8 core x64 - # "sum": 31834.1479829689, # 10 core x64 - # "sum": 31834.1479833564, # 12 core x64 - # "sum": 31834.1479394501, # 20 core x64 }, "test_points": { "n": 97340,