deprecate mpi_communicator argument in create_discretization_collection

illinois-ceesd · Aug 25, 2022 · cfad592 · cfad592
1 parent 826cfb6
commit cfad592
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 40 deletions.
diff --git a/examples/autoignition-mpi.py b/examples/autoignition-mpi.py
@@ -170,8 +170,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
                                                                     generate_mesh)
         local_nelements = local_mesh.nelements
 
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                                             mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
     ones = dcoll.zeros(actx) + 1.0
 
@@ -320,8 +319,7 @@ def get_fluid_state(cv, tseed):
         else:
             rst_cv = restart_data["cv"]
             old_dcoll = \
-                create_discretization_collection(actx, local_mesh, order=rst_order,
-                                                 mpi_communicator=comm)
+                create_discretization_collection(actx, local_mesh, order=rst_order)
             from meshmode.discretization.connection import make_same_mesh_connection
             connection = make_same_mesh_connection(actx, dcoll.discr_from_dd("vol"),
                                                    old_dcoll.discr_from_dd("vol"))

diff --git a/examples/doublemach-mpi.py b/examples/doublemach-mpi.py
@@ -192,8 +192,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
 
     from mirgecom.discretization import create_discretization_collection
     order = 3
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                                             mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     from grudge.dof_desc import DISCR_TAG_QUAD

diff --git a/examples/heat-source-mpi.py b/examples/heat-source-mpi.py
@@ -111,8 +111,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
 
     order = 3
 
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                    mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
 
     if dim == 2:
         # no deep meaning here, just a fudge factor

diff --git a/examples/hotplate-mpi.py b/examples/hotplate-mpi.py
@@ -168,9 +168,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 1
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     if logmgr:

diff --git a/examples/lump-mpi.py b/examples/lump-mpi.py
@@ -146,9 +146,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None

diff --git a/examples/mixture-mpi.py b/examples/mixture-mpi.py
@@ -146,9 +146,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None

diff --git a/examples/nsmix-mpi.py b/examples/nsmix-mpi.py
@@ -153,9 +153,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 1
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
     ones = dcoll.zeros(actx) + 1.0
 

diff --git a/examples/poiseuille-mpi.py b/examples/poiseuille-mpi.py
@@ -167,9 +167,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 2
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     if use_overintegration:

diff --git a/examples/pulse-mpi.py b/examples/pulse-mpi.py
@@ -152,9 +152,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 1
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     if use_overintegration:

diff --git a/examples/scalar-lump-mpi.py b/examples/scalar-lump-mpi.py
@@ -145,9 +145,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None

diff --git a/examples/sod-mpi.py b/examples/sod-mpi.py
@@ -144,9 +144,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 1
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None

diff --git a/examples/vortex-mpi.py b/examples/vortex-mpi.py
@@ -149,9 +149,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None

diff --git a/examples/wave-mpi.py b/examples/wave-mpi.py
@@ -130,9 +130,7 @@ def main(actx_class, snapshot_pattern="wave-mpi-{step:04d}-{rank:04d}.pkl",
 
     order = 3
 
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     current_cfl = 0.485
@@ -161,8 +159,7 @@ def main(actx_class, snapshot_pattern="wave-mpi-{step:04d}-{rank:04d}.pkl",
         old_order = restart_data["order"]
         if old_order != order:
             old_dcoll = create_discretization_collection(
-                actx, local_mesh, order=old_order, mpi_communicator=comm
-            )
+                actx, local_mesh, order=old_order)
             from meshmode.discretization.connection import make_same_mesh_connection
             connection = make_same_mesh_connection(actx, dcoll.discr_from_dd("vol"),
                                                    old_dcoll.discr_from_dd("vol"))

diff --git a/mirgecom/discretization.py b/mirgecom/discretization.py
@@ -41,6 +41,12 @@
 def create_discretization_collection(actx, volume_meshes, order, *,
         mpi_communicator=None, quadrature_order=-1):
     """Create and return a grudge DG discretization collection."""
+    if mpi_communicator is not None:
+        from warnings import warn
+        warn(
+            "mpi_communicator argument is deprecated and will disappear in Q4 2022.",
+            DeprecationWarning, stacklevel=2)
+
     from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     from grudge.discretization import make_discretization_collection
     from meshmode.discretization.poly_element import (