diff --git a/docs/citing/index.rst b/docs/citing/index.rst index 36f3d46ea..3536ba8d9 100644 --- a/docs/citing/index.rst +++ b/docs/citing/index.rst @@ -14,12 +14,15 @@ If you use OSQP for published work, we encourage you to put a star on `GitHub `__. + GPU implementation and PCG method for solving linear systems in this `paper `__. .. code:: latex diff --git a/include/glob_opts.h b/include/glob_opts.h index d1be84504..e2b5b2474 100644 --- a/include/glob_opts.h +++ b/include/glob_opts.h @@ -134,7 +134,7 @@ typedef float c_float; /* for numerical values */ # define c_print mexPrintf # elif defined PYTHON # include -# define c_print(...) \ +# define c_print(...) \ { \ PyGILState_STATE gilstate = PyGILState_Ensure(); \ PySys_WriteStdout(__VA_ARGS__); \ diff --git a/lin_sys/direct/qdldl/amd/src/SuiteSparse_config.c b/lin_sys/direct/qdldl/amd/src/SuiteSparse_config.c index 9ac83d5b7..cebdff082 100644 --- a/lin_sys/direct/qdldl/amd/src/SuiteSparse_config.c +++ b/lin_sys/direct/qdldl/amd/src/SuiteSparse_config.c @@ -58,10 +58,8 @@ struct SuiteSparse_config_struct SuiteSparse_config = { // Memory allocation from glob_opts.h in OSQP c_malloc, c_realloc, c_free, - - // Suitesparse printing disabled + // Ignore printing NULL, - SuiteSparse_hypot, SuiteSparse_divcomplex diff --git a/src/util.c b/src/util.c index e73f8dc0f..d5cc29a0e 100644 --- a/src/util.c +++ b/src/util.c @@ -106,11 +106,8 @@ void print_setup_header(const OSQPWorkspace *work) { if (settings->check_termination) { c_print(" check_termination: on (interval %i),\n", - (int)settings->check_termination); - } - else { - c_print(" check_termination: off,\n"); - } + (int)settings->check_termination); + } else {c_print(" check_termination: off,\n");} # ifdef PROFILING if (settings->time_limit) { c_print(" time_limit: %.2e sec,\n", settings->time_limit); @@ -119,36 +116,33 @@ void print_setup_header(const OSQPWorkspace *work) { if (settings->scaling) { c_print(" scaling: on, "); - } - else { + } else { c_print(" scaling: off, "); } + if (settings->scaled_termination) { c_print("scaled_termination: on\n"); - } - else { + } else { c_print("scaled_termination: off\n"); } + if (settings->warm_start) { c_print(" warm start: on, "); - } - else { + } else { c_print(" warm start: off, "); } + if (settings->polish) { c_print("polish: on, "); - } - else { + } else { c_print("polish: off, "); } -# ifdef PROFILING + if (settings->time_limit) { c_print("time_limit: %.2e sec\n", settings->time_limit); - } - else { + } else { c_print("time_limit: off\n"); } -# endif /* ifdef PROFILING */ c_print("\n"); }