scs 3.2.7.post2__cp313-cp313-macosx_10_13_x86_64.whl → 3.2.8__cp313-cp313-macosx_10_13_x86_64.whl

scs/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from warnings import warn
 from scipy import sparse
-import _scs_direct
+from scs import _scs_direct
 
 __version__ = _scs_direct.version()
 __sizeof_int__ = _scs_direct.sizeof_int()
@@ -26,13 +26,13 @@ SOLVED_INACCURATE = 2  # SCS best guess solved
 
 # Choose which SCS to import based on settings.
 def _select_scs_module(stgs):
+
     if stgs.pop("gpu", False):  # False by default
         if not stgs.pop("use_indirect", _USE_INDIRECT_DEFAULT):
             raise NotImplementedError(
-                "GPU direct solver not yet available, pass `use_indirect=True`."
-            )
-        import _scs_gpu
-
+                "For the GPU direct solver, pass `use_indirect=False cudss=True`.")
+        from scs import _scs_gpu
+        
         return _scs_gpu
 
     if stgs.pop("mkl", False):  # False by default
@@ -40,12 +40,21 @@ def _select_scs_module(stgs):
             raise NotImplementedError(
                 "MKL indirect solver not yet available, pass `use_indirect=False`."
             )
-        import _scs_mkl
+        from scs import _scs_mkl
 
         return _scs_mkl
 
+    if stgs.pop("cudss", False):  # False by default
+        if stgs.pop("use_indirect", False):
+            raise NotImplementedError(
+                "cuDSS is a direct solver, pass `use_indirect=False`."
+            )
+        from scs import _scs_cudss
+
+        return _scs_cudss
+
     if stgs.pop("use_indirect", _USE_INDIRECT_DEFAULT):
-        import _scs_indirect
+        from scs import _scs_indirect
 
         return _scs_indirect
 
@@ -79,7 +88,7 @@ class SCS(object):
 
         if not sparse.issparse(A):
             raise TypeError("A is required to be a sparse matrix")
-        if not sparse.isspmatrix_csc(A):
+        if not A.format == "csc":
             warn(
                 "Converting A to a CSC (compressed sparse column) matrix;"
                 " may take a while."
@@ -109,7 +118,7 @@ class SCS(object):
                     raise TypeError("P is required to be a sparse matrix")
                 if P.shape != (n, n):
                     raise ValueError("P shape not compatible with A,b,c")
-                if not sparse.isspmatrix_csc(P):
+                if not P.format == "csc":
                     warn(
                         "Converting P to a CSC (compressed sparse column) "
                         "matrix; may take a while."

{scs-3.2.7.post2.dist-info → scs-3.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scs
-Version: 3.2.7.post2
+Version: 3.2.8
 Summary: Splitting conic solver
 Author-Email: Brendan O'Donoghue <bodonoghue85@gmail.com>
 License: MIT License
@@ -25,7 +25,20 @@ License: MIT License
          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
          SOFTWARE.
          
-Requires-Python: >=3.7
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: C
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Unix
+Classifier: Operating System :: MacOS
+Requires-Python: >=3.9
 Requires-Dist: numpy
 Requires-Dist: scipy
 Description-Content-Type: text/markdown
@@ -35,8 +48,7 @@ scs-python
 
 [![Build Status](https://github.com/bodono/scs-python/actions/workflows/build.yml/badge.svg)](https://github.com/bodono/scs-python/actions/workflows/build.yml)
 [![Documentation](https://img.shields.io/badge/docs-online-brightgreen?logo=read-the-docs&style=flat)](https://www.cvxgrp.org/scs/)
-[![PyPI package](https://img.shields.io/pypi/dm/scs?label=PyPI%20downloads)](https://pypi.org/project/scs/)
-
+[![PyPI Downloads/Month](https://static.pepy.tech/personalized-badge/scs?period=month&units=abbreviation&left_color=grey&right_color=brightgreen&left_text=downloads/month)](https://pepy.tech/project/scs)
 
 Python interface for [SCS](https://github.com/cvxgrp/scs) 3.0.0 and higher.
 The full documentation is available [here](https://www.cvxgrp.org/scs/).

scs-3.2.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+scs/_scs_indirect.cpython-313-darwin.so,sha256=oHs2nQUUGqRSln47M3XOCZhZikOdE1pd49AgbHAKc8Q,123312
+scs/__init__.py,sha256=96fIOXkd0xJ5mU4-ild1Km5__fJb1n41NxvRRQdBBpE,6440
+scs/_scs_direct.cpython-313-darwin.so,sha256=qwGgEOewmZxsfWGCUIok7c9BDgP9Mh3lAYNRW4RwVYo,140888
+scs-3.2.8.dist-info/RECORD,,
+scs-3.2.8.dist-info/LICENSE,sha256=lxIl5g3kUJCLfZjb72Z7K6XviabPAckIClya6BP-0Bg,1075
+scs-3.2.8.dist-info/WHEEL,sha256=JvZNeqbemu-j4Hd1TJldmOb_prLeDmQzajinOYWsqFg,124
+scs-3.2.8.dist-info/METADATA,sha256=NXOnuqeyO5Kl7oCCTUjivQngCggQqXZN25VJyCSVxGU,2806

scs-3.2.8.dist-info/WHEEL

@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: meson
+Root-Is-Purelib: false
+Tag: cp313-cp313-macosx_10_13_x86_64
+Generator: delocate 0.13.0
+

scs-3.2.7.post2.dist-info/RECORD

@@ -1,7 +0,0 @@
-_scs_indirect.cpython-313-darwin.so,sha256=xOYtvs6XisGBxwu50Eu2Bwmr8RN246yenHnkR-YRRtM,123168
-_scs_direct.cpython-313-darwin.so,sha256=ksrTF-Qq1hlMX8YI-xEju4tYIejxBJiwFvsxwtz20Z0,140752
-scs/__init__.py,sha256=UVvImr-amS2iP4PjeNZp2jar0y3Xu8IjthfEJTRkZic,6136
-scs-3.2.7.post2.dist-info/RECORD,,
-scs-3.2.7.post2.dist-info/LICENSE,sha256=lxIl5g3kUJCLfZjb72Z7K6XviabPAckIClya6BP-0Bg,1075
-scs-3.2.7.post2.dist-info/WHEEL,sha256=fWuGjPgTEXCJxQKw4uPBVSDGWR9iVmYJDvwyCZWZ2Lw,95
-scs-3.2.7.post2.dist-info/METADATA,sha256=zV_3V9Og1Jm7FhsW8vuaqKLSXzYeIGIDFmX07Wqotd8,2090

scs-3.2.7.post2.dist-info/WHEEL

@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: meson
-Root-Is-Purelib: false
-Tag: cp313-cp313-macosx_10_13_x86_64