scikit-sparse 0.4.12__tar.gz → 0.4.15__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {scikit-sparse-0.4.12/scikit_sparse.egg-info → scikit_sparse-0.4.15}/PKG-INFO +6 -3
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/README.md +1 -1
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/pyproject.toml +7 -7
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15/scikit_sparse.egg-info}/PKG-INFO +6 -3
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/setup.py +28 -5
- scikit_sparse-0.4.15/sksparse/__init__.py +1 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/cholmod.pyx +2 -2
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/tests/test_cholmod.py +1 -1
- scikit-sparse-0.4.12/sksparse/__init__.py +0 -1
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/LICENSE.txt +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/MANIFEST.in +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/scikit_sparse.egg-info/SOURCES.txt +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/scikit_sparse.egg-info/dependency_links.txt +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/scikit_sparse.egg-info/requires.txt +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/scikit_sparse.egg-info/top_level.txt +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/setup.cfg +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/cholmod_backward_compatible.h +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_cholmod.py +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/illc1033.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/illc1033_rhs1.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/illc1850.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/illc1850_rhs1.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/well1033.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/well1033_rhs1.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/well1850.mtx.gz +0 -0
- {scikit-sparse-0.4.12 → scikit_sparse-0.4.15}/sksparse/test_data/well1850_rhs1.mtx.gz +0 -0
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: scikit-sparse
|
|
3
|
-
Version: 0.4.
|
|
3
|
+
Version: 0.4.15
|
|
4
4
|
Summary: Scikit sparse matrix package
|
|
5
5
|
Home-page: https://github.com/scikit-sparse/scikit-sparse
|
|
6
|
-
Maintainer:
|
|
6
|
+
Maintainer: Aaron Johnson
|
|
7
7
|
Maintainer-email: justin.ellis18@gmail.com
|
|
8
8
|
License: BSD
|
|
9
9
|
Classifier: Development Status :: 3 - Alpha
|
|
@@ -21,8 +21,11 @@ Classifier: Programming Language :: Python :: 3.8
|
|
|
21
21
|
Classifier: Programming Language :: Python :: 3.9
|
|
22
22
|
Classifier: Programming Language :: Python :: 3.10
|
|
23
23
|
Classifier: Programming Language :: Python :: 3.11
|
|
24
|
-
|
|
24
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
25
|
+
Requires-Python: >=3.6
|
|
25
26
|
License-File: LICENSE.txt
|
|
27
|
+
Requires-Dist: numpy>=1.13.3
|
|
28
|
+
Requires-Dist: scipy>=0.19
|
|
26
29
|
|
|
27
30
|
Sparse matrix tools.
|
|
28
31
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
[](https://pypi.org/project/scikit-sparse/)
|
|
3
3
|
[](https://anaconda.org/conda-forge/scikit-sparse)
|
|
4
4
|
[](https://github.com/scikit-sparse/scikit-sparse/actions/workflows/ci_test.yml)
|
|
5
|
-
[]()
|
|
5
|
+
[]()
|
|
6
6
|
[](https://github.com/scikit-sparse/scikit-sparse/blob/master/LICENSE.txt)
|
|
7
7
|
|
|
8
8
|
# scikit-sparse
|
|
@@ -25,11 +25,11 @@ requires = [
|
|
|
25
25
|
"setuptools>=40.8.0",
|
|
26
26
|
"wheel",
|
|
27
27
|
"Cython>=0.22",
|
|
28
|
-
'numpy
|
|
29
|
-
'numpy
|
|
30
|
-
'numpy
|
|
31
|
-
'numpy
|
|
32
|
-
'numpy
|
|
33
|
-
'numpy
|
|
28
|
+
'numpy>=1.13.3; python_version=="3.6"',
|
|
29
|
+
'numpy>=1.14.5; python_version=="3.7"',
|
|
30
|
+
'numpy>=1.17.3; python_version=="3.8"',
|
|
31
|
+
'numpy>=1.19.3; python_version=="3.9"',
|
|
32
|
+
'numpy>=1.23.1; python_version=="3.10"',
|
|
33
|
+
'numpy>=1.23.5; python_version>="3.11"',
|
|
34
34
|
]
|
|
35
|
-
build-backend = "setuptools.build_meta"
|
|
35
|
+
build-backend = "setuptools.build_meta"
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: scikit-sparse
|
|
3
|
-
Version: 0.4.
|
|
3
|
+
Version: 0.4.15
|
|
4
4
|
Summary: Scikit sparse matrix package
|
|
5
5
|
Home-page: https://github.com/scikit-sparse/scikit-sparse
|
|
6
|
-
Maintainer:
|
|
6
|
+
Maintainer: Aaron Johnson
|
|
7
7
|
Maintainer-email: justin.ellis18@gmail.com
|
|
8
8
|
License: BSD
|
|
9
9
|
Classifier: Development Status :: 3 - Alpha
|
|
@@ -21,8 +21,11 @@ Classifier: Programming Language :: Python :: 3.8
|
|
|
21
21
|
Classifier: Programming Language :: Python :: 3.9
|
|
22
22
|
Classifier: Programming Language :: Python :: 3.10
|
|
23
23
|
Classifier: Programming Language :: Python :: 3.11
|
|
24
|
-
|
|
24
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
25
|
+
Requires-Python: >=3.6
|
|
25
26
|
License-File: LICENSE.txt
|
|
27
|
+
Requires-Dist: numpy>=1.13.3
|
|
28
|
+
Requires-Dist: scipy>=0.19
|
|
26
29
|
|
|
27
30
|
Sparse matrix tools.
|
|
28
31
|
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
# 2016 Alex Grigorievskiy <alex.grigorievskiy@gmail.com>
|
|
10
10
|
# 2016-2017 Joscha Reimer <jor@informatik.uni-kiel.de>
|
|
11
11
|
# 2021- Justin Ellis <justin.ellis18@gmail.com>
|
|
12
|
+
# 2022- Aaron Johnson <aaron9035@gmail.com>
|
|
12
13
|
|
|
13
14
|
"""Sparse matrix tools.
|
|
14
15
|
|
|
@@ -21,6 +22,7 @@ decomposition. Further contributions are welcome!
|
|
|
21
22
|
"""
|
|
22
23
|
|
|
23
24
|
import os
|
|
25
|
+
import subprocess
|
|
24
26
|
import sys
|
|
25
27
|
|
|
26
28
|
import numpy as np
|
|
@@ -30,21 +32,41 @@ from setuptools import Extension, find_packages, setup
|
|
|
30
32
|
DISTNAME = "scikit-sparse"
|
|
31
33
|
DESCRIPTION = "Scikit sparse matrix package"
|
|
32
34
|
LONG_DESCRIPTION = __doc__
|
|
33
|
-
MAINTAINER = "
|
|
35
|
+
MAINTAINER = "Aaron Johnson"
|
|
34
36
|
MAINTAINER_EMAIL = "justin.ellis18@gmail.com"
|
|
35
37
|
URL = "https://github.com/scikit-sparse/scikit-sparse"
|
|
36
38
|
LICENSE = "BSD"
|
|
37
39
|
|
|
38
|
-
|
|
39
40
|
INCLUDE_DIRS = [
|
|
40
41
|
np.get_include(),
|
|
41
42
|
sys.prefix + "/include",
|
|
42
43
|
# Debian's suitesparse-dev installs to
|
|
43
|
-
# /usr/include/suitesparse
|
|
44
44
|
"/usr/include/suitesparse",
|
|
45
45
|
]
|
|
46
46
|
LIBRARY_DIRS = []
|
|
47
47
|
|
|
48
|
+
# check if suitesparse is installed via homebrew
|
|
49
|
+
homebrew_suitesparse_dir = (
|
|
50
|
+
subprocess.run(
|
|
51
|
+
"readlink -f $(brew --prefix suitesparse)",
|
|
52
|
+
shell=True,
|
|
53
|
+
stdout=subprocess.PIPE,
|
|
54
|
+
)
|
|
55
|
+
.stdout.decode()
|
|
56
|
+
.strip()
|
|
57
|
+
)
|
|
58
|
+
if homebrew_suitesparse_dir: # empty string if not found (because error is printed to stderr)
|
|
59
|
+
INCLUDE_DIRS.append(
|
|
60
|
+
# Include directory for homebrew-installed suitesparse
|
|
61
|
+
homebrew_suitesparse_dir
|
|
62
|
+
+ "/include/suitesparse/",
|
|
63
|
+
)
|
|
64
|
+
LIBRARY_DIRS.append(
|
|
65
|
+
# Library directory for homebrew-installed suitesparse
|
|
66
|
+
homebrew_suitesparse_dir
|
|
67
|
+
+ "/lib"
|
|
68
|
+
)
|
|
69
|
+
|
|
48
70
|
user_include_dir = os.getenv("SUITESPARSE_INCLUDE_DIR")
|
|
49
71
|
user_library_dir = os.getenv("SUITESPARSE_LIBRARY_DIR")
|
|
50
72
|
if user_include_dir:
|
|
@@ -55,13 +77,13 @@ if user_library_dir:
|
|
|
55
77
|
|
|
56
78
|
setup(
|
|
57
79
|
install_requires=["numpy>=1.13.3", "scipy>=0.19"],
|
|
58
|
-
python_requires=">=3.6
|
|
80
|
+
python_requires=">=3.6",
|
|
59
81
|
packages=find_packages(),
|
|
60
82
|
package_data={
|
|
61
83
|
"": ["test_data/*.mtx.gz"],
|
|
62
84
|
},
|
|
63
85
|
name=DISTNAME,
|
|
64
|
-
version="0.4.
|
|
86
|
+
version="0.4.15", # remember to update __init__.py
|
|
65
87
|
maintainer=MAINTAINER,
|
|
66
88
|
maintainer_email=MAINTAINER_EMAIL,
|
|
67
89
|
description=DESCRIPTION,
|
|
@@ -84,6 +106,7 @@ setup(
|
|
|
84
106
|
"Programming Language :: Python :: 3.9",
|
|
85
107
|
"Programming Language :: Python :: 3.10",
|
|
86
108
|
"Programming Language :: Python :: 3.11",
|
|
109
|
+
"Programming Language :: Python :: 3.12",
|
|
87
110
|
],
|
|
88
111
|
# You may specify the directory where CHOLMOD is installed using the
|
|
89
112
|
# library_dirs and include_dirs keywords in the lines below.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "0.4.15"
|
|
@@ -403,12 +403,12 @@ cdef void _error_handler(
|
|
|
403
403
|
warnings.warn(full_msg, CholmodWarning)
|
|
404
404
|
|
|
405
405
|
def _check_for_csc(m):
|
|
406
|
-
if not sparse.isspmatrix_csc(m):
|
|
406
|
+
if not sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array)):
|
|
407
407
|
warnings.warn("converting matrix of class %s to CSC format"
|
|
408
408
|
% (m.__class__.__name__,),
|
|
409
409
|
CholmodTypeConversionWarning)
|
|
410
410
|
m = m.tocsc()
|
|
411
|
-
assert sparse.isspmatrix_csc(m)
|
|
411
|
+
assert sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array))
|
|
412
412
|
return m
|
|
413
413
|
|
|
414
414
|
cdef class Common:
|
|
@@ -94,7 +94,7 @@ def complex_matrix():
|
|
|
94
94
|
|
|
95
95
|
def factor_of(factor, matrix):
|
|
96
96
|
return np.allclose(
|
|
97
|
-
(factor.L() * factor.L().
|
|
97
|
+
(factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
|
|
98
98
|
)
|
|
99
99
|
|
|
100
100
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "0.4.12"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|