From 3e865981fa2ff0cc0fe6466d8aba6388d6f8479f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 17 Aug 2018 01:51:57 -0400 Subject: [PATCH 1/2] Revert "Merge branch 'mpi4py-run-for-mpi-cis' into 'master'" This reverts merge request !23 --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ab2c356..1d6bb49c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,6 @@ Python 3.6 POCL MPI: - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="numpy mako mpi4py pymetis" - export PYTEST_ADDOPTS="-k mpi" - - # https://mpi4py.readthedocs.io/en/stable/mpi4py.run.html - - export PY_EXTRA_FLAGS="-m mpi4py.run" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: -- GitLab From 7359a36ff3c132c09e09c88a0c63e830de83a873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 17 Aug 2018 01:55:14 -0400 Subject: [PATCH 2/2] Use -m mpi4py.run in spawning subprocesses --- test/test_mpi_communication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py index 88609964..7ed5233d 100644 --- a/test/test_mpi_communication.py +++ b/test/test_mpi_communication.py @@ -276,7 +276,8 @@ def test_simple_mpi(num_ranks): "mpiexec", "-np", str(num_ranks), "-x", "RUN_WITHIN_MPI=1", "-x", "TEST_SIMPLE_MPI_COMMUNICATION=1", - sys.executable, __file__]) + # https://mpi4py.readthedocs.io/en/stable/mpi4py.run.html + sys.executable, "-m", "mpi4py.run", __file__]) # }}} -- GitLab