Skip to content

Commit ed67fe0

Browse files
wds15wds15
committed
upgrading to sundials v6.0.0; removing printf and fprintf for CRAN
1 parent 1fe3850 commit ed67fe0

56 files changed

Lines changed: 157 additions & 145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/sundials_6.0.0/include/stan_sundials_printf_override.hpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef STAN_MATH_SUNDIALS_PRINTF_OVERRIDE_HPP
2+
#define STAN_MATH_SUNDIALS_PRINTF_OVERRIDE_HPP
3+
4+
#ifdef WITH_SUNDIAL_PRINTF
5+
#define STAN_SUNDIALS_PRINTF(...) printf(__VA_ARGS__)
6+
#define STAN_SUNDIALS_FPRINTF(...) fprintf(__VA_ARGS__)
7+
#else
8+
#define STAN_SUNDIALS_PRINTF(...)
9+
#define STAN_SUNDIALS_FPRINTF(...)
10+
#endif
11+
12+
#endif

‎lib/sundials_6.0.0/src/cvodes/cvodes.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9112,8 +9112,8 @@ void cvProcessError(CVodeMem cv_mem,
91129112

91139113
if (cv_mem == NULL) { /* We write to stderr */
91149114
#ifndef NO_FPRINTF_OUTPUT
9115-
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
9116-
fprintf(stderr, "%s\n\n", msg);
9115+
STAN_SUNDIALS_FPRINTF(stderr, "\n[%s ERROR] %s\n ", module, fname);
9116+
STAN_SUNDIALS_FPRINTF(stderr, "%s\n\n", msg);
91179117
#endif
91189118

91199119
} else { /* We can call ehfun */
@@ -9148,8 +9148,8 @@ void cvErrHandler(int error_code, const char *module,
91489148

91499149
#ifndef NO_FPRINTF_OUTPUT
91509150
if (cv_mem->cv_errfp!=NULL) {
9151-
fprintf(cv_mem->cv_errfp,"\n[%s %s] %s\n",module,err_type,function);
9152-
fprintf(cv_mem->cv_errfp," %s\n\n",msg);
9151+
STAN_SUNDIALS_FPRINTF(cv_mem->cv_errfp,"\n[%s %s] %s\n",module,err_type,function);
9152+
STAN_SUNDIALS_FPRINTF(cv_mem->cv_errfp," %s\n\n",msg);
91539153
}
91549154
#endif
91559155

‎lib/sundials_6.0.0/src/cvodes/fmod/fcvodes_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
enum {

‎lib/sundials_6.0.0/src/idas/fmod/fidas_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
enum {

‎lib/sundials_6.0.0/src/idas/idas.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7895,8 +7895,8 @@ void IDAProcessError(IDAMem IDA_mem,
78957895

78967896
if (IDA_mem == NULL) { /* We write to stderr */
78977897
#ifndef NO_FPRINTF_OUTPUT
7898-
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
7899-
fprintf(stderr, "%s\n\n", msg);
7898+
STAN_SUNDIALS_FPRINTF(stderr, "\n[%s ERROR] %s\n ", module, fname);
7899+
STAN_SUNDIALS_FPRINTF(stderr, "%s\n\n", msg);
79007900
#endif
79017901

79027902
} else { /* We can call ehfun */
@@ -7929,8 +7929,8 @@ void IDAErrHandler(int error_code, const char *module,
79297929

79307930
#ifndef NO_FPRINTF_OUTPUT
79317931
if (IDA_mem->ida_errfp != NULL) {
7932-
fprintf(IDA_mem->ida_errfp,"\n[%s %s] %s\n",module,err_type,function);
7933-
fprintf(IDA_mem->ida_errfp," %s\n\n",msg);
7932+
STAN_SUNDIALS_FPRINTF(IDA_mem->ida_errfp,"\n[%s %s] %s\n",module,err_type,function);
7933+
STAN_SUNDIALS_FPRINTF(IDA_mem->ida_errfp," %s\n\n",msg);
79347934
}
79357935
#endif
79367936

‎lib/sundials_6.0.0/src/kinsol/fmod/fkinsol_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
#include <stdio.h>

‎lib/sundials_6.0.0/src/kinsol/kinsol.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,8 +2378,8 @@ void KINInfoHandler(const char *module, const char *function,
23782378

23792379
#ifndef NO_FPRINTF_OUTPUT
23802380
if (kin_mem->kin_infofp != NULL) {
2381-
fprintf(kin_mem->kin_infofp,"\n[%s] %s\n",module, function);
2382-
fprintf(kin_mem->kin_infofp," %s\n",msg);
2381+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_infofp,"\n[%s] %s\n",module, function);
2382+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_infofp," %s\n",msg);
23832383
}
23842384
#endif
23852385

@@ -2418,8 +2418,8 @@ void KINProcessError(KINMem kin_mem,
24182418

24192419
if (kin_mem == NULL) { /* We write to stderr */
24202420
#ifndef NO_FPRINTF_OUTPUT
2421-
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
2422-
fprintf(stderr, "%s\n\n", msg);
2421+
STAN_SUNDIALS_FPRINTF(stderr, "\n[%s ERROR] %s\n ", module, fname);
2422+
STAN_SUNDIALS_FPRINTF(stderr, "%s\n\n", msg);
24232423
#endif
24242424

24252425
} else { /* We can call ehfun */
@@ -2456,8 +2456,8 @@ void KINErrHandler(int error_code, const char *module,
24562456

24572457
#ifndef NO_FPRINTF_OUTPUT
24582458
if (kin_mem->kin_errfp != NULL) {
2459-
fprintf(kin_mem->kin_errfp,"\n[%s %s] %s\n",module,err_type,function);
2460-
fprintf(kin_mem->kin_errfp," %s\n\n",msg);
2459+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_errfp,"\n[%s %s] %s\n",module,err_type,function);
2460+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_errfp," %s\n\n",msg);
24612461
}
24622462
#endif
24632463

@@ -2686,7 +2686,7 @@ static int KINFP(KINMem kin_mem)
26862686
tolfac = ONE;
26872687

26882688
#ifdef SUNDIALS_DEBUG_PRINTVEC
2689-
fprintf(kin_mem->kin_debugfp, "KINSOL u_0:\n");
2689+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_debugfp, "KINSOL u_0:\n");
26902690
N_VPrintFile(kin_mem->kin_uu, kin_mem->kin_debugfp);
26912691
#endif
26922692

@@ -2704,7 +2704,7 @@ static int KINFP(KINMem kin_mem)
27042704
kin_mem->kin_nfe++;
27052705

27062706
#ifdef SUNDIALS_DEBUG_PRINTVEC
2707-
fprintf(kin_mem->kin_debugfp, "KINSOL G_%ld:\n", kin_mem->kin_nni - 1);
2707+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_debugfp, "KINSOL G_%ld:\n", kin_mem->kin_nni - 1);
27082708
N_VPrintFile(kin_mem->kin_fval, kin_mem->kin_debugfp);
27092709
#endif
27102710

@@ -2764,7 +2764,7 @@ static int KINFP(KINMem kin_mem)
27642764
}
27652765

27662766
#ifdef SUNDIALS_DEBUG_PRINTVEC
2767-
fprintf(kin_mem->kin_debugfp, "KINSOL u_%ld:\n", kin_mem->kin_nni);
2767+
STAN_SUNDIALS_FPRINTF(kin_mem->kin_debugfp, "KINSOL u_%ld:\n", kin_mem->kin_nni);
27682768
N_VPrintFile(kin_mem->kin_unew, kin_mem->kin_debugfp);
27692769
#endif
27702770

‎lib/sundials_6.0.0/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
#include <stdio.h>

‎lib/sundials_6.0.0/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
#include <stdio.h>

‎lib/sundials_6.0.0/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
#include <assert.h>
177177
#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
178-
{ printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
178+
{STAN_SUNDIALS_PRINTF("In " DECL ": " MSG); assert(0); RETURNNULL; }
179179

180180

181181
#include <stdio.h>

0 commit comments

Comments
 (0)