np.float -> float np.complex-> complex

Author: mikaem

examples/darray.py

@@ -6,7 +6,7 @@
 # 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 = DistArray(N, dtype=float, alignment=0)
 z0[:] = np.random.randint(0, 10, z0.shape)
 s0 = MPI.COMM_WORLD.allreduce(np.sum(z0))
 z1 = z0.redistribute(2)

mpi4py_fft/distarray.py

@@ -55,7 +55,7 @@ class DistArray(np.ndarray):
     axis will be aligned, also when rank>0.
 
     """
-    def __new__(cls, global_shape, subcomm=None, val=None, dtype=np.float,
+    def __new__(cls, global_shape, subcomm=None, val=None, dtype=float,
                 buffer=None, alignment=None, rank=0):
         if len(global_shape[rank:]) < 2: # 1D case
             obj = np.ndarray.__new__(cls, global_shape, dtype=dtype, buffer=buffer)

mpi4py_fft/io/nc_file.py

@@ -54,7 +54,7 @@ def __init__(self, ncname, domain=None, mode='a', clobber=True, **kw):
         self.dims = None
         if 'time' not in self.f.variables:
             self.f.createDimension('time', None)
-            self.f.createVariable('time', np.float, ('time'))
+            self.f.createVariable('time', float, ('time'))
         self.close()
 
     def _check_domain(self, group, field):
@@ -77,15 +77,15 @@ def _check_domain(self, group, field):
             self.dims.append(ind)
             if not ind in self.f.variables:
                 self.f.createDimension(ind, field.dimensions)
-                n = self.f.createVariable(ind, np.float, (ind))
+                n = self.f.createVariable(ind, float, (ind))
                 n[:] = np.arange(field.dimensions)
 
         for i in range(field.dimensions):
             xyz = 'xyzrst'[i]
             self.dims.append(xyz)
             if not xyz in self.f.variables:
                 self.f.createDimension(xyz, N[i])
-                nc_xyz = self.f.createVariable(xyz, np.float, (xyz))
+                nc_xyz = self.f.createVariable(xyz, float, (xyz))
                 nc_xyz[:] = self.domain[i]
 
         self.f.sync()

mpi4py_fft/mpifft.py

@@ -248,7 +248,7 @@ def __init__(self, comm, shape=None, axes=None, dtype=float, grid=None,
                 assert len(padding) == len(shape)
                 for ax in axes:
                     if len(ax) == 1 and padding[ax[0]] > 1.0+1e-6:
-                        old = np.float(shape[ax[0]])
+                        old = float(shape[ax[0]])
                         shape[ax[0]] = int(np.floor(shape[ax[0]]*padding[ax[0]]))
                         padding[ax[0]] = shape[ax[0]] / old
 

mpi4py_fft/pencil.py

@@ -138,8 +138,8 @@ class Transfer(object):
     ... axis = 2
     ... p0 = Pencil(subcomms, N, axis)
     ... p1 = p0.pencil(0)
-    ... transfer = p0.transfer(p1, np.float)
-    ... a0 = np.zeros(p0.subshape, dtype=np.float)
+    ... transfer = p0.transfer(p1, float)
+    ... a0 = np.zeros(p0.subshape, dtype=float)
     ... a1 = np.zeros(p1.subshape)
     ... a0[:] = np.random.random(a0.shape)
     ... transfer.forward(a0, a1)

tests/test_io.py

@@ -26,8 +26,8 @@ def test_2D(backend, forward_output):
         assert forward_output is False
     T = PFFT(comm, (N[0], N[1]))
     for i, domain in enumerate([None, ((0, np.pi), (0, 2*np.pi)),
-                                (np.arange(N[0], dtype=np.float)*1*np.pi/N[0],
-                                 np.arange(N[1], dtype=np.float)*2*np.pi/N[1])]):
+                                (np.arange(N[0], dtype=float)*1*np.pi/N[0],
+                                 np.arange(N[1], dtype=float)*2*np.pi/N[1])]):
         for rank in range(3):
             filename = "".join(('test2D_{}{}{}'.format(ex[i == 0], ex[forward_output], rank),
                                 ending[backend]))
@@ -66,9 +66,9 @@ def test_3D(backend, forward_output):
         assert forward_output is False
     T = PFFT(comm, (N[0], N[1], N[2]))
     d0 = ((0, np.pi), (0, 2*np.pi), (0, 3*np.pi))
-    d1 = (np.arange(N[0], dtype=np.float)*1*np.pi/N[0],
-          np.arange(N[1], dtype=np.float)*2*np.pi/N[1],
-          np.arange(N[2], dtype=np.float)*3*np.pi/N[2])
+    d1 = (np.arange(N[0], dtype=float)*1*np.pi/N[0],
+          np.arange(N[1], dtype=float)*2*np.pi/N[1],
+          np.arange(N[2], dtype=float)*3*np.pi/N[2])
     for i, domain in enumerate([None, d0, d1]):
         for rank in range(3):
             filename = ''.join(('test_{}{}{}'.format(ex[i == 0], ex[forward_output], rank),
@@ -129,10 +129,10 @@ def test_4D(backend, forward_output):
         assert forward_output is False
     T = PFFT(comm, (N[0], N[1], N[2], N[3]))
     d0 = ((0, np.pi), (0, 2*np.pi), (0, 3*np.pi), (0, 4*np.pi))
-    d1 = (np.arange(N[0], dtype=np.float)*1*np.pi/N[0],
-          np.arange(N[1], dtype=np.float)*2*np.pi/N[1],
-          np.arange(N[2], dtype=np.float)*3*np.pi/N[2],
-          np.arange(N[3], dtype=np.float)*4*np.pi/N[3]
+    d1 = (np.arange(N[0], dtype=float)*1*np.pi/N[0],
+          np.arange(N[1], dtype=float)*2*np.pi/N[1],
+          np.arange(N[2], dtype=float)*3*np.pi/N[2],
+          np.arange(N[3], dtype=float)*4*np.pi/N[3]
          )
     for i, domain in enumerate([None, d0, d1]):
         for rank in range(3):