Adding mpifft.destroy to some tests when cleaning up

Author: mikaem

mpi4py_fft/io/file_base.py

@@ -6,7 +6,7 @@
 comm = MPI.COMM_WORLD
 
 class FileBase(object):
-    """Base class for reading/writing structure arrays
+    """Base class for reading/writing distributed arrays
 
     Parameters
     ----------

mpi4py_fft/mpifft.py

@@ -323,7 +323,8 @@ def __init__(self, comm, shape=None, axes=None, dtype=float, slab=False,
             self.pencil[::-1])
 
     def destroy(self):
-        self.subcomm.destroy()
+        if isinstance(self.subcomm, Subcomm):
+            self.subcomm.destroy()
         for trans in self.transfer:
             trans.destroy()
 

tests/test_darray.py

@@ -107,17 +107,22 @@ def test_newDistArray():
         for view in (True, False):
             for rank in (0, 1, 2):
                 a = newDistArray(pfft, forward_output=forward_output,
-                              rank=rank, view=view)
+                                 rank=rank, view=view)
                 if view is False:
                     assert isinstance(a, DistArray)
                     assert a.rank == rank
                     if rank == 0:
                         qfft = PFFT(MPI.COMM_WORLD, darray=a)
                     elif rank == 1:
                         qfft = PFFT(MPI.COMM_WORLD, darray=a[0])
+                    else:
+                        qfft = PFFT(MPI.COMM_WORLD, darray=a[0, 0])
+                    qfft.destroy()
+
                 else:
                     assert isinstance(a, np.ndarray)
                     assert a.base.rank == rank
+    pfft.destroy()
 
 if __name__ == '__main__':
     test_1Darray()

tests/test_io.py

@@ -56,6 +56,7 @@ def test_2D(backend, forward_output):
             u0.read(filename, 'u', 2)
             u0.read(read, 'u', 2)
             assert np.allclose(u0, u)
+    T.destroy()
 
 def test_3D(backend, forward_output):
     if backend == 'netcdf4':
@@ -118,6 +119,7 @@ def test_3D(backend, forward_output):
             assert np.allclose(u0, u)
             read.read(u0, 'v', step=0)
             assert np.allclose(u0, v)
+    T.destroy()
 
 def test_4D(backend, forward_output):
     if backend == 'netcdf4':
@@ -153,6 +155,7 @@ def test_4D(backend, forward_output):
             assert np.allclose(u0, u)
             read.read(u0, 'v', step=0)
             assert np.allclose(u0, v)
+    T.destroy()
 
 if __name__ == '__main__':
     #pylint: disable=unused-import