Adds missing reshape orders

Author: phschiele

dsp/cone_transforms.py

@@ -9,14 +9,17 @@
 import scipy.sparse as sp
 from cvxpy import SOC
 from cvxpy.atoms import reshape
-from cvxpy.atoms.affine.upper_tri import upper_tri_to_full
 from cvxpy.constraints import ExpCone
 from cvxpy.constraints.constraint import Constraint
 from cvxpy.constraints.psd import PSD
 from cvxpy.expressions.constants import Constant
 from cvxpy.problems.objective import Objective
 from cvxpy.reductions.dcp2cone.cone_matrix_stuffing import ConeDims
 
+try:
+    from cvxpy.expressions.variable import upper_tri_to_full
+except ImportError:
+    from cvxpy.atoms.affine.upper_tri import upper_tri_to_full
 
 def return_zero() -> float:
     return 0.0
@@ -493,9 +496,9 @@ def split_K_repr_affine(
     C = cp.Constant(0)
     D = cp.Constant(0)
     for v in convex_vars:
-        C += -var_to_mat_mapping.get(v.id, 0) @ cp.vec(v)
+        C += -var_to_mat_mapping.get(v.id, 0) @ cp.vec(v, order="F")
     for v in concave_vars:
-        D += -var_to_mat_mapping.get(v.id, 0) @ cp.vec(v)
+        D += -var_to_mat_mapping.get(v.id, 0) @ cp.vec(v, order="F")
 
     return C, D, cp.Constant(b)
 
@@ -579,6 +582,6 @@ def switch_convex_concave(
                 inds = np.triu_indices(n, k=0)  # includes diagonal
                 v = v[inds]
 
-            constraints += [(P.T @ u_bar)[start:end] + cp.vec(v) == 0]
+            constraints += [(P.T @ u_bar)[start:end] + cp.vec(v, order="F") == 0]
 
     return KRepresentation(f=f_bar, t=t_bar, constraints=constraints)

dsp/problem.py

@@ -210,7 +210,7 @@ def semi_infinite_epigraph(
             inds = np.triu_indices(v.shape[0], k=0)  # includes diagonal
             expr += A_ @ v[inds]
         else:
-            expr += A_ @ cp.vec(v)
+            expr += A_ @ cp.vec(v, order="F")
 
     z = const_vec - expr  # Ax + b in K
 

dsp/saddle_atoms.py

@@ -282,7 +282,7 @@ def _get_K_repr(self, local_to_glob: LocalToGlob, switched: bool = False) -> KRe
         epi_exp = cp.Variable(self.exponents.size, name="exp_epi")
         constraints = [
             epi_exp >= self.exponents,  # handles composition in exponent
-            ExpCone(cp.reshape(epi_exp + u, (f_local.size,)), np.ones(f_local.size), f_local),
+            ExpCone(cp.reshape(epi_exp + u, (f_local.size,), order="F"), np.ones(f_local.size), f_local),
             t >= -u - 1,
         ]
 
@@ -430,7 +430,7 @@ def _get_K_repr(self, local_to_glob: LocalToGlob, switched: bool = False) -> KRe
             local_to_glob.y_size if not switched else local_to_glob.x_size,
             name="f_global_saddle_quad_form",
         )
-        constraints += [F_global == B.T @ cp.vec(F_local)]
+        constraints += [F_global == B.T @ cp.vec(F_local, order="F")]
 
         K_repr = KRepresentation(
             f=F_global,

dsp/saddle_extremum.py

@@ -243,7 +243,7 @@ def __init__(self, f: cp.Expression) -> None:
 
         obj = -f
         for x, y in zip(x_vars, y_vars, strict=True):
-            obj += dsp.inner(cp.vec(y), cp.vec(x))
+            obj += dsp.inner(cp.vec(y, order="F"), cp.vec(x, order="F"))
 
         super().__init__(obj, [])