Merge pull request #288 from mfem/numpy2_dev

Fix depercation warnings with Numpy 2.

Author: sshiraiwa

mfem/_par/coefficient.i

@@ -53,7 +53,7 @@ namespace mfem {
 %pythonprepend MatrixConstantCoefficient::MatrixConstantCoefficient(const DenseMatrix &m) %{
    try:
       import numpy as np
-      value = np.array(m, copy=False, dtype=float)
+      value = np.asarray(m, dtype=float)
       can_np_array = True
    except:
       can_np_array = False
@@ -68,7 +68,7 @@ namespace mfem {
 %pythonprepend VectorConstantCoefficient::VectorConstantCoefficient(const Vector &v) %{
    try:
       import numpy as np
-      value = np.array(v, copy=False, dtype=float).flatten()
+      value = np.asarray(v, dtype=float).flatten()
       can_np_array = True
    except:
       can_np_array = False

mfem/_par/mesh.i

@@ -269,7 +269,7 @@ def FindPoints(self, pp, warn=True, inv_trans=None):
     import numpy as np
     import mfem.par as mfem
 
-    pp = np.array(pp, copy=False, dtype=float).transpose()
+    pp = np.asarray(pp, dtype=float).transpose()
     M = mfem.DenseMatrix(pp.shape[0], pp.shape[1])
     M.Assign(pp)
     elem_ids = mfem.intArray()

mfem/_ser/coefficient.i

@@ -52,7 +52,7 @@ namespace mfem {
 %pythonprepend MatrixConstantCoefficient::MatrixConstantCoefficient(const DenseMatrix &m) %{
    try:
       import numpy as np
-      value = np.array(m, copy=False, dtype=float)
+      value = np.asarray(m, dtype=float)
       can_np_array = True
    except:
       can_np_array = False
@@ -67,7 +67,7 @@ namespace mfem {
 %pythonprepend VectorConstantCoefficient::VectorConstantCoefficient(const Vector &v) %{
    try:
       import numpy as np
-      value = np.array(v, copy=False, dtype=float).flatten()
+      value = np.asarray(v, dtype=float).flatten()
       can_np_array = True
    except:
       can_np_array = False

mfem/_ser/mesh.i

@@ -274,7 +274,7 @@ def FindPoints(self, pp, warn=True, inv_trans=None):
     import numpy as np
     import mfem.ser as mfem
 
-    pp = np.array(pp, copy=False, dtype=float).transpose()
+    pp = np.asarray(pp, dtype=float).transpose()
     M = mfem.DenseMatrix(pp.shape[0], pp.shape[1])
     M.Assign(pp)
     elem_ids = mfem.intArray()

mfem/common/findpoints.py

@@ -28,7 +28,7 @@ def do_findpoints(mesh, *args):
     return v, elem_id, ips
 
 def eval_at_points(gf, *args):
-    args = [np.atleast_1d(np.array(t, copy=False)) for t in args]    
+    args = [np.atleast_1d(np.asarray(t)) for t in args]
     mesh = gf.FESpace().Mesh()
     v, elem_id, ips = findpoints(mesh, *args)
 
@@ -45,6 +45,6 @@ def findpoints(mesh, *args):
     elif len(args) != 1 and sdim == 1:
         assert False, "SpaceDimension = 3, pass x"
     else:
-        args = [np.atleast_1d(np.array(t, copy=False)) for t in args]                
+        args = [np.atleast_1d(np.array(t)) for t in args]
         return do_findpoints(mesh, *args)
 

mfem/common/parcsr_extra.py

@@ -504,7 +504,7 @@ def ResetHypreDiag(M, idx, value=1.0):
               np.min(jcn),  np.max(jcn), (m, n))
         raise
 
-    idx = np.array(idx, dtype=int, copy=False)
+    idx = np.asarray(idx, dtype=int)
     ii = idx[np.logical_and(idx >= ilower, idx <= iupper)]
     mat[ii-ilower, ii] = value
     # for ii in idx:
@@ -529,7 +529,7 @@ def ResetHypreRow(M, idx):
     n = M.N()
     from scipy.sparse import coo_matrix, lil_matrix
 
-    k = np.in1d(irn, idx)
+    k = np.isin(irn, idx)
     data[k] = 0.0
 
     mat = coo_matrix((data, (irn-ilower, jcn)), shape=(m, n)).tocsr()
@@ -553,7 +553,7 @@ def ResetHypreCol(M, idx):
     n = M.N()
     from scipy.sparse import coo_matrix, lil_matrix
 
-    k = np.in1d(jcn, idx)
+    k = np.isin(jcn, idx)
     data[k] = 0.0
 
     mat = coo_matrix((data, (irn-ilower, jcn)), shape=(m, n)).tocsr()
@@ -583,7 +583,7 @@ def ReadHypreDiag(M, idx):
               np.min(jcn),  np.max(jcn), (m, n))
         raise
 
-    idx = np.array(idx, dtype=int, copy=False)
+    idx = np.asarray(idx, dtype=int)
     ii = idx[np.logical_and(idx >= ilower, idx <= iupper)]
 
     tmp = mat[ii-ilower, ii].toarray().flatten()