From 2deafbef66c35a9849716bca88dc887fe46a3da4 Mon Sep 17 00:00:00 2001 From: Jakob Fritz Date: Mon, 29 Apr 2024 08:23:10 +0200 Subject: [PATCH 1/4] Removed cupy-tests until they are fixed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa2beb338c..15b8472c47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ test_JUWELS: - shell parallel: matrix: - - SHELL_SCRIPT: ['benchmark', 'cupy'] + - SHELL_SCRIPT: ['benchmark'] artifacts: when: always paths: From 0ef3f687be3035c365e542823012947ade6562a1 Mon Sep 17 00:00:00 2001 From: Jakob Fritz Date: Mon, 29 Apr 2024 08:48:32 +0200 Subject: [PATCH 2/4] Added types, so that the gitlab-ci also runs when labels are added The other three triggers are the default --- .github/workflows/gitlab_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gitlab_ci.yml b/.github/workflows/gitlab_ci.yml index 0a05da372c..a76d3616e0 100644 --- a/.github/workflows/gitlab_ci.yml +++ b/.github/workflows/gitlab_ci.yml @@ -5,6 +5,7 @@ name: Mirror to Gitlab to trigger CI on: push: pull_request_target: + types: [opened, synchronize, reopened, labeled] schedule: - cron: '1 5 2 * *' From c3ad367dc37399f1cba068f2eae23161e703dfa4 Mon Sep 17 00:00:00 2001 From: Jakob Fritz Date: Mon, 29 Apr 2024 09:00:33 +0200 Subject: [PATCH 3/4] Run all cupy-tests except the one that gets stuck --- .gitlab-ci.yml | 2 +- pySDC/tests/test_sweepers/test_MPI_sweeper.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15b8472c47..fa2beb338c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ test_JUWELS: - shell parallel: matrix: - - SHELL_SCRIPT: ['benchmark'] + - SHELL_SCRIPT: ['benchmark', 'cupy'] artifacts: when: always paths: diff --git a/pySDC/tests/test_sweepers/test_MPI_sweeper.py b/pySDC/tests/test_sweepers/test_MPI_sweeper.py index 4ad9791b7a..642a059c86 100644 --- a/pySDC/tests/test_sweepers/test_MPI_sweeper.py +++ b/pySDC/tests/test_sweepers/test_MPI_sweeper.py @@ -152,7 +152,7 @@ def test_sweeper(num_nodes, quad_type, residual_type, imex, initGuess, launch=Tr individual_test(num_nodes, quad_type, residual_type, imex, initGuess, useNCCL=False, launch=launch) -@pytest.mark.cupy +# @pytest.mark.cupy @pytest.mark.parametrize("num_nodes", [2]) @pytest.mark.parametrize("quad_type", ['GAUSS', 'RADAU-RIGHT']) @pytest.mark.parametrize("residual_type", ['last_abs', 'full_rel']) From bca86a4898d00dff1fc5e8c8579df796652e584c Mon Sep 17 00:00:00 2001 From: Jakob Fritz Date: Mon, 29 Apr 2024 09:05:55 +0200 Subject: [PATCH 4/4] Include proposed change from brownbaerchen --- pySDC/tests/test_sweepers/test_MPI_sweeper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pySDC/tests/test_sweepers/test_MPI_sweeper.py b/pySDC/tests/test_sweepers/test_MPI_sweeper.py index 642a059c86..e94234717d 100644 --- a/pySDC/tests/test_sweepers/test_MPI_sweeper.py +++ b/pySDC/tests/test_sweepers/test_MPI_sweeper.py @@ -152,7 +152,8 @@ def test_sweeper(num_nodes, quad_type, residual_type, imex, initGuess, launch=Tr individual_test(num_nodes, quad_type, residual_type, imex, initGuess, useNCCL=False, launch=launch) -# @pytest.mark.cupy +@pytest.mark.cupy +@pytest.mark.skip(reason="We haven\'t figured out how to run tests on the cluster with multiple processes yet.") @pytest.mark.parametrize("num_nodes", [2]) @pytest.mark.parametrize("quad_type", ['GAUSS', 'RADAU-RIGHT']) @pytest.mark.parametrize("residual_type", ['last_abs', 'full_rel'])