Merge pull request #5 from KoBoldMetals/main

Package maintenance

Author: jcapriot

.github/workflows/python-package-conda.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: True
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
 
     - name: Run Tests
       run: |
-        pytest  --cov-config=.coveragerc --cov-report=xml --cov=pydiso -s -v tests/test.py
+        pytest --cov-config=.coveragerc --cov-report=xml --cov=pydiso -s -v
 
     - name: Upload coverage
       if: ${{ matrix.os == 'ubuntu-latest' }} and {{ matrix.python-version == '3.8' }}

.gitignore

@@ -3,3 +3,5 @@ build
 pydiso.egg-info
 __pycache__
 mkl_solver.c
+.coverage
+coverage.xml

pydiso/mkl_solver.pyx

@@ -34,7 +34,7 @@ cdef extern from 'mkl.h':
     int mkl_get_max_threads()
     int mkl_domain_get_max_threads(int domain)
 
-    ctypedef int (*ProgressEntry)(int* thread, int* step, char* stage, int stage_len);
+    ctypedef int (*ProgressEntry)(int_t* thread, int_t* step, char* stage, int_t stage_len) except? -1;
     ProgressEntry mkl_set_progress(ProgressEntry progress);
 
     ctypedef void * _MKL_DSS_HANDLE_t

setup.py

@@ -21,10 +21,10 @@ def configuration(parent_package="", top_path=None):
 metadata = dict(
     name='pydiso',
     version='0.0.3',
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     setup_requires=[
         "numpy>=1.8",
-        "cython>=0.2",
+        "cython>=3.0",
     ],
     install_requires=[
         'numpy>=1.8',

tests/test.py renamed to tests/test_pydiso.py

@@ -95,7 +95,6 @@ def test_solver(A, matrix_type):
     eps = np.finfo(dtype).eps
     rel_err = np.linalg.norm(x-x2)/np.linalg.norm(x)
     assert rel_err < 1E3*eps
-    return rel_err
 
 def test_multiple_RHS():
     A = A_real_dict["real_symmetric_positive_definite"]
@@ -108,7 +107,6 @@ def test_multiple_RHS():
     eps = np.finfo(np.float64).eps
     rel_err = np.linalg.norm(x-x2)/np.linalg.norm(x)
     assert rel_err < 1E3*eps
-    return rel_err
 
 
 def test_matrix_type_errors():
@@ -133,11 +131,3 @@ def test_rhs_size_error():
         solver.solve(b_bad)
     with pytest.raises(ValueError):
         solver.solve(b, x_bad)
-
-
-if __name__ == '__main__':
-    for A, type in inputs:
-        try:
-            print(test_solver(A, type))
-        except:
-            pass