From fb1cf88bbe3b5ab734c94d47d70c6236eaa90835 Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Thu, 12 Dec 2024 16:46:10 +0000 Subject: [PATCH 1/3] Fix? parallel tests in PyOP2 --- .github/workflows/pyop2.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pyop2.yml b/.github/workflows/pyop2.yml index aed26fbbe4..a0c6d1797b 100644 --- a/.github/workflows/pyop2.yml +++ b/.github/workflows/pyop2.yml @@ -27,7 +27,7 @@ jobs: shell: bash run: | sudo apt update - sudo apt install build-essential mpich libmpich-dev \ + sudo apt install build-essential libopenmpi-dev \ libblas-dev liblapack-dev gfortran libhwloc-dev libfabric-dev - name: Set correct Python version @@ -120,7 +120,7 @@ jobs: working-directory: firedrake run: | source ../venv/bin/activate - # Running parallel test cases separately works around a bug in pytest-mpi - pytest -k "not parallel" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 - mpiexec -n 3 pytest -k "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + python -m pytest -m "not parallel" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 2 python -m pytest -m "parallel[2]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 3 python -m pytest -m "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 timeout-minutes: 10 From fcebd9c1b38d8dbe8201f374ae31f9ece035e16f Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Thu, 12 Dec 2024 17:22:09 +0000 Subject: [PATCH 2/3] python -m pytest causing issues --- .github/workflows/pyop2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pyop2.yml b/.github/workflows/pyop2.yml index a0c6d1797b..222060d323 100644 --- a/.github/workflows/pyop2.yml +++ b/.github/workflows/pyop2.yml @@ -120,7 +120,7 @@ jobs: working-directory: firedrake run: | source ../venv/bin/activate - python -m pytest -m "not parallel" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 - mpiexec -n 2 python -m pytest -m "parallel[2]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 - mpiexec -n 3 python -m pytest -m "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + pytest -m "not parallel" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 2 pytest -m "parallel[2]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 3 pytest -m "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 timeout-minutes: 10 From 0c6ab2feb98fd9f262fc0e53911d074ba0952b17 Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Fri, 13 Dec 2024 09:17:01 +0000 Subject: [PATCH 3/3] oversubscribe cores --- .github/workflows/pyop2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyop2.yml b/.github/workflows/pyop2.yml index 222060d323..b5e750242a 100644 --- a/.github/workflows/pyop2.yml +++ b/.github/workflows/pyop2.yml @@ -121,6 +121,6 @@ jobs: run: | source ../venv/bin/activate pytest -m "not parallel" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 - mpiexec -n 2 pytest -m "parallel[2]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 - mpiexec -n 3 pytest -m "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 2 --oversubscribe pytest -m "parallel[2]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 + mpiexec -n 3 --oversubscribe pytest -m "parallel[3]" --tb=native --timeout=480 --timeout-method=thread -o faulthandler_timeout=540 -v tests/pyop2 timeout-minutes: 10