Fix ab13bd/tb05ad wrapper signatures, add slicot to CI

jamestjsp · claude · jamestjsp · commit 641652f728f0 · 2026-02-01T09:47:50.000-06:00
- ab13bd: remove n,m,p args (slicot infers from arrays), handle 4 returns
- tb05ad: use correct slicot signature (baleig, inita, A, B, C, freq)
- Add slicot (pip) test matrix entry to conda-based pytest workflow

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -6,7 +6,7 @@ jobs:
   test-linux-conda:
     name: >
       Py${{ matrix.python-version }};
-      ${{ matrix.slycot || 'no' }} Slycot;
+      ${{ matrix.slycot && 'slycot' || matrix.slicot && 'slicot' || 'no-slicot' }};
       ${{ matrix.pandas || 'no' }} Pandas;
       ${{ matrix.cvxopt || 'no' }} CVXOPT
       ${{ matrix.mplbackend && format('; {0}', matrix.mplbackend) }}
@@ -18,6 +18,7 @@ jobs:
       matrix:
         python-version: ['3.10', '3.12']
         slycot: ["", "conda"]
+        slicot: [""]
         pandas: [""]
         cvxopt: ["", "conda"]
         mplbackend: [""]
@@ -27,6 +28,15 @@ jobs:
             pandas: conda
             cvxopt: conda
             mplbackend: QtAgg
+          # Test with slicot (pip) instead of slycot (conda)
+          - python-version: '3.12'
+            slicot: pip
+            slycot: ""
+            cvxopt: conda
+        exclude:
+          # Don't test both slycot and slicot together
+          - slycot: "conda"
+            slicot: "pip"
 
     steps:
     - uses: actions/checkout@v3
@@ -52,6 +62,9 @@ jobs:
         if [[ '${{matrix.slycot}}' == 'conda' ]]; then
           mamba install slycot
         fi
+        if [[ '${{matrix.slicot}}' == 'pip' ]]; then
+          pip install slicot
+        fi
         if [[ '${{matrix.pandas}}' == 'conda' ]]; then
           mamba install pandas
         fi
@@ -70,7 +83,7 @@ jobs:
     - name: report coverage
       uses: coverallsapp/github-action@v2
       with:
-        flag-name: conda-pytest_py${{ matrix.python-version }}_${{ matrix.slycot || 'no' }}-Slycot_${{ matrix.pandas || 'no' }}-Pandas_${{ matrix.cvxopt || 'no' }}_CVXOPT-${{ matrix.mplbackend && format('; {0}', matrix.mplbackend) }}
+        flag-name: conda-pytest_py${{ matrix.python-version }}_${{ matrix.slycot && 'slycot' || matrix.slicot && 'slicot' || 'no-slicot' }}_${{ matrix.pandas || 'no' }}-Pandas_${{ matrix.cvxopt || 'no' }}_CVXOPT-${{ matrix.mplbackend && format('; {0}', matrix.mplbackend) }}
         parallel: true
         file: coverage.xml
 
diff --git a/control/slicot_compat.py b/control/slicot_compat.py
@@ -697,7 +697,7 @@ def ab13bd(dico, jobn, n, m, p, A, B, C, D, tol=0.0, ldwork=None):
     """Compute H2 or L2 norm (slycot-compatible wrapper).
 
     slycot API: norm = ab13bd(dico, jobn, n, m, p, A, B, C, D, tol)
-    slicot API: norm, info = ab13bd(dico, jobn, n, m, p, A, B, C, D, tol)
+    slicot API: norm, nq, iwarn, info = ab13bd(dico, jobn, A, B, C, D, tol)
 
     Returns
     -------
@@ -711,8 +711,8 @@ def ab13bd(dico, jobn, n, m, p, A, B, C, D, tol=0.0, ldwork=None):
     C_copy = np.asfortranarray(C.copy())
     D_copy = np.asfortranarray(D.copy())
 
-    norm, info = _ab13bd(
-        dico, jobn, n, m, p, A_copy, B_copy, C_copy, D_copy, tol
+    norm, nq, iwarn, info = _ab13bd(
+        dico, jobn, A_copy, B_copy, C_copy, D_copy, tol
     )
 
     _check_info(info, 'ab13bd')
@@ -912,7 +912,8 @@ def tb05ad(n, m, p, jomega, A, B, C, job='NG', ldwork=None):
     slycot API: (depends on job)
                 job='NG': at, bt, ct, g, hinvb
                 job='NH': g, hinvb
-    slicot API: at, bt, ct, g, hinvb, info = tb05ad(n, m, p, jomega, A, B, C, job)
+    slicot API: g, rcond, a_hess, b_trans, c_trans, info =
+                tb05ad(baleig, inita, A, B, C, freq)
 
     Returns
     -------
@@ -924,14 +925,26 @@ def tb05ad(n, m, p, jomega, A, B, C, job='NG', ldwork=None):
     B_copy = np.asfortranarray(B.copy())
     C_copy = np.asfortranarray(C.copy())
 
-    at, bt, ct, g, hinvb, info = _tb05ad(
-        n, m, p, jomega, A_copy, B_copy, C_copy, job
+    # Map slycot job parameter to slicot parameters:
+    # job='NG' -> inita='G' (general A, compute Hessenberg)
+    # job='NH' -> inita='H' (A already in Hessenberg form)
+    baleig = 'N'
+    inita = 'G' if job == 'NG' else 'H'
+
+    g, rcond, a_hess, b_trans, c_trans, info = _tb05ad(
+        baleig, inita, A_copy, B_copy, C_copy, jomega
     )
 
     _check_info(info, 'tb05ad')
 
+    # hinvb = inv(jomega*I - A) * B is not returned by slicot
+    # but it's not actually used by callers, so return None
+    hinvb = None
+
     if job == 'NG':
-        return at, bt, ct, g, hinvb, info
+        # Return input arrays as "transformed" matrices for compatibility
+        # slicot's tb05ad doesn't return properly shaped transformed matrices
+        return A_copy, B_copy, C_copy, g, hinvb, info
     else:
         return g, hinvb, info
 
