scikit-sparse 0.4.13__tar.gz → 0.4.16__tar.gz

{scikit-sparse-0.4.13/scikit_sparse.egg-info → scikit_sparse-0.4.16}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: scikit-sparse
-Version: 0.4.13
+Version: 0.4.16
 Summary: Scikit sparse matrix package
 Home-page: https://github.com/scikit-sparse/scikit-sparse
 Maintainer: Aaron Johnson
-Maintainer-email: justin.ellis18@gmail.com
+Maintainer-email: aaron9035@gmail.com
 License: BSD
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16}/pyproject.toml

@@ -25,6 +25,13 @@ requires = [
     "setuptools>=40.8.0",
     "wheel",
     "Cython>=0.22",
-    'numpy>=1.13.3; python_version>="3.6"',
+    'numpy>=1.13.3; python_version=="3.6"',
+    'numpy>=1.14.5; python_version=="3.7"',
+    'numpy>=1.17.3; python_version=="3.8"',
+    'numpy>=2.0; python_version=="3.9"',
+    'numpy>=2.0; python_version=="3.10"',
+    'numpy>=2.0; python_version>="3.11"',
+    'numpy>=2.0; python_version>="3.12"',
+    'numpy>=2.0; python_version>="3.13"',
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16/scikit_sparse.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: scikit-sparse
-Version: 0.4.13
+Version: 0.4.16
 Summary: Scikit sparse matrix package
 Home-page: https://github.com/scikit-sparse/scikit-sparse
 Maintainer: Aaron Johnson
-Maintainer-email: justin.ellis18@gmail.com
+Maintainer-email: aaron9035@gmail.com
 License: BSD
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16}/setup.py

@@ -22,6 +22,7 @@ decomposition. Further contributions are welcome!
 """
 
 import os
+import subprocess
 import sys
 
 import numpy as np
@@ -32,22 +33,39 @@ DISTNAME = "scikit-sparse"
 DESCRIPTION = "Scikit sparse matrix package"
 LONG_DESCRIPTION = __doc__
 MAINTAINER = "Aaron Johnson"
-MAINTAINER_EMAIL = "justin.ellis18@gmail.com"
+MAINTAINER_EMAIL = "aaron9035@gmail.com"
 URL = "https://github.com/scikit-sparse/scikit-sparse"
 LICENSE = "BSD"
 
-
 INCLUDE_DIRS = [
     np.get_include(),
     sys.prefix + "/include",
     # Debian's suitesparse-dev installs to
     "/usr/include/suitesparse",
-    # Homebrew macos-latest installs to
-    '/usr/local/opt/suite-sparse/include/suitesparse/',
-]
-LIBRARY_DIRS = [# Homebrew macos-latest installs to
-                '/usr/local/opt/suite-sparse/lib'
 ]
+LIBRARY_DIRS = []
+
+# check if suitesparse is installed via homebrew
+homebrew_suitesparse_dir = (
+    subprocess.run(
+        "readlink -f $(brew --prefix suitesparse)",
+        shell=True,
+        stdout=subprocess.PIPE,
+    )
+    .stdout.decode()
+    .strip()
+)
+if homebrew_suitesparse_dir:  # empty string if not found (because error is printed to stderr)
+    INCLUDE_DIRS.append(
+        # Include directory for homebrew-installed suitesparse
+        homebrew_suitesparse_dir
+        + "/include/suitesparse/",
+    )
+    LIBRARY_DIRS.append(
+        # Library directory for homebrew-installed suitesparse
+        homebrew_suitesparse_dir
+        + "/lib"
+    )
 
 user_include_dir = os.getenv("SUITESPARSE_INCLUDE_DIR")
 user_library_dir = os.getenv("SUITESPARSE_LIBRARY_DIR")
@@ -65,7 +83,7 @@ setup(
         "": ["test_data/*.mtx.gz"],
     },
     name=DISTNAME,
-    version="0.4.13",  # remember to update __init__.py
+    version="0.4.16",  # remember to update __init__.py
     maintainer=MAINTAINER,
     maintainer_email=MAINTAINER_EMAIL,
     description=DESCRIPTION,

scikit_sparse-0.4.16/sksparse/__init__.py

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

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16}/sksparse/cholmod.pyx

@@ -403,12 +403,12 @@ cdef void _error_handler(
         warnings.warn(full_msg, CholmodWarning)
 
 def _check_for_csc(m):
-    if not sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array)):
+    if not (sparse.issparse(m) and m.format == "csc"):
         warnings.warn("converting matrix of class %s to CSC format"
                       % (m.__class__.__name__,),
                       CholmodTypeConversionWarning)
         m = m.tocsc()
-    assert sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array))
+    assert sparse.issparse(m) and m.format == "csc"
     return m
 
 cdef class Common:

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16}/sksparse/test_cholmod.py

@@ -71,6 +71,10 @@ def test_cholesky_smoke_test():
     s_csc = sparse.csc_matrix(np.eye(10)[:, :2])
     assert sparse.issparse(f(s_csc))
     assert_allclose(f(s_csc).todense(), s_csc.todense())
+    print("csc_array")
+    sa_csc = sparse.csc_array(s_csc)
+    assert sparse.issparse(f(sa_csc))
+    assert_allclose(f(sa_csc).todense(), sa_csc.todense())
     print("csr")
     s_csr = s_csc.tocsr()
     assert sparse.issparse(f(s_csr))
@@ -94,7 +98,7 @@ def complex_matrix():
 
 def factor_of(factor, matrix):
     return np.allclose(
-        (factor.L() * factor.L().H).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
+        (factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
     )
 
 

{scikit-sparse-0.4.13 → scikit_sparse-0.4.16}/tests/test_cholmod.py

@@ -71,6 +71,10 @@ def test_cholesky_smoke_test():
     s_csc = sparse.csc_matrix(np.eye(10)[:, :2])
     assert sparse.issparse(f(s_csc))
     assert_allclose(f(s_csc).todense(), s_csc.todense())
+    print("csc_array")
+    sa_csc = sparse.csc_array(s_csc)
+    assert sparse.issparse(f(sa_csc))
+    assert_allclose(f(sa_csc).todense(), sa_csc.todense())
     print("csr")
     s_csr = s_csc.tocsr()
     assert sparse.issparse(f(s_csr))
@@ -94,7 +98,7 @@ def complex_matrix():
 
 def factor_of(factor, matrix):
     return np.allclose(
-        (factor.L() * factor.L().H).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
+        (factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
     )
 
 

scikit-sparse-0.4.13/sksparse/__init__.py

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