utilities -> io

Author: mikaem

examples/darray.py

@@ -4,8 +4,8 @@
 from mpi4py_fft.distarray import DistArray, newDistArray, Function
 from mpi4py_fft.mpifft import PFFT
 
-# Test DistArray. Start with alignment in axis 0, then tranfer to 1 and
-# finally to 2
+# Test DistArray. Start with alignment in axis 0, then tranfer to 2 and
+# finally to 1
 N = (16, 14, 12)
 z0 = DistArray(N, dtype=np.float, alignment=0)
 z0[:] = np.random.randint(0, 10, z0.shape)
@@ -24,8 +24,7 @@
 s0, s1 = np.linalg.norm(z2), np.linalg.norm(z2c)
 assert abs(s0-s1) < 1e-12, s0-s1
 
-print(z3.get_global_slice((5, 4, 5)))
-
+print(z3.get((5, 4, 5)))
 print(z3.local_slice(), z3.substart, z3.commsizes)
 
 v0 = newDistArray(fft, forward_output=False, rank=1)
@@ -51,18 +50,17 @@
 s0, s1 = np.linalg.norm(v0c), np.linalg.norm(v0)
 assert abs(s0-s1) < 1e-12
 
-
 N = (6, 6, 6)
 z = DistArray(N, dtype=float, alignment=0)
 z[:] = MPI.COMM_WORLD.Get_rank()
-g = z.get_global_slice((0, slice(None), 0))
+g = z.get((0, slice(None), 0))
 if MPI.COMM_WORLD.Get_rank() == 0:
     print(g)
 
 z2 = DistArray(N, dtype=float, alignment=2)
 z.redistribute(darray=z2)
 
-g = z2.get_global_slice((0, slice(None), 0))
+g = z2.get((0, slice(None), 0))
 if MPI.COMM_WORLD.Get_rank() == 0:
     print(g)
 

mpi4py_fft/__init__.py

@@ -22,4 +22,4 @@
 from .distarray import DistArray, newDistArray, Function
 from .mpifft import PFFT
 from . import fftw
-from .utilities import HDF5File, NCFile, generate_xdmf
+from .io import HDF5File, NCFile, generate_xdmf

mpi4py_fft/distarray.py

@@ -157,7 +157,7 @@ def v(self):
         """ Return local ``self`` array as an ``ndarray`` object"""
         return self.__array__()
 
-    def get_global_slice(self, gslice):
+    def get(self, gslice):
         """Return global slice of ``self``
 
         Parameters
@@ -182,7 +182,7 @@ def get_global_slice(self, gslice):
         ... N = (6, 6, 6)
         ... z = DistArray(N, dtype=float, alignment=0)
         ... z[:] = comm.Get_rank()
-        ... g = z.get_global_slice((0, slice(None), 0))
+        ... g = z.get((0, slice(None), 0))
         ... if comm.Get_rank() == 0:
         ...     print(g)''')
         >>> fx.close()

mpi4py_fft/utilities/__init__.py renamed to mpi4py_fft/io/__init__.py

@@ -96,7 +96,7 @@ def version():
           url='https://bitbucket.org/mpi4py/mpi4py-fft',
           packages=["mpi4py_fft",
                     "mpi4py_fft.fftw",
-                    "mpi4py_fft.utilities"],
+                    "mpi4py_fft.io"],
           package_dir={"mpi4py_fft": "mpi4py_fft"},
           classifiers=[
               'Development Status :: 4 - Beta',

mpi4py_fft/utilities/file_base.py renamed to mpi4py_fft/io/file_base.py

@@ -27,11 +27,11 @@ def test_2Darray():
                 assert a0.rank == rank-1
             aa = a.v
             assert isinstance(aa, np.ndarray)
-            k = a.get_global_slice((0,)*rank+(0, slice(None)))
+            k = a.get((0,)*rank+(0, slice(None)))
             if comm.Get_rank() == 0:
                 assert len(k) == N[1]
                 assert np.sum(k) == N[1]
-            k = a.get_global_slice((0,)*rank+(slice(None), 0))
+            k = a.get((0,)*rank+(slice(None), 0))
             if comm.Get_rank() == 0:
                 assert len(k) == N[0]
                 assert np.sum(k) == N[0]
@@ -72,11 +72,11 @@ def test_3Darray():
                 assert a0.rank == 0
             aa = a.v
             assert isinstance(aa, np.ndarray)
-            k = a.get_global_slice((0,)*rank+(0, 0, slice(None)))
+            k = a.get((0,)*rank+(0, 0, slice(None)))
             if comm.Get_rank() == 0:
                 assert len(k) == N[2]
                 assert np.sum(k) == N[2]
-            k = a.get_global_slice((0,)*rank+(slice(None), 0, 0))
+            k = a.get((0,)*rank+(slice(None), 0, 0))
             if comm.Get_rank() == 0:
                 assert len(k) == N[0]
                 assert np.sum(k) == N[0]