scs 3.2.7.post2__tar.gz → 3.2.9__tar.gz

{scs-3.2.7.post2 → scs-3.2.9}/.bumpversion.cfg

@@ -1,7 +1,6 @@
 [bumpversion]
-current_version = 3.2.7
+current_version = 3.2.9
 
 [bumpversion:file:legacy_setup.py]
 
 [bumpversion:file:pyproject.toml]
-

{scs-3.2.7.post2 → scs-3.2.9}/.github/workflows/build.yml

@@ -25,22 +25,22 @@ jobs:
       PYTHON_VERSION: ${{ matrix.python-version }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: conda-incubator/setup-miniconda@v3
+      - uses: prefix-dev/setup-pixi@v0.9.1
         with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          miniforge-version: latest
-          channels: conda-forge,anaconda
+          cache: false
+          pixi-version: v0.46.0
+      - name: Add .pixi/envs/default to the $PATH
+        run: echo "$(pwd)/.pixi/envs/default/bin" >> $GITHUB_PATH
+        shell: bash
       - name: Install dependencies
-        run: |
-          conda install scipy numpy pytest 'setuptools<=60'
+        run: pixi add scipy numpy pip pytest meson meson-python openblas python==${{ matrix.python-version }}
       - name: Test
         run: |
-          python legacy_setup.py install --scs --openmp
-          pytest
+          pixi r python -m pip install -v . --no-build-isolation -Csetup-args=-Duse_openmp=true
+          pixi r pytest
           rm -rf build/
 
   build_mkl:
@@ -51,9 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-13 runners have intel chips. macos-14 and above
-        # runners have Apple silicon chips.
-        os: [ ubuntu-latest, macos-13, windows-latest ]
+        os: [ ubuntu-latest ]
         python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13"]
         link_mkl: [true]
 
@@ -62,7 +60,7 @@ jobs:
       LINK_MKL: ${{ matrix.link_mkl }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
@@ -70,12 +68,13 @@ jobs:
         shell: bash
         run: |
           echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV
-      - uses: conda-incubator/setup-miniconda@v3
+      - uses: prefix-dev/setup-pixi@v0.9.1
         with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          miniforge-version: latest
-          channels: conda-forge,anaconda
+          cache: false
+          pixi-version: v0.46.0
+      - name: Add .pixi/envs/default to the $PATH
+        run: echo "$(pwd)/.pixi/envs/default/bin" >> $GITHUB_PATH
+        shell: bash
       - name: Install dependencies
         run: |
           if [[ "$LINK_MKL" == "true" ]]; then
@@ -83,26 +82,19 @@ jobs:
           else
             BLAS_PKGS="blas-devel=*=*openblas"
           fi
-          if [[ "$PYTHON_VERSION" == "3.9" ]]; then
-            conda install scipy=1.5 numpy=1.19 pytest $BLAS_PKGS pkg-config
-          elif [[ "$PYTHON_VERSION" == "3.10" ]]; then
-            conda install scipy=1.7 numpy=1.21 pytest $BLAS_PKGS pkg-config
-          elif [[ "$PYTHON_VERSION" == "3.11" ]]; then
-            conda install scipy=1.9.3 numpy=1.23.4 pytest $BLAS_PKGS pkg-config
-          elif [[ "$PYTHON_VERSION" == "3.12" || "$PYTHON_VERSION" == "3.13" ]]; then
-            conda install scipy numpy pytest $BLAS_PKGS pkg-config
-          fi
+          pixi add $BLAS_PKGS pip scipy numpy pytest mkl mkl-devel pkg-config meson meson-python
       - name: Build
         run: |
-          python -c "import numpy as np; print('NUMPY BLAS INFOS'); print(np.show_config())"
+          pixi r python -c "import numpy as np;print(np.show_config())"
           if [[ "$LINK_MKL" == "true" ]]; then
-            python -m pip install --verbose -Csetup-args=-Dlink_mkl=true .
+
+            pixi r python -m pip install --verbose --no-build-isolation -Csetup-args=-Dlink_mkl=true .
           else
-            python -m pip install --verbose .
+            pixi r python -m pip install --verbose --no-build-isolation .
           fi
       - name: Test
         run: |
-          pytest
+          pixi r pytest
           rm -rf build/
 
   # from here to end it's a copy-paste, with few changes, of
@@ -113,11 +105,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, macos-14, windows-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
 
@@ -139,7 +130,7 @@ jobs:
         run: conda install -y openblas pkgconfig
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v3.2.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -150,7 +141,7 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
 
@@ -174,7 +165,7 @@ jobs:
     # Only run this step on GH release
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           # unpacks all CIBW artifacts into dist/
           pattern: cibw-*
@@ -183,7 +174,7 @@ jobs:
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          skip-existing: true
+          skip-existing: false # Fail loudly for duplicates.
         # To test:
         # with:
         #  repository-url: https://test.pypi.org/legacy/

{scs-3.2.7.post2 → scs-3.2.9}/.gitignore

@@ -48,3 +48,7 @@ out
 *.jar
 *.egg-info
 *.ipynb_checkpoints/
+
+# pixi environments
+.pixi
+*.egg-info

scs-3.2.9/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "scs_source"]
+	path = scs_source
+	url = https://github.com/cvxgrp/scs.git
+[submodule "scs/pythoncapi-compat"]
+	path = scs/pythoncapi-compat
+	url = https://github.com/python/pythoncapi-compat

{scs-3.2.7.post2 → scs-3.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scs
-Version: 3.2.7.post2
+Version: 3.2.9
 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.7.post2 → scs-3.2.9}/README.md

@@ -3,8 +3,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.7.post2 → scs-3.2.9}/legacy_setup.py

@@ -33,6 +33,13 @@ parser.add_argument(
     "to succeed. This option will be removed soon after which we shall "
     "install the MKL version by default if MKL is available.",
 )
+parser.add_argument(
+    "--cudss",
+    dest="cudss",
+    action="store_true",
+    default=False,
+    help="Also compile the cuDSS version of SCS",
+)
 parser.add_argument(
     "--openmp",
     dest="openmp",
@@ -286,9 +293,24 @@ def install_scs(**kwargs):
         )
         ext_modules += [_scs_mkl]
 
+    if args.cudss:
+        # MKL should be included in the libraries already:
+        _scs_cudss = Extension(
+            name="_scs_cudss",
+            sources=sources + glob("scs_source/linsys/cudss/direct/*.c"),
+            depends=glob("scs/*.h"),
+            define_macros=list(define_macros) + [("PY_CUDSS", None)],
+            include_dirs=include_dirs + ["scs_source/linsys/cudss/direct/"],
+            libraries=list(libraries),
+            extra_compile_args=list(extra_compile_args),
+            extra_link_args=list(extra_link_args),
+        )
+        ext_modules += [_scs_cudss]
+
+
     setup(
         name="scs",
-        version="3.2.7.post2",
+        version="3.2.9",
         author="Brendan O'Donoghue",
         author_email="bodonoghue85@gmail.com",
         url="http://github.com/cvxgrp/scs",

scs-3.2.9/meson.build

@@ -0,0 +1,253 @@
+project('scs', 'c')
+
+py = import('python').find_installation(pure: false)
+
+cc = meson.get_compiler('c')
+fs = import('fs')
+# Check for submodule before doing anything else
+if not fs.exists('scs_source/README.md')
+  error('Missing the `scs_source` submodule! Run `git submodule update --init` to fix this.')
+endif
+
+# Simpler check for numpy
+incdir_numpy = run_command(py,['-c',
+'''import os
+import numpy as np
+try:
+  incdir = os.path.relpath(np.get_include())
+except Exception:
+  incdir = np.get_include()
+print(incdir)
+'''], check: true).stdout().strip()
+
+# Get BLAS
+blas_deps = []
+if get_option('link_mkl')
+    blas_deps = [cc.find_library('mkl_rt', required : false)]
+    if not blas_deps[0].found()
+        blas_deps = [dependency('mkl-sdl', required : false)]
+    endif
+    if not blas_deps[0].found()
+      blas_deps = [ dependency('mkl-dynamic-ilp64-iomp', required: false) ]
+    endif
+else
+    if host_machine.system() == 'darwin'
+        blas_deps = [dependency('Accelerate')]
+    else
+        blas_deps = [cc.find_library('openblas', static: get_option('link_blas_statically'), required : false)]
+        if not blas_deps[0].found()
+            blas_deps = [dependency(['openblas', 'OpenBLAS'], static: get_option('link_blas_statically'), required : false)]
+        endif
+    endif
+
+    # try to find blas/cblas (e.g., Linux)
+    if not blas_deps[0].found()
+        blas_deps = [cc.find_library('blas', static: get_option('link_blas_statically'), required : false)]
+        if not blas_deps[0].found()
+            blas_deps = [dependency('blas', static: get_option('link_blas_statically'), required : false)]
+        endif
+        lapack_dep = cc.find_library('lapack', static: get_option('link_blas_statically'), required : false)
+        if not lapack_dep.found()
+            lapack_dep = dependency('lapack', static: get_option('link_blas_statically'), required : false)
+        endif
+        if lapack_dep.found()
+            blas_deps += lapack_dep
+        endif
+        cblas_dep = cc.find_library('cblas', static: get_option('link_blas_statically'), required : false)
+        if not cblas_dep.found()
+            cblas_dep = dependency('cblas', static: get_option('link_blas_statically'), required : false)
+        endif
+        if cblas_dep.found()
+            blas_deps += cblas_dep
+        endif
+    endif
+endif
+
+# Since nothing above was required, we stop here if failed.
+# When creating an sdist we are not compiling / linking, so don't need to fail.
+if not blas_deps[0].found() and not get_option('sdist_mode')
+    error('OpenBLAS or Netlib BLAS/CBLAS is required on all platforms, and was not found.')
+endif
+
+# Common
+common_c_args = cc.get_supported_arguments('-Wno-unused-result') + [
+  '-DPYTHON', '-DCTRLC=1'
+]
+common_includes = [
+  'scs',
+  'scs_source/include',
+  'scs_source/linsys',
+  incdir_numpy
+]
+_deps = [blas_deps]
+if get_option('use_openmp')
+  _deps += dependency('openmp')
+endif
+
+is_linux = host_machine.system() == 'linux'
+if is_linux
+  _deps += cc.find_library('rt', required : true)
+endif
+
+if get_option('use_lapack')
+  common_c_args += '-DUSE_LAPACK=1'
+endif
+
+if get_option('use_singleprec')
+  common_c_args += '-DSFLOAT=1'
+endif
+
+if get_option('use_blas64')
+  common_c_args += '-DBLAS64=1'
+endif
+
+if get_option('use_extraverbose')
+  common_c_args += '-DVERBOSITY=999'
+endif
+
+is_gpu_build = get_option('use_gpu') or get_option('link_cudss')
+use_32bit_ints = get_option('int32')
+
+if is_gpu_build and not use_32bit_ints
+  error('GPU builds require 32-bit integers. Please re-run Meson with -Dint32=true')
+endif
+
+if not use_32bit_ints
+  common_c_args += '-DDLONG=1'
+endif
+
+cuda_dep = dependency('cuda', required: is_gpu_build)
+if is_gpu_build and not cuda_dep.found()
+  error('GPU build requested but CUDA toolkit was not found.')
+endif
+
+if get_option('use_gpu')
+  gpu_c_args = common_c_args + ['-DPY_GPU=1', '-DINDIRECT=1']
+  _deps += cuda_dep
+  if get_option('gpu_atrans')
+    gpu_c_args += '-DGPU_TRANSPOSE_MAT=1'
+  endif
+  ext_modules += py.extension_module(
+    '_scs_gpu',
+    common_sources,
+    # In Meson, sources with a `.cu` extension are compiled with nvcc by default.
+    # To compile `.c` files with nvcc, they must be explicitly targeted.
+    # It is strongly recommended to rename CUDA-C files to `.cu`.
+    fs.glob('scs_source/linsys/gpu/*.c'),
+    fs.glob('scs_source/linsys/gpu/indirect/*.c'),
+    c_args: gpu_c_args,
+    dependencies: _deps,
+    include_directories: [
+      common_includes, 'scs_source/linsys/gpu/', 'scs_source/linsys/gpu/indirect'
+    ],
+    install: true,
+    install_dir: scs_dir,
+  )
+endif
+
+# Sources
+scs_core_sources = files(
+  'scs_source/src/aa.c',
+  'scs_source/src/cones.c',
+  'scs_source/src/ctrlc.c',
+  'scs_source/src/exp_cone.c',
+  'scs_source/src/linalg.c',
+  'scs_source/src/normalize.c',
+  'scs_source/src/rw.c',
+  'scs_source/src/scs_version.c',
+  'scs_source/src/scs.c',
+  'scs_source/src/util.c'
+)
+
+common_linsys_sources = files(
+  'scs_source/linsys/scs_matrix.c',
+  'scs_source/linsys/csparse.c'
+)
+
+amd_sources = files(
+  'scs_source/linsys/external/amd/amd_1.c',
+  'scs_source/linsys/external/amd/amd_2.c',
+  'scs_source/linsys/external/amd/amd_aat.c',
+  'scs_source/linsys/external/amd/amd_control.c',
+  'scs_source/linsys/external/amd/amd_defaults.c',
+  'scs_source/linsys/external/amd/amd_dump.c',
+  'scs_source/linsys/external/amd/amd_global.c',
+  'scs_source/linsys/external/amd/amd_info.c',
+  'scs_source/linsys/external/amd/amd_order.c',
+  'scs_source/linsys/external/amd/amd_post_tree.c',
+  'scs_source/linsys/external/amd/amd_postorder.c',
+  'scs_source/linsys/external/amd/amd_preprocess.c',
+  'scs_source/linsys/external/amd/amd_valid.c',
+  'scs_source/linsys/external/amd/SuiteSparse_config.c'
+)
+
+# Build modules
+scs_dir = py.get_install_dir() / 'scs'
+py.extension_module(
+  '_scs_direct',
+  'scs/scspy.c',
+  'scs_source/linsys/cpu/direct/private.c',
+  'scs_source/linsys/external/qdldl/qdldl.c',
+  common_linsys_sources,
+  scs_core_sources,
+  amd_sources,
+  c_args: common_c_args,
+  include_directories: common_includes + [
+    'scs_source/linsys/cpu/direct',
+    'scs_source/linsys/external/qdldl',
+    'scs_source/linsys/external/amd'
+  ],
+  dependencies: _deps,
+  install_dir: scs_dir,
+  install: true,
+)
+
+py.extension_module(
+  '_scs_indirect',
+  'scs/scspy.c',
+  'scs_source/linsys/cpu/indirect/private.c',
+  common_linsys_sources,
+  scs_core_sources,
+  c_args: common_c_args + ['-DPY_INDIRECT', '-DINDIRECT=1'],
+  include_directories: common_includes + ['scs_source/linsys/cpu/indirect'],
+  dependencies: _deps,
+  install_dir: scs_dir,
+  install: true,
+)
+
+if get_option('link_mkl')
+  py.extension_module(
+    '_scs_mkl',
+    'scs/scspy.c',
+    'scs_source/linsys/mkl/direct/private.c',
+    common_linsys_sources,
+    scs_core_sources,
+    c_args: common_c_args + ['-DPY_MKL'],
+    include_directories: common_includes + ['scs_source/linsys/mkl/direct'],
+    dependencies: _deps,
+    install_dir: scs_dir,
+    install: true,
+  )
+endif
+
+if get_option('link_cudss')
+  _deps += cuda_dep
+  cudss_dep = dependency('cudss', required: true)
+  _deps += cudss_dep
+  py.extension_module(
+    '_scs_cudss',
+    'scs/scspy.c',
+    'scs_source/linsys/cudss/direct/private.c',
+    common_linsys_sources,
+    scs_core_sources,
+    c_args: common_c_args + ['-DPY_CUDSS'],
+    include_directories: common_includes + ['scs_source/linsys/cudss/direct'],
+    dependencies: _deps,
+    install_dir: scs_dir,
+    install: true,
+  )
+endif
+
+
+
+py.install_sources('scs/py/__init__.py', subdir: 'scs')

scs-3.2.9/meson.options

@@ -0,0 +1,27 @@
+# we use this to build pre-compiled wheels on github CI
+# copying anaconda openblas into SCS wheels for ease of
+# installation
+option('link_blas_statically', type: 'boolean', 
+       value: false, description: 'copy BLAS compiled object into SCS module(s)')
+option('link_mkl', type: 'boolean',
+       value: false, description: 'link to mkl-rt library')
+option('link_cudss', type: 'boolean',
+       value: false, description: 'link to cuDSS library')
+option('use_openmp', type: 'boolean',
+       value: false, description: 'Compile SCS with OpenMP parallelization enabled. This can make SCS faster, but requires a compiler with openMP support, the user must control how many threads OpenMP uses')
+option('sdist_mode', type: 'boolean', value: false,
+       description: 'Set to true if building an sdist')
+option('use_lapack', type: 'boolean',
+       value: true, description: 'use LAPACK')
+option('use_singleprec', type: 'boolean',
+       value: false, description: 'use single precision floating point')
+option('use_extraverbose', type: 'boolean',
+       value: false, description: 'Enable extra verbose SCS (for debugging).')
+option('use_gpu', type: 'boolean',
+       value: false, description: 'setup the GPU variant')
+option('int32', type: 'boolean',
+       value: false, description: 'Use 32-bit integers (required for GPU).')
+option('gpu_atrans', type: 'boolean',
+       value: false, description: 'transpose matrices for the GPU')
+option('use_blas64', type: 'boolean',
+       value: false, description: 'Use 64-bit convention for BLAS')

scs-3.2.9/pixi.toml

@@ -0,0 +1,12 @@
+[workspace]
+channels = ["conda-forge"]
+name = "scs-python"
+platforms = ["linux-64"]
+version = "0.1.0"
+
+[tasks]
+
+[dependencies]
+pkg-config = ">=0.29.2,<0.30"
+meson = ">=1.8.1,<2"
+meson-python = ">=0.18.0,<0.19"

{scs-3.2.7.post2 → scs-3.2.9}/pyproject.toml

@@ -1,17 +1,31 @@
 [build-system]
 build-backend = 'mesonpy'
 requires = [
-  "numpy >= 2.0.0; python_version > '3.8'",
-  "oldest-supported-numpy; python_version <= '3.8'",
+  "numpy >= 2.0.0",
   "meson-python"
 ]
 
 [project]
 name = 'scs'
-version = "3.2.7.post2"
+version = "3.2.9"
 description = 'Splitting conic solver'
 readme = 'README.md'
-requires-python = '>=3.7'
+requires-python = '>=3.9'
+classifiers = [
+    'License :: OSI Approved :: MIT License',
+    'Programming Language :: C',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3 :: Only',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Operating System :: Microsoft :: Windows',
+    'Operating System :: POSIX',
+    'Operating System :: Unix',
+    'Operating System :: MacOS',
+]
 license = {file = 'LICENSE'}
 authors = [
   {name = "Brendan O'Donoghue", email = "bodonoghue85@gmail.com"}]
@@ -80,3 +94,8 @@ inherit.before-all = "append"
 before-all = [
   # "apk update", "apk search -v '*blas*'",
   "apk add openblas-dev"]
+
+[tool.pytest.ini_options]
+testpaths = [
+    "test",
+]

{scs-3.2.7.post2/scs → scs-3.2.9/scs/py}/__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."