scs 0.4.0 → 0.4.1

data/vendor/scs/test/run_from_file.c

@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
   }
   for (i = 2; i < argc; i += 2) {
     if (argc < i + 2) {
-      scs_printf("Incorrect number of arguments supplied\n.");
+      scs_printf("Incorrect number of arguments supplied.\n");
 
       SCS(free_data)(d);
       SCS(free_cone)(k);
@@ -78,6 +78,12 @@ int main(int argc, char **argv) {
       return -1;
     }
   }
+  if (!stgs->verbose) {
+    scs_printf(
+        "File data set `verbose` to 0, SCS will not output information. Add "
+        "`verbose 1` to call to override.\n");
+  }
+  scs_printf("Solving problem.\n");
   sol = (ScsSolution *)scs_calloc(1, sizeof(ScsSolution));
   scs(d, k, stgs, sol, &info);
 

data/vendor/scs/test/run_tests.c

@@ -8,34 +8,45 @@
 /* Include Tests */
 #include "problems/degenerate.h"
 #include "problems/hs21_tiny_qp.h"
-#include "problems/hs21_tiny_qp_rw.h"
 #include "problems/infeasible_tiny_qp.h"
 #include "problems/qafiro_tiny_qp.h"
 #include "problems/small_lp.h"
 #include "problems/small_qp.h"
-#include "problems/test_validation.h"
+#include "problems/test_exp_cone.h"
 #include "problems/unbounded_tiny_qp.h"
 
+int tests_run = 0;
+
+/* decrement tests_run since mu_unit will increment it, so this cancels */
 #define _SKIP(problem)                                                         \
   char *problem(void) {                                                        \
     scs_printf("skipped\n");                                                   \
+    tests_run--;                                                               \
     return 0;                                                                  \
   }
 
-#ifdef USE_LAPACK /* solve SDPs, requires blas / lapack */
-#include "problems/rob_gauss_cov_est.h"
+#if NO_VALIDATE == 0
+#include "problems/test_validation.h"
 #else
-_SKIP(rob_gauss_cov_est)
+_SKIP(test_validation)
 #endif
 
-/* TODO: this reads a file written with 32bit ints */
-#if defined(USE_LAPACK) && !defined(DLONG)
+/* solve SDPs, requires blas / lapack */
+#if defined(USE_LAPACK) && NO_READ_WRITE == 0
 #include "problems/random_prob.h"
+#include "problems/rob_gauss_cov_est.h"
 #else
+_SKIP(rob_gauss_cov_est)
 _SKIP(random_prob)
 #endif
 
-int tests_run = 0;
+#if NO_READ_WRITE == 0 /* reads / writes */
+#include "problems/hs21_tiny_qp_rw.h"
+#include "problems/max_ent.h"
+#else
+_SKIP(hs21_tiny_qp_rw)
+_SKIP(max_ent)
+#endif
 
 static const char *all_tests(void) {
   mu_run_test(test_validation);
@@ -49,13 +60,15 @@ static const char *all_tests(void) {
   mu_run_test(infeasible_tiny_qp);
   mu_run_test(unbounded_tiny_qp);
   mu_run_test(random_prob);
+  mu_run_test(max_ent);
+  mu_run_test(test_exp_cone);
   return 0;
 }
-
 int main(void) {
   const char *result = all_tests();
   if (result != 0) {
     scs_printf("%s\n", result);
+    scs_printf("TEST FAILED!\n");
   } else {
     scs_printf("ALL TESTS PASSED\n");
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -79,12 +79,15 @@ files:
 - vendor/scs/linsys/gpu/gpu.h
 - vendor/scs/linsys/gpu/indirect/private.c
 - vendor/scs/linsys/gpu/indirect/private.h
+- vendor/scs/linsys/mkl/direct/private.c
+- vendor/scs/linsys/mkl/direct/private.h
 - vendor/scs/linsys/scs_matrix.c
 - vendor/scs/linsys/scs_matrix.h
 - vendor/scs/scs.mk
 - vendor/scs/src/aa.c
 - vendor/scs/src/cones.c
 - vendor/scs/src/ctrlc.c
+- vendor/scs/src/exp_cone.c
 - vendor/scs/src/linalg.c
 - vendor/scs/src/normalize.c
 - vendor/scs/src/rw.c
@@ -97,12 +100,16 @@ files:
 - vendor/scs/test/problems/hs21_tiny_qp.h
 - vendor/scs/test/problems/hs21_tiny_qp_rw.h
 - vendor/scs/test/problems/infeasible_tiny_qp.h
+- vendor/scs/test/problems/max_ent
+- vendor/scs/test/problems/max_ent.h
 - vendor/scs/test/problems/qafiro_tiny_qp.h
 - vendor/scs/test/problems/random_prob
 - vendor/scs/test/problems/random_prob.h
 - vendor/scs/test/problems/rob_gauss_cov_est.h
 - vendor/scs/test/problems/small_lp.h
 - vendor/scs/test/problems/small_qp.h
+- vendor/scs/test/problems/test_exp_cone.h
+- vendor/scs/test/problems/test_prob_from_data_file.h
 - vendor/scs/test/problems/test_validation.h
 - vendor/scs/test/problems/unbounded_tiny_qp.h
 - vendor/scs/test/random_socp_prob.c
@@ -128,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: SCS - the splitting conic solver - for Ruby