vegas 6.2__cp310-cp310-macosx_11_0_arm64.whl → 6.3__cp310-cp310-macosx_11_0_arm64.whl

vegas/_vegas.pxd

@@ -1,6 +1,6 @@
 # cython: language_level=3
 # Created by G. Peter Lepage (Cornell University) in 12/2013.
-# Copyright (c) 2013-22 G. Peter Lepage.
+# Copyright (c) 2013-25 G. Peter Lepage.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,11 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-cimport numpy
-numpy.import_array()
-# index type for numpy is numpy.npy_intp (signed)
-# -- same as numpy.intp_t and Py_ssize_t (usually) in Cython
-
 cdef class LBatchIntegrand:
     cdef public object fcn
 
@@ -27,25 +22,26 @@ cdef class AdaptiveMap:
     # first index is direction, second is increment
     cdef readonly double[:, ::1] grid
     cdef readonly double[:, ::1] inc
-    cdef readonly numpy.npy_intp[::1] ninc
+    cdef readonly Py_ssize_t[::1] ninc
     cdef public double[:, ::1] sum_f
     cdef public double[:, ::1] n_f
 
-    cpdef map(self, double[:, ::1] y, double[:, ::1] x, double[::1] J, numpy.npy_intp ny=*)
-    cpdef invmap(self, double[:, ::1] x, double[:, ::1] y, double[::1] J, numpy.npy_intp nx=*)
-    cpdef add_training_data(self, double[:, ::1] y, double[::1] f, numpy.npy_intp ny=*)
+    cpdef map(self, double[:, ::1] y, double[:, ::1] x, double[::1] J, Py_ssize_t ny=*)
+    cpdef invmap(self, double[:, ::1] x, double[:, ::1] y, double[::1] J, Py_ssize_t nx=*)
+    cpdef add_training_data(self, double[:, ::1] y, double[::1] f, Py_ssize_t ny=*)
 
 cdef class Integrator:
     # inputs
-    cdef public numpy.npy_intp neval
-    cdef public numpy.npy_intp[::1] neval_hcube_range
-    cdef public numpy.npy_intp min_neval_batch
-    cdef public numpy.npy_intp maxinc_axis
-    cdef public numpy.npy_intp max_neval_hcube
+    cdef public Py_ssize_t neval
+    cdef public Py_ssize_t[::1] neval_hcube_range
+    cdef public Py_ssize_t min_neval_batch
+    cdef public Py_ssize_t maxinc_axis
+    cdef public Py_ssize_t max_neval_hcube
+    cdef public bint gpu_pad
     cdef public double neval_frac
     cdef public double max_mem
-    cdef public numpy.npy_intp nitn
-    cdef public numpy.npy_intp nproc
+    cdef public Py_ssize_t nitn
+    cdef public Py_ssize_t nproc
     cdef public double alpha
     cdef public double rtol
     cdef public double atol
@@ -61,22 +57,22 @@ cdef class Integrator:
     cdef public bint uses_jac
     cdef public str save 
     cdef public str saveall
-    cdef readonly numpy.npy_intp[::1] nstrat
+    cdef readonly Py_ssize_t[::1] nstrat
     cdef readonly object xsample
     # generated
     cdef readonly AdaptiveMap map
     cdef readonly object pool
     cdef readonly double sum_sigf
-    cdef readonly numpy.npy_intp dim
-    cdef readonly numpy.npy_intp last_neval
-    cdef readonly numpy.npy_intp min_neval_hcube
-    cdef readonly numpy.npy_intp nhcube
+    cdef readonly Py_ssize_t dim
+    cdef readonly Py_ssize_t last_neval
+    cdef readonly Py_ssize_t min_neval_hcube
+    cdef readonly Py_ssize_t nhcube
     # internal work areas
     cdef double[:, ::1] y
     cdef double[:, ::1] x
     cdef double[::1] jac
     cdef double[::1] fdv2
-    cdef numpy.npy_intp[::1] neval_hcube
+    cdef Py_ssize_t[::1] neval_hcube
     # the following depend upon whether minimize_mem is False or True
     cdef readonly object sigf       # numpy array or h5py Dataset
     cdef readonly object sigf_h5    # None or h5py file