From acfdae5e0263ec5682009c89fbd33035abe38e2d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 27 Sep 2020 08:33:57 -0500 Subject: [PATCH 1/2] No point in specific MPI jobs in Gitlab CI if MPI is always available --- .gitlab-ci.yml | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebe42624..2d20afa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,43 +33,6 @@ Python 3 Intel: reports: junit: test/pytest.xml -Python 3 POCL MPI: - script: - - export PY_EXE=python3 - - export PYOPENCL_TEST=portable:pthread - - export EXTRA_INSTALL="pybind11 numpy mako mpi4py pymetis" - - export PYTEST_ADDOPTS="-k mpi" - - 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: - - python3 - - pocl - - mpi - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3 Intel MPI: - script: - - export PY_EXE=python3 - - source /opt/enable-intel-cl.sh - - export PYOPENCL_TEST="intel(r):pu" - - export EXTRA_INSTALL="pybind11 numpy mako mpi4py pymetis" - - export PYTEST_ADDOPTS="-k mpi" - - 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: - - python3 - - pocl - - mpi - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - Python 3 POCL Examples: script: - export PY_EXE=python3 -- GitLab From 6d03b287bc1606424a87d8d9c439b0c011df21ed Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 27 Sep 2020 08:42:13 -0500 Subject: [PATCH 2/2] Adjust MPI boundary comm tag so OpenMPI won't complain --- grudge/execution.py | 3 --- grudge/symbolic/compiler.py | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/grudge/execution.py b/grudge/execution.py index 54f93a63..102fa108 100644 --- a/grudge/execution.py +++ b/grudge/execution.py @@ -44,9 +44,6 @@ logger = logging.getLogger(__name__) from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 -MPI_TAG_SEND_TAGS = 1729 - - ResultType = Union[DOFArray, Number] diff --git a/grudge/symbolic/compiler.py b/grudge/symbolic/compiler.py index 075c0b07..85eb4514 100644 --- a/grudge/symbolic/compiler.py +++ b/grudge/symbolic/compiler.py @@ -212,8 +212,7 @@ class RankDataSwapAssign(Instruction): .. attribute:: dd_out .. attribute:: comment """ - # TODO: We need to be sure this does not conflict with some other tag. - MPI_TAG_GRUDGE_DATA_BASE = 0x3700d3e + MPI_TAG_GRUDGE_DATA_BASE = 15165 def __init__(self, name, field, op): self.name = name -- GitLab