Add tests and guard for parallel h5py

DedalusProject · Jun 2, 2023 · fab25b9 · fab25b9
1 parent 2f4bcbb
commit fab25b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/dedalus/core/evaluator.py b/dedalus/core/evaluator.py
@@ -650,6 +650,9 @@ class H5ParallelFileHandler(H5FileHandlerBase):
 
     def __init__(self, *args, **kw):
         super().__init__(*args, **kw)
+        # Fail if not using MPI
+        if not h5py.get_config().mpi:
+            raise ValueError("H5ParallelFileHandler requires parallel build of h5py.")
         # Set HDF5 property list for collective writing
         self._property_list = h5py.h5p.create(h5py.h5p.DATASET_XFER)
         self._property_list.set_dxpl_mpio(h5py.h5fd.MPIO_COLLECTIVE)

diff --git a/dedalus/tests/test_output.py b/dedalus/tests/test_output.py
@@ -9,12 +9,20 @@
 from dedalus.tools.cache import CachedFunction
 
 
+# Check if parallel h5py is available
+handler_options = ['gather', 'virtual']
+if h5py.get_config().mpi:
+    handler_options.append('mpio')
+else:
+    handler_options.append(pytest.param('mpio', marks=pytest.mark.xfail(reason="parallel h5py not available")))
+
+
 @pytest.mark.parametrize('dtype', [np.float64, np.complex128])
 @pytest.mark.parametrize('dealias', [1, 3/2])
 @pytest.mark.parametrize('output_scales', [1, 3/2, 2,
     pytest.param(1/2, marks=pytest.mark.xfail(reason="evaluator not copying correctly for scales < 1"))])
 @pytest.mark.parametrize('output_layout', ['g', 'c'])
-@pytest.mark.parametrize('parallel', ['gather', 'mpio', 'virtual'])
+@pytest.mark.parametrize('parallel', handler_options)
 def test_cartesian_output(dtype, dealias, output_scales, output_layout, parallel):
     Nx = Ny = Nz = 16
     Lx = Ly = Lz = 2 * np.pi
@@ -87,7 +95,7 @@ def build_shell(Nphi, Ntheta, Nr, k, dealias, dtype):
 @pytest.mark.parametrize('dtype', [np.float64, np.complex128])
 @pytest.mark.parametrize('output_scales', [1, 3/2, 2,
     pytest.param(1/2, marks=pytest.mark.xfail(reason="evaluator not copying correctly for scales < 1"))])
-@pytest.mark.parametrize('parallel', ['gather', 'virtual'])
+@pytest.mark.parametrize('parallel', handler_options)
 def test_spherical_output(Nphi, Ntheta, Nr, k, dealias, dtype, basis, output_scales, parallel):
     # Basis
     c, d, b, phi, theta, r, x, y, z = basis(Nphi, Ntheta, Nr, k, dealias, dtype)