scs 0.4.0 → 0.4.1

data/vendor/scs/src/exp_cone.c

@@ -0,0 +1,399 @@
+#include "cones.h"
+#include "glbopts.h"
+#include "linalg.h"
+#include "scs.h"
+
+#define EXP_CONE_INFINITY_VALUE (1E15)
+
+/*
+ * Exponential cone projection routines, from:
+ *
+ * Projection onto the exponential cone: a univariate root-finding problem,
+ *    by Henrik A. Friberg, 2021.
+ *
+ */
+
+static inline scs_int _isfinite(scs_float x) {
+  return ABS(x) < EXP_CONE_INFINITY_VALUE;
+}
+
+static inline scs_float _clip(scs_float x, scs_float l, scs_float u) {
+  return MAX(l, MIN(u, x));
+}
+
+/* As defined in Friberg, 2021 (multiplied by positive polynomial) */
+static void hfun(const scs_float *v0, scs_float rho, scs_float *f,
+                 scs_float *df) {
+  scs_float t0 = v0[2], s0 = v0[1], r0 = v0[0];
+  scs_float exprho = exp(rho);
+  scs_float expnegrho = exp(-rho);
+  /* function value at v0 */
+  *f = ((rho - 1) * r0 + s0) * exprho - (r0 - rho * s0) * expnegrho -
+       (rho * (rho - 1) + 1) * t0;
+  /* gradient of function at v0 */
+  *df = (rho * r0 + s0) * exprho + (r0 - (rho - 1) * s0) * expnegrho -
+        (2 * rho - 1) * t0;
+}
+
+/* Binary search for the root of the hfun function */
+static scs_float root_search_binary(const scs_float *v0, scs_float xl,
+                                    scs_float xu, scs_float x) {
+#if VERBOSITY > 0
+  scs_printf("Exp cone: Newton method failed, resorting to binary search.\n");
+#endif
+  const scs_float EPS = 1e-12; /* expensive so loosen tol */
+  const scs_int MAXITER = 40;
+  scs_int i;
+  scs_float x_plus = x, f, df;
+  for (i = 0; i < MAXITER; i++) {
+    hfun(v0, x, &f, &df);
+    if (f < 0.0) {
+      xl = x;
+    } else {
+      xu = x;
+    }
+    /* binary search step */
+    x_plus = 0.5 * (xl + xu);
+    if (ABS(x_plus - x) <= EPS * MAX(1., ABS(x_plus)) || (x_plus == xl) ||
+        (x_plus == xu)) {
+      break;
+    }
+    x = x_plus;
+  }
+  return x_plus;
+}
+
+/* Use damped Newton's to find the root of the hfun function */
+static scs_float root_search_newton(const scs_float *v0, scs_float xl,
+                                    scs_float xu, scs_float x) {
+  /* params taken from Friberg code */
+  const scs_float EPS = 1e-15;
+  const scs_float DFTOL = 1e-13; /* pow(EPS, 6.0 / 7.0) */
+  const scs_int MAXITER = 20;
+  const scs_float LODAMP = 0.05;
+  const scs_float HIDAMP = 0.95;
+
+  scs_float x_plus, f, df;
+  scs_int i;
+
+  for (i = 0; i < MAXITER; i++) {
+    hfun(v0, x, &f, &df);
+
+    if (ABS(f) <= EPS) { /* root found */
+      break;
+    }
+
+    if (f < 0.0) {
+      xl = x;
+    } else {
+      xu = x;
+    }
+
+    if (xu <= xl) {
+      xu = 0.5 * (xu + xl);
+      xl = xu;
+      break;
+    }
+
+    if (!_isfinite(f) || df < DFTOL) {
+      break;
+    }
+
+    /* Newton step */
+    x_plus = x - f / df;
+
+    if (ABS(x_plus - x) <= EPS * MAX(1., ABS(x_plus))) {
+      break;
+    }
+
+    if (x_plus >= xu) {
+      x = MIN(LODAMP * x + HIDAMP * xu, xu);
+    } else if (x_plus <= xl) {
+      x = MAX(LODAMP * x + HIDAMP * xl, xl);
+    } else {
+      x = x_plus;
+    }
+  }
+  if (i < MAXITER) { /* Newton's method converged */
+#if VERBOSITY > 0
+    scs_printf("Exp cone: Newton iters:%i, f:%.4e, df:%.4e\n", (int)i, f, df);
+#endif
+    return _clip(x, xl, xu);
+  }
+  /* Fall back to binary search if Newton failed */
+  return root_search_binary(v0, xl, xu, x);
+}
+
+/* try heuristic (cheap) projection */
+static scs_float proj_primal_exp_cone_heuristic(const scs_float *v0,
+                                                scs_float *vp) {
+  scs_float t0 = v0[2], s0 = v0[1], r0 = v0[0];
+  scs_float dist, tp, newdist;
+  /* perspective boundary */
+  vp[2] = MAX(t0, 0);
+  vp[1] = 0.0;
+  vp[0] = MIN(r0, 0);
+  dist = SCS(norm_diff)(v0, vp, 3);
+
+  /* perspective interior */
+  if (s0 > 0.0) {
+    tp = MAX(t0, s0 * exp(r0 / s0));
+    newdist = tp - t0;
+    if (newdist < dist) {
+      vp[2] = tp;
+      vp[1] = s0;
+      vp[0] = r0;
+      dist = newdist;
+    }
+  }
+  return dist;
+}
+
+/* try heuristic (cheap) projection */
+static scs_float proj_polar_exp_cone_heuristic(const scs_float *v0,
+                                               scs_float *vd) {
+  scs_float t0 = v0[2], s0 = v0[1], r0 = v0[0];
+  scs_float dist, td, newdist;
+  /* perspective boundary */
+  vd[2] = MIN(t0, 0);
+  vd[1] = MIN(s0, 0);
+  vd[0] = 0.0;
+  dist = SCS(norm_diff)(v0, vd, 3);
+
+  /* perspective interior */
+  if (r0 > 0.0) {
+    td = MIN(t0, -r0 * exp(s0 / r0 - 1));
+    newdist = t0 - td;
+    if (newdist < dist) {
+      vd[2] = td;
+      vd[1] = s0;
+      vd[0] = r0;
+      dist = newdist;
+    }
+  }
+  return dist;
+}
+
+static scs_float ppsi(const scs_float *v0) {
+  scs_float s0 = v0[1], r0 = v0[0];
+  scs_float psi;
+
+  if (r0 > s0) {
+    psi = (r0 - s0 + sqrt(r0 * r0 + s0 * s0 - r0 * s0)) / r0;
+  } else {
+    psi = -s0 / (r0 - s0 - sqrt(r0 * r0 + s0 * s0 - r0 * s0));
+  }
+
+  return ((psi - 1) * r0 + s0) / (psi * (psi - 1) + 1);
+}
+
+static scs_float pomega(scs_float rho) {
+  scs_float val = exp(rho) / (rho * (rho - 1) + 1);
+
+  if (rho < 2.0) {
+    val = MIN(val, exp(2.0) / 3);
+  }
+
+  return val;
+}
+
+static scs_float dpsi(const scs_float *v0) {
+  scs_float s0 = v0[1], r0 = v0[0];
+  scs_float psi;
+
+  if (s0 > r0) {
+    psi = (r0 - sqrt(r0 * r0 + s0 * s0 - r0 * s0)) / s0;
+  } else {
+    psi = (r0 - s0) / (r0 + sqrt(r0 * r0 + s0 * s0 - r0 * s0));
+  }
+
+  return (r0 - psi * s0) / (psi * (psi - 1) + 1);
+}
+
+static scs_float domega(scs_float rho) {
+  scs_float val = -exp(-rho) / (rho * (rho - 1) + 1);
+
+  if (rho > -1.0) {
+    val = MAX(val, -exp(1.0) / 3);
+  }
+
+  return val;
+}
+
+/* Generate upper and lower search bounds for root of hfun */
+static void exp_search_bracket(const scs_float *v0, scs_float pdist,
+                               scs_float ddist, scs_float *low_out,
+                               scs_float *upr_out) {
+  scs_float t0 = v0[2], s0 = v0[1], r0 = v0[0];
+  scs_float baselow = -EXP_CONE_INFINITY_VALUE,
+            baseupr = EXP_CONE_INFINITY_VALUE;
+  scs_float low = -EXP_CONE_INFINITY_VALUE, upr = EXP_CONE_INFINITY_VALUE;
+
+  scs_float Dp = SQRTF(pdist * pdist - MIN(s0, 0) * MIN(s0, 0));
+  scs_float Dd = SQRTF(ddist * ddist - MIN(r0, 0) * MIN(r0, 0));
+
+  scs_float curbnd, fl, fu, df, tpu, tdl;
+
+  if (t0 > 0) {
+    curbnd = log(t0 / ppsi(v0));
+    low = MAX(low, curbnd);
+  } else if (t0 < 0) {
+    curbnd = -log(-t0 / dpsi(v0));
+    upr = MIN(upr, curbnd);
+  }
+
+  if (r0 > 0) {
+    baselow = 1 - s0 / r0;
+    low = MAX(low, baselow);
+    tpu = MAX(1e-12, MIN(Dd, Dp + t0));
+    curbnd = MAX(low, baselow + tpu / r0 / pomega(low));
+    upr = MIN(upr, curbnd);
+  }
+
+  if (s0 > 0) {
+    baseupr = r0 / s0;
+    upr = MIN(upr, baseupr);
+    tdl = -MAX(1e-12, MIN(Dp, Dd - t0));
+    curbnd = MIN(upr, baseupr - tdl / s0 / domega(upr));
+    low = MAX(low, curbnd);
+  }
+
+  /* Guarantee valid bracket */
+  /* TODO do we need these 2 lines? */
+  low = _clip(MIN(low, upr), baselow, baseupr);
+  upr = _clip(MAX(low, upr), baselow, baseupr);
+
+  if (low != upr) {
+    hfun(v0, low, &fl, &df);
+    hfun(v0, upr, &fu, &df);
+
+    if (fl * fu > 0) {
+      if (ABS(fl) < ABS(fu)) {
+        upr = low;
+      } else {
+        low = upr;
+      }
+    }
+  }
+
+  *low_out = low;
+  *upr_out = upr;
+}
+
+/* convert from rho to primal projection */
+static scs_float proj_sol_primal_exp_cone(const scs_float *v0, scs_float rho,
+                                          scs_float *vp) {
+  scs_float linrho = (rho - 1) * v0[0] + v0[1];
+  scs_float exprho = exp(rho);
+  scs_float quadrho, dist;
+  if (linrho > 0 && _isfinite(exprho)) {
+    quadrho = rho * (rho - 1) + 1;
+    vp[2] = exprho * linrho / quadrho;
+    vp[1] = linrho / quadrho;
+    vp[0] = rho * linrho / quadrho;
+    dist = SCS(norm_diff)(vp, v0, 3);
+  } else {
+    vp[2] = EXP_CONE_INFINITY_VALUE;
+    vp[1] = 0.0;
+    vp[0] = 0.0;
+    dist = EXP_CONE_INFINITY_VALUE;
+  }
+  return dist;
+}
+
+/* convert from rho to polar projection */
+static scs_float proj_sol_polar_exp_cone(const scs_float *v0, scs_float rho,
+                                         scs_float *vd) {
+  scs_float linrho = v0[0] - rho * v0[1];
+  scs_float exprho = exp(-rho);
+  scs_float quadrho, dist;
+  if (linrho > 0 && _isfinite(exprho)) {
+    quadrho = rho * (rho - 1) + 1;
+    vd[2] = -exprho * linrho / quadrho;
+    vd[1] = (1 - rho) * linrho / quadrho;
+    vd[0] = linrho / quadrho;
+    dist = SCS(norm_diff)(v0, vd, 3);
+  } else {
+    vd[2] = -EXP_CONE_INFINITY_VALUE;
+    vd[1] = 0.0;
+    vd[0] = 0.0;
+    dist = EXP_CONE_INFINITY_VALUE;
+  }
+  return dist;
+}
+
+static inline void _copy(scs_float *dest, scs_float *src) {
+  dest[0] = src[0];
+  dest[1] = src[1];
+  dest[2] = src[2];
+}
+
+/* Project onto primal or dual exponential cone, performed in-place.
+ * If `primal=0` then project on the dual cone, otherwise project
+ * onto primal. Taken from algorithm in Friberg, 2021.
+ */
+scs_float SCS(proj_pd_exp_cone)(scs_float *v0, scs_int primal) {
+  scs_float TOL = 1e-8; /* pow(1e-10, 2.0 / 3.0); */
+  scs_float xl, xh, pdist, ddist, err, rho, dist_hat;
+  scs_float vp[3], vd[3], v_hat[3];
+  scs_int opt;
+  if (!primal) {
+    /* This routine actually projects onto primal and polar cones
+     * simultaneously. So to make it project onto dual, use this:
+     * Pi_{C^*}(v0) = -Pi_{C^polar}(-v0)
+     */
+    v0[0] *= -1.;
+    v0[1] *= -1.;
+    v0[2] *= -1.;
+  }
+
+  pdist = proj_primal_exp_cone_heuristic(v0, vp);
+  ddist = proj_polar_exp_cone_heuristic(v0, vd);
+
+  err = ABS(vp[0] + vd[0] - v0[0]);
+  err = MAX(err, ABS(vp[1] + vd[1] - v0[1]));
+  err = MAX(err, ABS(vp[2] + vd[2] - v0[2]));
+
+  /* Skip root search if presolve rules apply
+   * or optimality conditions are satisfied
+   */
+  opt = (v0[1] <= 0 && v0[0] <= 0);
+  opt |= (MIN(pdist, ddist) <= TOL);
+  opt |= (err <= TOL && SCS(dot)(vp, vd, 3) <= TOL);
+  if (opt) {
+    if (primal) {
+      _copy(v0, vp);
+      return pdist;
+    }
+    /* polar cone -> dual cone */
+    v0[0] = -vd[0];
+    v0[1] = -vd[1];
+    v0[2] = -vd[2];
+    return ddist;
+  }
+
+  exp_search_bracket(v0, pdist, ddist, &xl, &xh);
+  rho = root_search_newton(v0, xl, xh, 0.5 * (xl + xh));
+
+  if (primal) {
+    /* primal cone projection */
+    dist_hat = proj_sol_primal_exp_cone(v0, rho, v_hat);
+    if (dist_hat <= pdist) {
+      _copy(vp, v_hat);
+      pdist = dist_hat;
+    }
+    _copy(v0, vp);
+    return pdist;
+  }
+  /* polar cone projection */
+  dist_hat = proj_sol_polar_exp_cone(v0, rho, v_hat);
+  if (dist_hat <= ddist) {
+    _copy(vd, v_hat);
+    ddist = dist_hat;
+  }
+  /* polar cone -> dual cone */
+  v0[0] = -vd[0];
+  v0[1] = -vd[1];
+  v0[2] = -vd[2];
+  return ddist;
+}

data/vendor/scs/src/normalize.c

@@ -26,7 +26,7 @@
  */
 void SCS(normalize_b_c)(ScsScaling *scal, scs_float *b, scs_float *c) {
   scs_int i;
-  scs_float sigma;
+  scs_float sigma, nm_c, nm_b;
 
   /* scale c */
   for (i = 0; i < scal->n; ++i) {
@@ -38,7 +38,9 @@ void SCS(normalize_b_c)(ScsScaling *scal, scs_float *b, scs_float *c) {
   }
 
   /* calculate primal and dual scales */
-  sigma = MAX(SCS(norm_inf)(c, scal->n), SCS(norm_inf)(b, scal->m));
+  nm_c = SCS(norm_inf)(c, scal->n);
+  nm_b = SCS(norm_inf)(b, scal->m);
+  sigma = MAX(nm_c, nm_b);
   sigma = sigma < MIN_NORMALIZATION_FACTOR ? 1.0 : sigma;
   sigma = sigma > MAX_NORMALIZATION_FACTOR ? MAX_NORMALIZATION_FACTOR : sigma;
   sigma = SAFEDIV_POS(1.0, sigma);

data/vendor/scs/src/rw.c

@@ -1,5 +1,6 @@
 #include "rw.h"
 
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,6 +10,25 @@
 #include "scs_matrix.h"
 #include "util.h"
 
+#if NO_READ_WRITE > 0 /* Disables all read / write functionality */
+
+void SCS(write_data)(const ScsData *d, const ScsCone *k,
+                     const ScsSettings *stgs) {
+  /* Do nothing */
+}
+scs_int SCS(read_data)(const char *filename, ScsData **d, ScsCone **k,
+                       ScsSettings **stgs) {
+  /* Failure */
+  return -1;
+}
+void SCS(log_data_to_csv)(const ScsCone *k, const ScsSettings *stgs,
+                          const ScsWork *w, scs_int iter,
+                          SCS(timer) * solve_timer) {
+  /* Do nothing */
+}
+
+#else
+
 /* writes/reads problem data to/from filename */
 /* This is a VERY naive implementation, doesn't care about portability etc */
 
@@ -28,30 +48,61 @@ static void write_scs_cone(const ScsCone *k, FILE *fout) {
   fwrite(k->p, sizeof(scs_float), k->psize, fout);
 }
 
-static ScsCone *read_scs_cone(FILE *fin) {
+/*
+ * Read integer data from file. If the integer width on file is
+ * different to scs_int then it will cast the ints after reading
+ * to be compatible with the SCS data types.
+ */
+static size_t read_int(scs_int *dest, size_t file_int_sz, size_t nitems,
+                       FILE *fin) {
+  if (file_int_sz == sizeof(scs_int)) {
+    return fread(dest, sizeof(scs_int), nitems, fin);
+  }
+  void *ptr = scs_calloc(nitems, file_int_sz);
+  size_t val = fread(ptr, file_int_sz, nitems, fin);
+  scs_int i;
+  switch (file_int_sz) {
+  case 4:
+    for (i = 0; i < nitems; ++i) {
+      dest[i] = (scs_int)(((int *)ptr)[i]);
+    }
+    break;
+  case 8:
+    for (i = 0; i < nitems; ++i) {
+      dest[i] = (scs_int)(((long long *)ptr)[i]);
+    }
+    break;
+  }
+  if (ptr) {
+    scs_free(ptr);
+  }
+  return val;
+}
+
+static ScsCone *read_scs_cone(FILE *fin, size_t file_int_sz) {
   ScsCone *k = (ScsCone *)scs_calloc(1, sizeof(ScsCone));
-  fread(&(k->z), sizeof(scs_int), 1, fin);
-  fread(&(k->l), sizeof(scs_int), 1, fin);
-  fread(&(k->bsize), sizeof(scs_int), 1, fin);
+  read_int(&(k->z), file_int_sz, 1, fin);
+  read_int(&(k->l), file_int_sz, 1, fin);
+  read_int(&(k->bsize), file_int_sz, 1, fin);
   if (k->bsize > 1) {
     k->bl = (scs_float *)scs_calloc(MAX(k->bsize - 1, 0), sizeof(scs_float));
     k->bu = (scs_float *)scs_calloc(MAX(k->bsize - 1, 0), sizeof(scs_float));
     fread(k->bl, sizeof(scs_float), MAX(k->bsize - 1, 0), fin);
     fread(k->bu, sizeof(scs_float), MAX(k->bsize - 1, 0), fin);
   }
-  fread(&(k->qsize), sizeof(scs_int), 1, fin);
+  read_int(&(k->qsize), file_int_sz, 1, fin);
   if (k->qsize) {
     k->q = (scs_int *)scs_calloc(k->qsize, sizeof(scs_int));
-    fread(k->q, sizeof(scs_int), k->qsize, fin);
+    read_int(k->q, file_int_sz, k->qsize, fin);
   }
-  fread(&(k->ssize), sizeof(scs_int), 1, fin);
+  read_int(&(k->ssize), file_int_sz, 1, fin);
   if (k->ssize) {
     k->s = (scs_int *)scs_calloc(k->ssize, sizeof(scs_int));
-    fread(k->s, sizeof(scs_int), k->ssize, fin);
+    read_int(k->s, file_int_sz, k->ssize, fin);
   }
-  fread(&(k->ep), sizeof(scs_int), 1, fin);
-  fread(&(k->ed), sizeof(scs_int), 1, fin);
-  fread(&(k->psize), sizeof(scs_int), 1, fin);
+  read_int(&(k->ep), file_int_sz, 1, fin);
+  read_int(&(k->ed), file_int_sz, 1, fin);
+  read_int(&(k->psize), file_int_sz, 1, fin);
   if (k->psize) {
     k->p = (scs_float *)scs_calloc(k->psize, sizeof(scs_float));
     fread(k->p, sizeof(scs_float), k->psize, fin);
@@ -79,21 +130,21 @@ static void write_scs_stgs(const ScsSettings *s, FILE *fout) {
   /* Do not write the log_csv_filename */
 }
 
-static ScsSettings *read_scs_stgs(FILE *fin) {
+static ScsSettings *read_scs_stgs(FILE *fin, size_t file_int_sz) {
   ScsSettings *s = (ScsSettings *)scs_calloc(1, sizeof(ScsSettings));
-  fread(&(s->normalize), sizeof(scs_int), 1, fin);
+  read_int(&(s->normalize), file_int_sz, 1, fin);
   fread(&(s->scale), sizeof(scs_float), 1, fin);
   fread(&(s->rho_x), sizeof(scs_float), 1, fin);
-  fread(&(s->max_iters), sizeof(scs_int), 1, fin);
+  read_int(&(s->max_iters), file_int_sz, 1, fin);
   fread(&(s->eps_abs), sizeof(scs_float), 1, fin);
   fread(&(s->eps_rel), sizeof(scs_float), 1, fin);
   fread(&(s->eps_infeas), sizeof(scs_float), 1, fin);
   fread(&(s->alpha), sizeof(scs_float), 1, fin);
-  fread(&(s->verbose), sizeof(scs_int), 1, fin);
-  fread(&(s->warm_start), sizeof(scs_int), 1, fin);
-  fread(&(s->acceleration_lookback), sizeof(scs_int), 1, fin);
-  fread(&(s->acceleration_interval), sizeof(scs_int), 1, fin);
-  fread(&(s->adaptive_scale), sizeof(scs_int), 1, fin);
+  read_int(&(s->verbose), file_int_sz, 1, fin);
+  read_int(&(s->warm_start), file_int_sz, 1, fin);
+  read_int(&(s->acceleration_lookback), file_int_sz, 1, fin);
+  read_int(&(s->acceleration_interval), file_int_sz, 1, fin);
+  read_int(&(s->adaptive_scale), file_int_sz, 1, fin);
   return s;
 }
 
@@ -106,18 +157,18 @@ static void write_amatrix(const ScsMatrix *A, FILE *fout) {
   fwrite(A->i, sizeof(scs_int), Anz, fout);
 }
 
-static ScsMatrix *read_amatrix(FILE *fin) {
+static ScsMatrix *read_amatrix(FILE *fin, size_t file_int_sz) {
   scs_int Anz;
   ScsMatrix *A = (ScsMatrix *)scs_calloc(1, sizeof(ScsMatrix));
-  fread(&(A->m), sizeof(scs_int), 1, fin);
-  fread(&(A->n), sizeof(scs_int), 1, fin);
+  read_int(&(A->m), file_int_sz, 1, fin);
+  read_int(&(A->n), file_int_sz, 1, fin);
   A->p = (scs_int *)scs_calloc(A->n + 1, sizeof(scs_int));
-  fread(A->p, sizeof(scs_int), A->n + 1, fin);
+  read_int(A->p, file_int_sz, A->n + 1, fin);
   Anz = A->p[A->n];
   A->x = (scs_float *)scs_calloc(Anz, sizeof(scs_float));
   A->i = (scs_int *)scs_calloc(Anz, sizeof(scs_int));
   fread(A->x, sizeof(scs_float), Anz, fin);
-  fread(A->i, sizeof(scs_int), Anz, fin);
+  read_int(A->i, file_int_sz, Anz, fin);
   return A;
 }
 
@@ -135,19 +186,20 @@ static void write_scs_data(const ScsData *d, FILE *fout) {
   }
 }
 
-static ScsData *read_scs_data(FILE *fin) {
+static ScsData *read_scs_data(FILE *fin, size_t file_int_sz) {
   scs_int has_p = 0;
   ScsData *d = (ScsData *)scs_calloc(1, sizeof(ScsData));
-  fread(&(d->m), sizeof(scs_int), 1, fin);
-  fread(&(d->n), sizeof(scs_int), 1, fin);
+
+  read_int(&(d->m), file_int_sz, 1, fin);
+  read_int(&(d->n), file_int_sz, 1, fin);
   d->b = (scs_float *)scs_calloc(d->m, sizeof(scs_float));
   d->c = (scs_float *)scs_calloc(d->n, sizeof(scs_float));
   fread(d->b, sizeof(scs_float), d->m, fin);
   fread(d->c, sizeof(scs_float), d->n, fin);
-  d->A = read_amatrix(fin);
+  d->A = read_amatrix(fin, file_int_sz);
   /* If has_p bit is not set or this hits end of file then has_p = 0 */
-  has_p &= fread(&has_p, sizeof(scs_int), 1, fin);
-  d->P = has_p ? read_amatrix(fin) : SCS_NULL;
+  has_p &= read_int(&has_p, file_int_sz, 1, fin);
+  d->P = has_p ? read_amatrix(fin, file_int_sz) : SCS_NULL;
   return d;
 }
 
@@ -158,7 +210,6 @@ void SCS(write_data)(const ScsData *d, const ScsCone *k,
   uint32_t scs_float_sz = (uint32_t)sizeof(scs_float);
   const char *scs_version = SCS_VERSION;
   uint32_t scs_version_sz = (uint32_t)strlen(scs_version);
-  scs_printf("writing data to %s\n", stgs->write_data_filename);
   fwrite(&(scs_int_sz), sizeof(uint32_t), 1, fout);
   fwrite(&(scs_float_sz), sizeof(uint32_t), 1, fout);
   fwrite(&(scs_version_sz), sizeof(uint32_t), 1, fout);
@@ -175,9 +226,11 @@ scs_int SCS(read_data)(const char *filename, ScsData **d, ScsCone **k,
   uint32_t file_float_sz;
   uint32_t file_version_sz;
   char file_version[16];
+  errno = 0;
   FILE *fin = fopen(filename, "rb");
   if (!fin) {
     scs_printf("Error reading file %s\n", filename);
+    scs_printf("errno:%i:%s\n", errno, strerror(errno));
     return -1;
   }
   scs_printf("Reading data from %s\n", filename);
@@ -185,11 +238,10 @@ scs_int SCS(read_data)(const char *filename, ScsData **d, ScsCone **k,
   fread(&(file_float_sz), sizeof(uint32_t), 1, fin);
   if (file_int_sz != (uint32_t)sizeof(scs_int)) {
     scs_printf(
-        "Error, sizeof(file int) is %lu, but scs expects sizeof(int) %lu, "
-        "scs should be recompiled with correct flags.\n",
+        "Warning, sizeof(file int) is %lu, but scs expects sizeof(int) %lu. "
+        "SCS will attempt to cast the data, which may be slow. "
+        "This message can be avoided by recompiling with the correct flags.\n",
         (unsigned long)file_int_sz, (unsigned long)sizeof(scs_int));
-    fclose(fin);
-    return -1;
   }
   if (file_float_sz != (uint32_t)sizeof(scs_float)) {
     scs_printf(
@@ -209,9 +261,10 @@ scs_int SCS(read_data)(const char *filename, ScsData **d, ScsCone **k,
                "************************************************************\n",
                file_version, SCS_VERSION);
   }
-  *k = read_scs_cone(fin);
-  *d = read_scs_data(fin);
-  *stgs = read_scs_stgs(fin);
+  *k = read_scs_cone(fin, file_int_sz);
+  *d = read_scs_data(fin, file_int_sz);
+  *stgs = read_scs_stgs(fin, file_int_sz);
+  scs_printf("Finished reading data.\n");
   fclose(fin);
   return 0;
 }
@@ -348,3 +401,5 @@ void SCS(log_data_to_csv)(const ScsCone *k, const ScsSettings *stgs,
   fprintf(fout, "\n");
   fclose(fout);
 }
+
+#endif