Merge branch 'cvxgrp:master' into master

Author: a-paulus

.github/workflows/build.yml

@@ -24,8 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-12, windows-2022 ]
-        python-version: [ 3.8, 3.9, "3.10", "3.11" ]
+        os: [ ubuntu-24.04, macos-12, windows-2022 ]
+        python-version: [ 3.9, "3.10", "3.11", "3.12" ]
 
     env:
       PYTHON_VERSION: ${{ matrix.python-version }}
@@ -40,16 +40,7 @@ jobs:
       - name: Install
         # scipy and numpy versions are chosen to match cvxpy
         run: |
-          if [[ "$PYTHON_VERSION" == "3.8" ]]; then
-            conda install scipy=1.5 numpy=1.17 mkl scs pytest pip
-          elif [[ "$PYTHON_VERSION" == "3.9" ]]; then
-            conda install scipy=1.5 numpy=1.19 mkl scs pytest pip
-          elif [[ "$PYTHON_VERSION" == "3.10" ]]; then
-            conda install scipy=1.7 numpy=1.21 mkl scs pytest pip
-          elif [[ "$PYTHON_VERSION" == "3.11" ]]; then
-            conda install scipy=1.9.3 numpy=1.23.4 mkl scs pytest pip
-          fi
-          pip install cvxpy
+          pip install cvxpy pytest
           python -m pip install .
 
       - name: Test
@@ -58,71 +49,57 @@ jobs:
           rm -rf build/
 
   build_wheels:
-    needs: build
-    if: ${{github.event_name == 'push'}}
+    name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-12, windows-2022 ]
-        python-version: [ 3.8, 3.9, "3.10", "3.11" ]
-        include:
-          - os: ubuntu-20.04
-            python-version: 3.8
-            single_action_config: "True"
-          - os: macos-12
-            python-version: 3.8
-          - os: windows-2019
-            python-version: 3.8
-
-    env:
-      RUNNER_OS: ${{ matrix.os }}
-      PYTHON_VERSION: ${{ matrix.python-version }}
-      SINGLE_ACTION_CONFIG: "${{ matrix.single_action_config == 'True' }}"
-      PYPI_SERVER: ${{ secrets.PYPI_SERVER }}
-      PYPI_USER: ${{ secrets.PYPI_USER }}
-      PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
-
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Set Additional Envs
-        shell: bash
+      - name: Install
         run: |
-          echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV
-          echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV
-          echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV
+          pip install numpy scipy cvxpy pytest
 
       - name: Build wheels
-        env:
-          CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*"
-          CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
-          CIBW_ARCHS_MACOS: x86_64 universal2
-          CIBW_ARCHS_LINUX: auto aarch64
-        uses: pypa/cibuildwheel@v2.16.2
-
-      - name: Build source
-        if: ${{env.DEPLOY_PYPI_SOURCE == 'True'}}
-        run: |
-          python setup.py sdist --dist-dir=wheelhouse
+        uses: pypa/cibuildwheel@v2.20.0
 
-      - name: Check wheels
-        shell: bash
-        run: |
-          python -m pip install --upgrade twine
-          twine check wheelhouse/*
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
 
-      - name: Release to pypi
-        if: ${{env.DEPLOY == 'True'}}
-        shell: bash
-        run: |
-          twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
 
-      - name: Upload artifacts to github
-        uses: actions/upload-artifact@v3
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          name: wheels
-          path: ./wheelhouse
+          verbose: true
+          password: ${{ secrets.PYPI_API_TOKEN }}

diffcp/__init__.py

@@ -2,6 +2,8 @@
 
 from diffcp.cone_program import solve_and_derivative, \
     solve_and_derivative_batch, \
-    solve_and_derivative_internal, SolverError
+    solve_and_derivative_internal, \
+    solve_only_batch, solve_only, \
+    solve_internal, SolverError
 from diffcp.cones import ZERO, POS, SOC, PSD, EXP
 from diffcp import utils