Update for Python 3.12 and Numpy 2.0

gen/generate_coeffs.py

@@ -112,14 +112,14 @@ def reconstruction_coeff_functions(k):
        if (! PyArg_ParseTuple(args, "dliiOO", &xi, &i, &r, &k, &bndry, &coeffs))
        return NULL;
 
-       if ((PyArray_FLAGS(bndry) & NPY_IN_ARRAY) != NPY_IN_ARRAY) {
+       if ((PyArray_FLAGS(bndry) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) {
        PyErr_SetString(PyExc_TypeError, "bndry is not contiguous and/or aligned");
        return NULL;
        }
        Py_INCREF(bndry);
        x = (double *) PyArray_DATA(bndry);
 
-       if ((PyArray_FLAGS(coeffs) & NPY_IN_ARRAY) != NPY_IN_ARRAY) {
+       if ((PyArray_FLAGS(coeffs) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) {
        PyErr_SetString(PyExc_TypeError, "coeffs is not contiguous and/or aligned");
        return NULL;
        }

gen/weno_reconstruction.tmpl.c

@@ -34,12 +34,12 @@ py_weights_{{name}}(PyObject *self, PyObject *args)
   if (!PyArg_ParseTuple(args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) {
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "sigma must be two-dimensional and of type float");
     return NULL;
   }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE) {
+  if (omega_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "omega must be of type float");
     return NULL;
   }
@@ -108,12 +108,12 @@ py_reconstruct_{{name}}(PyObject *self, PyObject *args)
   if (!PyArg_ParseTuple(args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) {
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "f must be one-dimensional and of type float");
     return NULL;
   }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE) {
+  if (fr_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "fr must be of type float");
     return NULL;
   }
@@ -123,7 +123,7 @@ py_reconstruct_{{name}}(PyObject *self, PyObject *args)
     return NULL;
   }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE) {
+  if (omega_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "omega must be of type float");
     return NULL;
   }

gen/weno_smoothness.tmpl.c

@@ -33,13 +33,13 @@ py_{{name}} (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;

pyweno/version.py

@@ -5,24 +5,18 @@
      >>> import pyweno.version
      >>> pyweno.version.version()
      >>> pyweno.version.git_version()
+"""
 
-   """
-
-import imp
-import os
-
-def _version(name):
-    version_file = os.path.join(os.path.dirname(__file__), name + '.py')
-    version = imp.load_module('pyweno.pyweno.' + name,
-                              open(version_file),
-                              version_file,
-                              ('.py', 'U', 1))
-    return version.version
 
 def version():
     """Return current version."""
-    return _version('__version__')
+    from pyweno.__version__ import version as v
+
+    return v
+
 
 def git_version():
     """Return current *git* version (if available)."""
-    return _version('__git_version__')
+    from pyweno.__git_version__ import version as v
+
+    return v

setup.py

@@ -4,9 +4,8 @@
 import os
 import re
 
-from setuptools import setup, Extension
 import numpy as np
-
+from setuptools import setup, Extension
 
 ###############################################################################
 # version
@@ -64,6 +63,8 @@
     keywords     = "weno, interpolate, interpolation, finite, volume",
     url          = "http://readthedocs.org/docs/pyweno/en/latest/",
 
+    setup_requires = ["numpy"],
+    install_requires = ["numpy", "sympy"],
     ext_modules = [
         Extension('pyweno.ccoeffs',
                   sources = ['src/ccoeffs.c'] + glob.glob('src/coeffs*.c'),

src/ccoeffs.c

@@ -20,7 +20,7 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args)
   long int i;
   int r, k;
 
-  PyObject *bndry, *coeffs;
+  PyArrayObject *bndry, *coeffs;
 
   /*
    * parse options
@@ -29,15 +29,15 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "dliiOO", &xi, &i, &r, &k, &bndry, &coeffs))
     return NULL;
 
-  if ((PyArray_FLAGS (bndry) & NPY_IN_ARRAY) != NPY_IN_ARRAY)
+  if ((PyArray_FLAGS (bndry) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY)
     {
       PyErr_SetString (PyExc_TypeError, "bndry is not contiguous and/or aligned");
       return NULL;
     }
   Py_INCREF (bndry);
   x = (double *) PyArray_DATA (bndry);
 
-  if ((PyArray_FLAGS (coeffs) & NPY_IN_ARRAY) != NPY_IN_ARRAY)
+  if ((PyArray_FLAGS (coeffs) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY)
     {
       PyErr_SetString (PyExc_TypeError, "coeffs is not contiguous and/or aligned");
       return NULL;

src/nfweno.c

@@ -261,27 +261,27 @@ PyObject *py_nonuniform_coeffs(PyObject *self, PyObject *args)
   if (!PyArg_ParseTuple (args, "iOOOOO", &k, &xi_py, &x_py, &c_py, &beta_py, &varpi_py))
     return NULL;
 
-  if (x_py->nd != 1 || x_py->descr->type_num != PyArray_DOUBLE) {
+  if (x_py->nd != 1 || x_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "x must be one-dimensional and of type double");
     return NULL;
   }
 
-  if (xi_py->nd != 1 || xi_py->descr->type_num != PyArray_DOUBLE) {
+  if (xi_py->nd != 1 || xi_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "xi must be one-dimensional and of type double");
     return NULL;
   }
 
-  if (c_py->nd != 4 || c_py->descr->type_num != PyArray_DOUBLE) {
+  if (c_py->nd != 4 || c_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "c must be four-dimensional and of type double");
     return NULL;
   }
 
-  if (beta_py->nd != 4 || beta_py->descr->type_num != PyArray_DOUBLE) {
+  if (beta_py->nd != 4 || beta_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "beta must be four-dimensional and of type double");
     return NULL;
   }
 
-  if (varpi_py->nd != 3 || varpi_py->descr->type_num != PyArray_DOUBLE) {
+  if (varpi_py->nd != 3 || varpi_py->descr->type_num != NPY_DOUBLE) {
     PyErr_SetString(PyExc_ValueError, "varpi must be three-dimensional and of type double");
     return NULL;
   }

src/weno_gauss_legendre003002.c

@@ -55,13 +55,13 @@ py_weights_gauss_legendre003002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;
@@ -154,13 +154,13 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;
     }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE)
+  if (fr_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "fr must be of type float");
       return NULL;
@@ -172,7 +172,7 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args)
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;

src/weno_gauss_legendre003003.c

@@ -82,13 +82,13 @@ py_weights_gauss_legendre003003 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;
@@ -201,13 +201,13 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;
     }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE)
+  if (fr_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "fr must be of type float");
       return NULL;
@@ -219,7 +219,7 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args)
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;

src/weno_gauss_legendre004002.c

@@ -65,13 +65,13 @@ py_weights_gauss_legendre004002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;
@@ -173,13 +173,13 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;
     }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE)
+  if (fr_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "fr must be of type float");
       return NULL;
@@ -191,7 +191,7 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args)
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;

src/weno_gauss_legendre004004.c

@@ -99,13 +99,13 @@ py_weights_gauss_legendre004004 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;
@@ -244,13 +244,13 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;
     }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE)
+  if (fr_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "fr must be of type float");
       return NULL;
@@ -262,7 +262,7 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args)
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;

src/weno_gauss_legendre005002.c

@@ -74,13 +74,13 @@ py_weights_gauss_legendre005002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
     return NULL;
 
-  if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
+  if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;
@@ -204,13 +204,13 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args)
   if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
     return NULL;
 
-  if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
+  if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
       return NULL;
     }
 
-  if (fr_py->descr->type_num != PyArray_DOUBLE)
+  if (fr_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "fr must be of type float");
       return NULL;
@@ -222,7 +222,7 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args)
       return NULL;
     }
 
-  if (omega_py->descr->type_num != PyArray_DOUBLE)
+  if (omega_py->descr->type_num != NPY_DOUBLE)
     {
       PyErr_SetString (PyExc_ValueError, "omega must be of type float");
       return NULL;