basil-core 1.2.2__tar.gz → 1.3.0__tar.gz

{basil_core-1.2.2 → basil_core-1.3.0}/MANIFEST.in

@@ -11,6 +11,7 @@ include src/basil_core/stats/_relative_entropy.c
 include src/basil_core/stats/_schechter.c
 include src/basil_core/astro/orbit/_GW.c
 include src/basil_core/astro/orbit/_DWD_RLOF.c
+include src/basil_core/astro/orbit/_white_dwarf.c
 include src/basil_core/astro/orbit/_kepler.c
 include src/basil_core/astro/_basil_core_astro_const.h
 include src/basil_core/c_utils/dbg.h

{basil_core-1.2.2 → basil_core-1.3.0}/Makefile

@@ -4,7 +4,7 @@ all: tests
 
 ######## Setup ########
 
-VERSION = 1.2.2
+VERSION = 1.3.0
 DIST=dist/basil_core-${VERSION}.tar.gz
 version: clean
 	sed --in-place "s/version = .*/version = \"${VERSION}\"/g" pyproject.toml
@@ -16,14 +16,21 @@ HERE=$(shell pwd)
 WHL=wheelhouse
 LOCAL_WHEELS=${HERE}/local-wheels
 
+FREETHREADED := $(shell python3 -c "import sysconfig; print(sysconfig.get_config_var('Py_GIL_DISABLED') or 0)")
+ifeq ($(FREETHREADED),1)
+	NOLIMITED	= -Dpython.allow_limited_api=false
+	BUILD_OPTS 	= -C setup-args=$(NOLIMITED)
+	PIP_OPTS	= --config-settings=setup-args=$(NOLIMITED)
+endif
+
 ######## Installation ########
 $(DIST): clean version
 	- git add src meson.build __version__.py
 	- git commit
-	python3 -m build
+	python3 -m build $(BUILD_OPTS)
 
 install: $(DIST)
-	python3 -m pip install $(DIST)
+	python3 -m pip install $(DIST) $(PIP_OPTS)
 
 testpypi: tests
 	python3 -m twine upload --repository testpypi $(DIST)
@@ -87,8 +94,8 @@ test_relations: install
 	mkdir -p ${EXAMPLE_LOCATION}/data
 	python3 ${EXAMPLE_LOCATION}/tests/test_relations.py
 
-tests: test_coordinates test_distance test_cosmology_distance test_orbit test_random test_callister test_indexer test_schechter
-#tests: test_coordinates test_distance test_orbit test_random test_callister test_corner test_indexer test_schechter
+tests: test_coordinates test_distance test_cosmology_distance test_orbit test_callister test_indexer test_schechter
+#tests: test_coordinates test_distance test_cosmology_distance test_orbit test_random test_callister test_indexer test_schechter
 
 ######## Clean ########
 clean:

{basil_core-1.2.2 → basil_core-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: basil_core
-Version: 1.2.2
+Version: 1.3.0
 Summary: BASIL-CORE: Bayesian Analytic Sampling and Integrating Library - Compiled and low-dependency utilities
 Keywords: Gravitational Wave,Bayesian Inference
 Author-Email: "V. Delfavero" <vdfavero@cita.utoronto.ca>
@@ -15,16 +15,12 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Project-URL: Homepage, https://gitlab.com/xevra/basil-core
 Project-URL: Bug tracker, https://gitlab.com/xevra/basil-core/issues
-Requires-Python: >=3.12
-Requires-Dist: h5py>=2.7.0
-Requires-Dist: numpy<2.4.0,>=2.0
-Requires-Dist: matplotlib>=2.2.4
-Requires-Dist: scipy>=1.5.0
-Requires-Dist: six>=1.10.0
-Requires-Dist: fast_histogram>=0.10
-Requires-Dist: xev-data>=0.1.1
+Requires-Python: <3.15,>=3.9
+Requires-Dist: h5py>=3.11
+Requires-Dist: numpy<2.6.0,>=1.19.0
+Requires-Dist: matplotlib>=3.8
+Requires-Dist: scipy>=1.11.0
 Requires-Dist: astropy>=6.0
-Requires-Dist: pathlib
 Description-Content-Type: text/markdown
 
 # Basil Core

basil_core-1.3.0/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.3.0'

{basil_core-1.2.2 → basil_core-1.3.0}/meson.build

@@ -1,12 +1,13 @@
 project('basil_core',
     'c',
-    version: '1.2.2',
+    version: '1.3.0',
     default_options: ['warning_level=2', 'optimization=3', 'c_std=c99'],
-    meson_version: '>=0.64.0',
+    meson_version: '>=1.3.0',
 )
 
 py = import('python').find_installation(pure: false)
 numpy_dep = dependency('numpy')
+add_project_arguments('-DNPY_TARGET_VERSION=NPY_1_19_API_VERSION', language: 'c')
 
 # Include directories
 inc_dirs = [

{basil_core-1.2.2 → basil_core-1.3.0}/pyproject.toml

@@ -1,18 +1,24 @@
 [build-system]
 requires = [
             "meson-python>=0.13.0",
-            "meson>=0.64.0",
+            "meson>=1.3.0",
             "wheel",
-            "numpy",
+            "numpy>=2.0",
            ]
 build-backend = 'mesonpy'
 
+[tool.meson-python]
+limited-api = true
+
 [tool.meson-python.args]
 setup = ["--warnlevel=2"]
 
 [tool.cibuildwheel]
-# Disable free-threading builds on all platforms
-skip = "cp3??t-*"
+build = "cp39-* cp314t-*"
+
+[[tool.cibuildwheel.overrides]]
+select = "*t-*"
+config-settings = { setup-args = "-Dpython.allow_limited_api=false" }
 
 [project]
 name = "basil_core"
@@ -26,7 +32,7 @@ maintainers = [
 ]
 license = {text = "MIT License"}
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.9,<3.15"
 keywords = ["Gravitational Wave", "Bayesian Inference"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -38,15 +44,13 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Information Analysis",
 ]
 dependencies = [
-    "h5py>=2.7.0",
-    "numpy>=2.0,<2.4.0",
-    "matplotlib>=2.2.4",
-    "scipy>=1.5.0",
-    "six>=1.10.0",
-    "fast_histogram>=0.10",
-    "xev-data>=0.1.1",
+    "h5py>=3.11",
+    "numpy>=1.19.0,<2.6.0",
+    "matplotlib>=3.8",
+    "scipy>=1.11.0",
+    #"fast_histogram>=0.12",
+    #"xev-data>=0.1.8",
     "astropy>=6.0",
-    "pathlib",
 ]
 
 [project.urls]

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/__init__.py

@@ -1 +1,2 @@
 from basil_core.__version__ import __version__
+from basil_core.units import allow_units

basil_core-1.3.0/src/basil_core/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.3.0'

basil_core-1.3.0/src/basil_core/array_tools/__init__.py

@@ -0,0 +1,2 @@
+from basil_core.array_tools.indexer import *
+from basil_core.array_tools.array_item import *

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/array_tools/_indexer.c

@@ -1,10 +1,10 @@
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
 #include "dbg.h"
+#include "basil_module.h"
 
 /* Define docstrings */
 static char module_docstring[] = "an array indexer for xevra";
@@ -43,34 +43,10 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_indexer)
-{
-    PyObject *m;
-    MOD_DEF(m, "_indexer", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _indexer_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_indexer, module_docstring, module_methods)
 
 /* Begin the function definitions */
-
 static PyObject *_unique_array_index64(PyObject *self, PyObject *args) {
 
     // n will be used to describe the length of the

basil_core-1.3.0/src/basil_core/array_tools/array_item.py

@@ -0,0 +1,26 @@
+"""Compatibility with NumPy 2.4.0
+
+Solves most of the depracation issues for newer versions of NumPy
+"""
+# Import numpy
+import numpy as np
+
+def unwrap(x):
+    """Python ternary operator"""
+    # It is your own fault if you make a pointer loop
+    return unwrap(x.item()) if hasattr(x, 'item') else x
+
+def as_float(x):
+    return float(unwrap(x))
+
+def as_int(x):
+    return int(unwrap(x))
+
+def is_scalar(x):
+    """True for python/numpy data structures with a single value"""
+    return (
+        not hasattr(x, '__len__') or \
+        (hasattr(x, 'size') and x.size == 1) or \
+        (len(x) == 1) & is_scalar(x[0])
+    )
+

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/array_tools/meson.build

@@ -2,12 +2,14 @@
 py.install_sources([
     '__init__.py',
     'indexer.py',
+    'array_item.py',
 ], subdir: 'basil_core/array_tools')
 
 py.extension_module('_indexer',
     sources: ['_indexer.c'],
     include_directories: incdir,
     dependencies: [numpy_dep],
+    limited_api: '3.9',
     subdir: 'basil_core/array_tools',
     install: true,
 )

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/_basil_core_astro_const.h

@@ -7,7 +7,11 @@
 #define RSUN 6.957e8
 #define GGRAV 6.6743e-11 //Consistent with astropy
 #define CLIGHT 299792458
-#define CHANDRASEKHAR_MASS 1.4 * (MSUN)
-
+#define CHANDRASEKHAR_MASS (1.44 * (MSUN))
+#define M_P_WD 1.133393626297889e+27
+#define MYR_SEC 31557600000000
+#define GYR_SEC 31557600000000000
+#define SOL_LUM 3.828e+26
+#define SIGMA_SB 5.67037442e-08
 
 #endif

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/coordinates/_coordinates.c

@@ -1,10 +1,10 @@
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
 #include "dbg.h"
+#include "basil_module.h"
 
 /* Define docstrings */
 static char module_docstring[] = "Coordinate transformations for xevra";
@@ -44,31 +44,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_coordinates)
-{
-    PyObject *m;
-    MOD_DEF(m, "_coordinates", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _coordinates_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_coordinates, module_docstring, module_methods)
 
 /* Begin the function definitions */
 

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/coordinates/_spin.c

@@ -1,9 +1,10 @@
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
+#include "dbg.h"
+#include "basil_module.h"
 
 /* Define docstrings */
 static char module_docstring[] = "Coordinate transformations for spin";
@@ -54,31 +55,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_spin)
-{
-    PyObject *m;
-    MOD_DEF(m, "_spin", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _spin_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_spin, module_docstring, module_methods)
 
 /* Begin the function definitions */
 /* Chi effective from m1, m2, chi1z, chi2z */

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/coordinates/_tides.c

@@ -1,9 +1,10 @@
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
+#include "dbg.h"
+#include "basil_module.h"
 
 /* Define docstrings */
 static char module_docstring[] = "Coordinate transformations for tides";
@@ -53,31 +54,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_tides)
-{
-    PyObject *m;
-    MOD_DEF(m, "_tides", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _tides_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_tides, module_docstring, module_methods)
 
 /* Begin the function definitions */
 /* Chi effective from m1, m2, chi1z, chi2z */

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/coordinates/meson.build

@@ -9,6 +9,7 @@ py.extension_module('_coordinates',
     sources: ['_coordinates.c'],
     include_directories: incdir,
     dependencies: [numpy_dep],
+    limited_api: '3.9',
     subdir: 'basil_core/astro/coordinates',
     install: true,
 )
@@ -16,6 +17,7 @@ py.extension_module('_spin',
     sources: ['_spin.c'],
     include_directories: incdir,
     dependencies: [numpy_dep],
+    limited_api: '3.9',
     subdir: 'basil_core/astro/coordinates',
     install: true,
 )
@@ -23,6 +25,7 @@ py.extension_module('_tides',
     sources: ['_tides.c'],
     include_directories: incdir,
     dependencies: [numpy_dep],
+    limited_api: '3.9',
     subdir: 'basil_core/astro/coordinates',
     install: true,
 )

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/orbit/_DWD_RLOF.c

@@ -1,10 +1,10 @@
-#define NP_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
 #include "dbg.h"
+#include "basil_module.h"
 #include "_basil_core_astro_const.h"
 
 /* Define docstring */
@@ -47,31 +47,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_DWD_RLOF)
-{
-    PyObject *m;
-    MOD_DEF(m, "_DWD_RLOF", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _DWD_RLOF_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_DWD_RLOF, module_docstring, module_methods)
 
 /* Define other functions here */
 

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/orbit/_decay.c

@@ -1,10 +1,10 @@
-#define NP_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
 #include "dbg.h"
+#include "basil_module.h"
 #include "_basil_core_astro_const.h"
 
 /* Define docstring */
@@ -128,31 +128,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_decay)
-{
-    PyObject *m;
-    MOD_DEF(m, "_decay", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _decay_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_decay, module_docstring, module_methods)
 
 /* Define other functions here */
 

{basil_core-1.2.2 → basil_core-1.3.0}/src/basil_core/astro/orbit/_kepler.c

@@ -1,10 +1,10 @@
-#define NP_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define Py_LIMITED_API 0x030600f0
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 
 #include <Python.h>
 #include <numpy/arrayobject.h>
 #include <numpy/npy_math.h>
 #include "dbg.h"
+#include "basil_module.h"
 #include "_basil_core_astro_const.h"
 
 /* Define docstring */
@@ -38,31 +38,8 @@ static PyMethodDef module_methods[] = {
 
 /* This is the function that will call on import */
 
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_ERROR_VAL NULL
-    #define MOD_SUCCESS_VAL(val) val
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-        static struct PyModuleDef moduledef = { \
-          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-        ob = PyModule_Create(&moduledef);
-#else
-    #define MOD_ERROR_VAL
-    #define MOD_SUCCESS_VAL(val)
-    #define MOD_INIT(name) void init##name(void)
-    #define MOD_DEF(ob, name, doc, methods) \
-            ob = Py_InitModule3(name, methods, doc);
-#endif
-
-MOD_INIT(_kepler)
-{
-    PyObject *m;
-    MOD_DEF(m, "_kepler", module_docstring, module_methods);
-    if (m == NULL)
-        return MOD_ERROR_VAL;
-    import_array();
-    return MOD_SUCCESS_VAL(m);
-}
+static int _kepler_exec(PyObject *m) { (void)m; import_array1(-1); return 0; }
+BASIL_MODULE(_kepler, module_docstring, module_methods)
 
 /* Define other functions here */