[BUG FIX] ILP64 support: using debug_c and stat_c. (#196)
This commit is contained in:
committed by
Sylvestre Ledru
parent
f5aead95fd
commit
10fb0c301c
@@ -1,3 +1,4 @@
|
||||
arpack-ng - 3.8.0
|
||||
|
||||
[ Franck Houssen ]
|
||||
* arpackmm: add --slvItrPC option (PC: Jacobi, ILU).
|
||||
@@ -5,11 +6,14 @@
|
||||
* arpackmm: add --simplePrec option (to enable use of s*upd).
|
||||
* arpackmm: add --dense option.
|
||||
* autotools: provide *.cmake files (in addition to *.pc file).
|
||||
* [BUG FIX] ILP64 support: using debug_c and stat_c.
|
||||
* [BUG FIX] fix check precision which may fail with some ATLAS versions.
|
||||
|
||||
[ Kyle Guinn ]
|
||||
* [BUG FIX]: fix 'eval: Syntax error: "(" unexpected' error at build time.
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 1 April 2019 16:24:00 +0100
|
||||
|
||||
arpack-ng - 3.7.0
|
||||
|
||||
[ Franck Houssen ]
|
||||
|
||||
@@ -407,7 +407,7 @@ class options {
|
||||
string slvItrPC;
|
||||
bool check;
|
||||
int verbose;
|
||||
int debug;
|
||||
a_int debug;
|
||||
bool restart;
|
||||
};
|
||||
|
||||
|
||||
+6
-4
@@ -1,9 +1,11 @@
|
||||
#ifndef __DEBUG_C_H__
|
||||
#define __DEBUG_C_H__
|
||||
|
||||
extern void debug_c(int logfil_c, int ndigit_c, int mgetv0_c,
|
||||
int msaupd_c, int msaup2_c, int msaitr_c, int mseigt_c, int msapps_c, int msgets_c, int mseupd_c,
|
||||
int mnaupd_c, int mnaup2_c, int mnaitr_c, int mneigh_c, int mnapps_c, int mngets_c, int mneupd_c,
|
||||
int mcaupd_c, int mcaup2_c, int mcaitr_c, int mceigh_c, int mcapps_c, int mcgets_c, int mceupd_c);
|
||||
#include "arpackdef.h"
|
||||
|
||||
extern void debug_c(a_int logfil_c, a_int ndigit_c, a_int mgetv0_c,
|
||||
a_int msaupd_c, a_int msaup2_c, a_int msaitr_c, a_int mseigt_c, a_int msapps_c, a_int msgets_c, a_int mseupd_c,
|
||||
a_int mnaupd_c, a_int mnaup2_c, a_int mnaitr_c, a_int mneigh_c, a_int mnapps_c, a_int mngets_c, a_int mneupd_c,
|
||||
a_int mcaupd_c, a_int mcaup2_c, a_int mcaitr_c, a_int mceigh_c, a_int mcapps_c, a_int mcgets_c, a_int mceupd_c);
|
||||
|
||||
#endif
|
||||
|
||||
+6
-4
@@ -1,9 +1,11 @@
|
||||
#ifndef __DEBUG_C_HPP__
|
||||
#define __DEBUG_C_HPP__
|
||||
|
||||
extern "C" void debug_c(int logfil_c, int ndigit_c, int mgetv0_c,
|
||||
int msaupd_c, int msaup2_c, int msaitr_c, int mseigt_c, int msapps_c, int msgets_c, int mseupd_c,
|
||||
int mnaupd_c, int mnaup2_c, int mnaitr_c, int mneigh_c, int mnapps_c, int mngets_c, int mneupd_c,
|
||||
int mcaupd_c, int mcaup2_c, int mcaitr_c, int mceigh_c, int mcapps_c, int mcgets_c, int mceupd_c);
|
||||
#include "arpackdef.h"
|
||||
|
||||
extern "C" void debug_c(a_int logfil_c, a_int ndigit_c, a_int mgetv0_c,
|
||||
a_int msaupd_c, a_int msaup2_c, a_int msaitr_c, a_int mseigt_c, a_int msapps_c, a_int msgets_c, a_int mseupd_c,
|
||||
a_int mnaupd_c, a_int mnaup2_c, a_int mnaitr_c, a_int mneigh_c, a_int mnapps_c, a_int mngets_c, a_int mneupd_c,
|
||||
a_int mcaupd_c, a_int mcaup2_c, a_int mcaitr_c, a_int mceigh_c, a_int mcapps_c, a_int mcgets_c, a_int mceupd_c);
|
||||
|
||||
#endif
|
||||
|
||||
+3
-1
@@ -1,13 +1,15 @@
|
||||
#ifndef __STAT_C_H__
|
||||
#define __STAT_C_H__
|
||||
|
||||
#include "arpackdef.h"
|
||||
|
||||
/*Reset timers*/
|
||||
extern void sstats_c();
|
||||
extern void sstatn_c();
|
||||
extern void cstatn_c();
|
||||
|
||||
/*Get timers*/
|
||||
extern void stat_c(int * nopx_c, int * nbx_c, int * nrorth_c, int * nitref_c, int * nrstrt_c,
|
||||
extern void stat_c(a_int * nopx_c, a_int * nbx_c, a_int * nrorth_c, a_int * nitref_c, a_int * nrstrt_c,
|
||||
float * tsaupd_c, float * tsaup2_c, float * tsaitr_c, float * tseigt_c, float * tsgets_c, float * tsapps_c, float * tsconv_c,
|
||||
float * tnaupd_c, float * tnaup2_c, float * tnaitr_c, float * tneigh_c, float * tngets_c, float * tnapps_c, float * tnconv_c,
|
||||
float * tcaupd_c, float * tcaup2_c, float * tcaitr_c, float * tceigh_c, float * tcgets_c, float * tcapps_c, float * tcconv_c,
|
||||
|
||||
+3
-1
@@ -1,13 +1,15 @@
|
||||
#ifndef __STAT_C_HPP__
|
||||
#define __STAT_C_HPP__
|
||||
|
||||
#include "arpackdef.h"
|
||||
|
||||
/*Reset timers*/
|
||||
extern "C" void sstats_c();
|
||||
extern "C" void sstatn_c();
|
||||
extern "C" void cstatn_c();
|
||||
|
||||
/*Get timers*/
|
||||
extern "C" void stat_c(int & nopx_c, int & nbx_c, int & nrorth_c, int & nitref_c, int & nrstrt_c,
|
||||
extern "C" void stat_c(a_int & nopx_c, a_int & nbx_c, a_int & nrorth_c, a_int & nitref_c, a_int & nrstrt_c,
|
||||
float & tsaupd_c, float & tsaup2_c, float & tsaitr_c, float & tseigt_c, float & tsgets_c, float & tsapps_c, float & tsconv_c,
|
||||
float & tnaupd_c, float & tnaup2_c, float & tnaitr_c, float & tneigh_c, float & tngets_c, float & tnapps_c, float & tnconv_c,
|
||||
float & tcaupd_c, float & tcaup2_c, float & tcaitr_c, float & tceigh_c, float & tcgets_c, float & tcapps_c, float & tcconv_c,
|
||||
|
||||
@@ -170,7 +170,7 @@ int main() {
|
||||
fflush(stdout);
|
||||
MPI_Barrier(MPI_COMM_WORLD);
|
||||
if (rc != 0) return rc;
|
||||
int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
a_int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
float tsaupd_c, tsaup2_c, tsaitr_c, tseigt_c, tsgets_c, tsapps_c, tsconv_c;
|
||||
float tnaupd_c, tnaup2_c, tnaitr_c, tneigt_c, tngets_c, tnapps_c, tnconv_c;
|
||||
float tcaupd_c, tcaup2_c, tcaitr_c, tceigt_c, tcgets_c, tcapps_c, tcconv_c;
|
||||
|
||||
@@ -191,7 +191,7 @@ int main() {
|
||||
|
||||
MPI_Barrier(MPI_COMM_WORLD);
|
||||
|
||||
int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
a_int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
float tsaupd_c, tsaup2_c, tsaitr_c, tseigt_c, tsgets_c, tsapps_c, tsconv_c;
|
||||
float tnaupd_c, tnaup2_c, tnaitr_c, tneigt_c, tngets_c, tnapps_c, tnconv_c;
|
||||
float tcaupd_c, tcaup2_c, tcaitr_c, tceigt_c, tcgets_c, tcapps_c, tcconv_c;
|
||||
|
||||
@@ -18,6 +18,9 @@ Important Features:
|
||||
* arpackmm: utility to test arpack with matrix market files.
|
||||
Note: to run this utility, you need the eigen library (to handle RCI).
|
||||
* ILP64 support:
|
||||
* reminder: you can NOT mix ILP64 with LP64. If you compile arpack-ng with ILP64
|
||||
(resp. LP64) support, you MUST insure your BLAS/LAPACK is compliant with ILP64
|
||||
(resp. LP64).
|
||||
* users: set INTERFACE64 at configure time.
|
||||
* developers:
|
||||
* all files which needs ILP64 support must include "arpackdef.h".
|
||||
|
||||
@@ -160,7 +160,7 @@ int main() {
|
||||
sstats_c();
|
||||
int rc = ds(); // arpack without debug.
|
||||
if (rc != 0) return rc;
|
||||
int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
a_int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
float tsaupd_c, tsaup2_c, tsaitr_c, tseigt_c, tsgets_c, tsapps_c, tsconv_c;
|
||||
float tnaupd_c, tnaup2_c, tnaitr_c, tneigt_c, tngets_c, tnapps_c, tnconv_c;
|
||||
float tcaupd_c, tcaup2_c, tcaitr_c, tceigt_c, tcgets_c, tcapps_c, tcconv_c;
|
||||
|
||||
@@ -182,7 +182,7 @@ int main() {
|
||||
real_symmetric_runner<float>(1);
|
||||
real_symmetric_runner<double>(1.e-05);
|
||||
|
||||
int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
a_int nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c;
|
||||
float tsaupd_c, tsaup2_c, tsaitr_c, tseigt_c, tsgets_c, tsapps_c, tsconv_c;
|
||||
float tnaupd_c, tnaup2_c, tnaitr_c, tneigt_c, tngets_c, tnapps_c, tnconv_c;
|
||||
float tcaupd_c, tcaup2_c, tcaitr_c, tceigt_c, tcgets_c, tcapps_c, tcconv_c;
|
||||
|
||||
Reference in New Issue
Block a user