scs 3.2.7__cp39-cp39-win_amd64.whl → 3.2.8__cp39-cp39-win_amd64.whl

scs/__init__.py

@@ -2,36 +2,38 @@
 
 
 # start delvewheel patch
-def _delvewheel_patch_1_8_0():
+def _delvewheel_patch_1_11_1():
     import ctypes
     import os
     import platform
     import sys
-    libs_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, '.'))
+    libs_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, 'scs.libs'))
     is_conda_cpython = platform.python_implementation() == 'CPython' and (hasattr(ctypes.pythonapi, 'Anaconda_GetVersion') or 'packaged by conda-forge' in sys.version)
     if sys.version_info[:2] >= (3, 8) and not is_conda_cpython or sys.version_info[:2] >= (3, 10):
         if os.path.isdir(libs_dir):
             os.add_dll_directory(libs_dir)
     else:
-        load_order_filepath = os.path.join(libs_dir, '.load-order-scs-3.2.7')
+        load_order_filepath = os.path.join(libs_dir, '.load-order-scs-3.2.8')
         if os.path.isfile(load_order_filepath):
-            with open(os.path.join(libs_dir, '.load-order-scs-3.2.7')) as file:
+            import ctypes.wintypes
+            with open(os.path.join(libs_dir, '.load-order-scs-3.2.8')) as file:
                 load_order = file.read().split()
             kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-            kernel32.LoadLibraryExW.restype = ctypes.c_void_p
+            kernel32.LoadLibraryExW.restype = ctypes.wintypes.HMODULE
+            kernel32.LoadLibraryExW.argtypes = ctypes.wintypes.LPCWSTR, ctypes.wintypes.HANDLE, ctypes.wintypes.DWORD
             for lib in load_order:
                 lib_path = os.path.join(os.path.join(libs_dir, lib))
-                if os.path.isfile(lib_path) and not kernel32.LoadLibraryExW(ctypes.c_wchar_p(lib_path), None, 8):
+                if os.path.isfile(lib_path) and not kernel32.LoadLibraryExW(lib_path, None, 8):
                     raise OSError('Error loading {}; {}'.format(lib, ctypes.FormatError(ctypes.get_last_error())))
 
 
-_delvewheel_patch_1_8_0()
-del _delvewheel_patch_1_8_0
+_delvewheel_patch_1_11_1()
+del _delvewheel_patch_1_11_1
 # end delvewheel patch
 
 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()
@@ -56,13 +58,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
@@ -70,12 +72,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
 
@@ -109,7 +120,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."
@@ -139,7 +150,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.8.dist-info/DELVEWHEEL

@@ -0,0 +1,2 @@
+Version: 1.11.1
+Arguments: ['C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-bwksi8gf\\cp39-win_amd64\\build\\venv\\Scripts\\delvewheel', 'repair', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-bwksi8gf\\cp39-win_amd64\\repaired_wheel', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-bwksi8gf\\cp39-win_amd64\\built_wheel\\scs-3.2.8-cp39-cp39-win_amd64.whl']

scs-3.2.8.dist-info/METADATA

@@ -0,0 +1,54 @@
+Metadata-Version: 2.1
+Name: scs
+Version: 3.2.8
+Summary: Splitting conic solver
+Author-Email: Brendan O'Donoghue <bodonoghue85@gmail.com>
+License: MIT License
+         
+         Copyright (c) 2017 Brendan O'Donoghue
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
+         
+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
+
+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 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,12 @@
+scs/_scs_direct.cp39-win_amd64.dll.a,sha256=vRRn5eZ3JqiwQKelyb0ndR0REQRXDdkyVIIW2FBRmOg,1774
+scs/_scs_direct.cp39-win_amd64.pyd,sha256=qF47pmyikXfvnQYsWz3lpW_s13NQYSgxrCel9vbP4F0,190552
+scs/_scs_indirect.cp39-win_amd64.dll.a,sha256=ZXPSGx4DaVxasMC6MoBozWKmxU8Pq4tEAm6hGvxt_74,1804
+scs/_scs_indirect.cp39-win_amd64.pyd,sha256=b_wJeoWND7VF1AWvIWeLj6dilmPsxlgxlYfmbADfjC8,162424
+scs/__init__.py,sha256=hU8MgV-uReX9GZP_sCn-j3eu1txWTyJljyo8nVyJ1EY,8191
+scs-3.2.8.dist-info/DELVEWHEEL,sha256=uIAQYXznuGpM8vSaj-RX4nm3hrpT7tjcUQmjIgWksiM,391
+scs-3.2.8.dist-info/LICENSE,sha256=7Lc8bCEkAOhTRGOUitKX0hhZiZ-e_jS1V_naEQR5YDw,1096
+scs-3.2.8.dist-info/METADATA,sha256=NXOnuqeyO5Kl7oCCTUjivQngCggQqXZN25VJyCSVxGU,2806
+scs-3.2.8.dist-info/RECORD,,
+scs-3.2.8.dist-info/WHEEL,sha256=8AdrFzOtKQ6LLJ-VyqCU3y1iN8N--fMXYqrdkeTKDn0,83
+scs.libs/.load-order-scs-3.2.8,sha256=7MhPz83xYXS9nMPUEFju58sOxzbmhFhcNsLw-lWmQ70,46
+scs.libs/openblas-b2d49d518a79c6ab6a81a0e5be0c1c94.dll,sha256=stSdUYp5xqtqgaDlvgwclBtPD2nY9DrS3u33M-TqcxU,28011520

scs.libs/.load-order-scs-3.2.8

@@ -0,0 +1 @@
+openblas-b2d49d518a79c6ab6a81a0e5be0c1c94.dll

scs-3.2.7.data/platlib/.load-order-scs-3.2.7

@@ -1,4 +0,0 @@
-flang-748cd5b22ce830f11f52f8257e155fa3.dll
-openblas-c0982aca8008f23dba0bc5dc12a583be.dll
-libomp-32223b6dc36d3cc9afac7fa0ea2edfd4.dll
-flangrti-caa71c69bfef2a05fa7f6a1f56783775.dll

scs-3.2.7.dist-info/DELVEWHEEL

@@ -1,2 +0,0 @@
-Version: 1.8.0
-Arguments: ['C:\\Users\\runneradmin\\miniconda3\\envs\\test\\Scripts\\delvewheel', 'repair', 'dist/scs-3.2.7-cp39-cp39-win_amd64.whl']

scs-3.2.7.dist-info/METADATA

@@ -1,41 +0,0 @@
-Metadata-Version: 2.1
-Name: scs
-Version: 3.2.7
-Summary: Splitting conic solver
-Author-Email: Brendan O'Donoghue <bodonoghue85@gmail.com>
-License: MIT License
-        
-        Copyright (c) 2017 Brendan O'Donoghue
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-Requires-Python: >=3.7
-Requires-Dist: numpy
-Requires-Dist: scipy
-Description-Content-Type: text/markdown
-
-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/)
-
-
-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.7.dist-info/RECORD

@@ -1,15 +0,0 @@
-_scs_direct.cp39-win_amd64.dll.a,sha256=V5BYwNKfrPqHFq0SX9-ZC7NrmcT_UwEQKx5sax6nrck,1774
-_scs_direct.cp39-win_amd64.pyd,sha256=OtlnSrRCddEINemSMo23rFz0uetcAOjP101AdOKyZOM,186604
-_scs_indirect.cp39-win_amd64.dll.a,sha256=HNJHS4z9s_b-y4ZHyO9Fbm1yC7OoCKSbuJory9hv86w,1804
-_scs_indirect.cp39-win_amd64.pyd,sha256=LZDQiIdAejmW4nHXrB9YlzW6WX1YsrWIW3Vc45egfbk,158476
-scs/__init__.py,sha256=rHoVbPufBuY2azHrnxVIdTloIzoQqh9SCHnjxNM6r40,7723
-scs-3.2.7.data/platlib/.load-order-scs-3.2.7,sha256=zvN_TsJZi_cKTbS2zGSHwmHFA6G0UY_KkotgcrK6lK8,179
-scs-3.2.7.data/platlib/flang-748cd5b22ce830f11f52f8257e155fa3.dll,sha256=Lo8J8JtNcex3BZsIP9zWrT1un7wQlj6tBWJZsYSxSWg,1679360
-scs-3.2.7.data/platlib/flangrti-caa71c69bfef2a05fa7f6a1f56783775.dll,sha256=_MD5GK7NUJfl2JP3LL1N1TRfPty-4yvoU_VXGGHtBIg,50688
-scs-3.2.7.data/platlib/libomp-32223b6dc36d3cc9afac7fa0ea2edfd4.dll,sha256=z0O154uGZMc0NmrZm756Nn_lDThE8mfJIPHmKA08Vr4,612864
-scs-3.2.7.data/platlib/openblas-c0982aca8008f23dba0bc5dc12a583be.dll,sha256=oeIouplI7ufotQHT79XMgQqffAgpCzocySxQLGbkEeg,28648960
-scs-3.2.7.dist-info/DELVEWHEEL,sha256=trm3QtmwFNmZSPleNeDTDvrtowlHP0oCp2itQBIkqjA,150
-scs-3.2.7.dist-info/LICENSE,sha256=7Lc8bCEkAOhTRGOUitKX0hhZiZ-e_jS1V_naEQR5YDw,1096
-scs-3.2.7.dist-info/METADATA,sha256=r4UxDdbEc422PQn5y1VRBATfnQPTfjhj5WBG9rQfxZE,2054
-scs-3.2.7.dist-info/RECORD,,
-scs-3.2.7.dist-info/WHEEL,sha256=8AdrFzOtKQ6LLJ-VyqCU3y1iN8N--fMXYqrdkeTKDn0,83