parallel-sparse-tools 0.2.2__tar.gz → 0.2.4__tar.gz

{parallel_sparse_tools-0.2.2 → parallel_sparse_tools-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: parallel-sparse-tools
-Version: 0.2.2
+Version: 0.2.4
 Summary: My package description
 Author-email: Phillip Weinberg <weinbe58@gmail.com>
 License: BSD-3-Clause
@@ -8,15 +8,16 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: <3.13,>=3.9
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <3.15,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=2.0.0
 Requires-Dist: scipy>=1.13.0
+Dynamic: license-file
 
 [![codecov](https://codecov.io/gh/QuSpin/parallel-sparse-tools/graph/badge.svg?token=1OECNN8334)](https://codecov.io/gh/QuSpin/parallel-sparse-tools)
 # parallel-sparse-tools

{parallel_sparse_tools-0.2.2 → parallel_sparse_tools-0.2.4}/pyproject.toml

@@ -1,26 +1,26 @@
 [build-system]
-requires = ["setuptools", "wheel", "Cython", "numpy"]
+requires = ["setuptools>=64", "wheel", "Cython>3.1", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "parallel-sparse-tools"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
     {name = "Phillip Weinberg", email = "weinbe58@gmail.com"},
 ]
 description = "My package description"
 readme = "README.md"
-requires-python = ">=3.9,<3.13"
+requires-python = ">=3.11,<3.15"
 license = {text = "BSD-3-Clause"}
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS",
     "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
     "numpy>=2.0.0",
@@ -28,13 +28,26 @@ dependencies = [
 ]
 
 
+[tool.pdm.dev-dependencies]
+dev = [
+    "pytest>=8.3.1",
+]
+ 
+[tool.pdm.scripts]
+_.env_file = "./.env"
+upload = "python -m twine upload -r bloqade dist/*"
+build = {cmd = "pdm build"}
+publish = {composite = ["build", "upload"]}
+test = {shell = "pytest -x"}
+
+
 [tool.cibuildwheel]
 skip = ""
 
 build-frontend = "default"
 config-settings = {}
 dependency-versions = "pinned"
-environment = {}
+#environment = {}
 environment-pass = []
 build-verbosity = 1
 
@@ -49,14 +62,14 @@ test-extras = []
 
 container-engine = "docker"
 
-manylinux-x86_64-image = "manylinux2014"
-manylinux-i686-image = "manylinux2014"
-manylinux-aarch64-image = "manylinux2014"
-manylinux-ppc64le-image = "manylinux2014"
-manylinux-s390x-image = "manylinux2014"
-manylinux-pypy_x86_64-image = "manylinux2014"
-manylinux-pypy_i686-image = "manylinux2014"
-manylinux-pypy_aarch64-image = "manylinux2014"
+manylinux-x86_64-image = "manylinux_2_28"
+manylinux-i686-image = "manylinux_2_28"
+manylinux-aarch64-image = "manylinux_2_28"
+manylinux-ppc64le-image = "manylinux_2_28"
+manylinux-s390x-image = "manylinux_2_28"
+manylinux-pypy_x86_64-image = "manylinux_2_28"
+manylinux-pypy_i686-image = "manylinux_2_28"
+manylinux-pypy_aarch64-image = "manylinux_2_28"
 
 musllinux-x86_64-image = "musllinux_1_2"
 musllinux-i686-image = "musllinux_1_2"
@@ -71,7 +84,10 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
 
 [tool.cibuildwheel.macos]
 archs = ["native"]
+before-all = "brew install libomp"
+environment = {MACOSX_DEPLOYMENT_TARGET = "15.0"}
 repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
 
+
 [tool.cibuildwheel.windows]
 archs = ["native"]

{parallel_sparse_tools-0.2.2 → parallel_sparse_tools-0.2.4}/setup.py

@@ -8,16 +8,36 @@ import subprocess
 import numpy as np
 
 
+def _find_libomp():
+    """Find libomp include and lib dirs on macOS. Returns (include_dir, lib_dir) or raises."""
+    # Common locations: Homebrew on Apple Silicon, Homebrew on Intel, MacPorts, conda
+    candidates = [
+        "/opt/homebrew/opt/libomp",   # Homebrew on Apple Silicon
+        "/usr/local/opt/libomp",      # Homebrew on Intel
+        "/opt/local",                  # MacPorts
+        os.environ.get("LIBOMP_PREFIX", ""),  # user-specified override
+    ]
+    for prefix in candidates:
+        if prefix and os.path.isfile(os.path.join(prefix, "include", "omp.h")):
+            return os.path.join(prefix, "include"), os.path.join(prefix, "lib")
+
+    raise RuntimeError(
+        "\n\nCould not find libomp, which is required to build parallel-sparse-tools on macOS.\n"
+        "Install it with:  brew install libomp\n"
+        "Or set the LIBOMP_PREFIX environment variable to your libomp installation directory.\n"
+    )
+
+
 def extra_compile_args() -> List[str]:
+
     if sys.platform in ["win32", "cygwin", "win64"]:
         extra_compile_args = ["/openmp", "/std:c++17"]
-    if sys.platform in ["darwin"]:
+
+    elif sys.platform == "darwin":
+        include_dir, _ = _find_libomp()
         extra_compile_args = [
-            "-DLLVM_ENABLE_PROJECTS",
-            "-Xpreprocessor",
-            "-fopenmp-version=50"
-            "-fopenmp",
-            "--std=c++17",
+            "-Xpreprocessor", "-fopenmp", "--std=c++17",
+            f"-I{include_dir}",
         ]
     else:
         extra_compile_args = ["-fopenmp", "--std=c++17"]
@@ -40,13 +60,9 @@ def extra_compile_args() -> List[str]:
 def extra_link_args() -> List[str]:
     if sys.platform in ["win32", "cygwin", "win64"]:
         extra_link_args = ["/openmp"]
-    if sys.platform in ["darwin"]:
-        extra_link_args = [
-            "-DLLVM_ENABLE_PROJECTS",
-            "-Xpreprocessor",
-            "-fopenmp-version=50"
-            "-fopenmp",
-        ]
+    elif sys.platform == "darwin":
+        _, lib_dir = _find_libomp()
+        extra_link_args = ["-lomp", f"-L{lib_dir}"]
     else:
         extra_link_args = ["-fopenmp"]
 
@@ -124,4 +140,4 @@ setup(
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     ext_modules=ext_modules,
-)
+)

parallel_sparse_tools-0.2.4/src/parallel_sparse_tools/__init__.py

@@ -0,0 +1 @@
+from ._version import __version__ as __version__

parallel_sparse_tools-0.2.4/src/parallel_sparse_tools/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.4"

{parallel_sparse_tools-0.2.2 → parallel_sparse_tools-0.2.4}/src/parallel_sparse_tools/expm_multiply_parallel_core/expm_multiply_parallel_core.py

@@ -234,7 +234,6 @@ class ExpmMultiplyParallel(object):
         else:
             tol = _np.array(self._tol, dtype=mu.real.dtype)
         if v.ndim == 1:
-            print(a.dtype, tol.dtype, mu.dtype, v.dtype, work_array.dtype)
             _wrapper_expm_multiply(
                 self._A.indptr,
                 self._A.indices,