Merge 7e0c71e into d153dff

opencollab · Mar 2, 2020 · 5ee5724 · 5ee5724
2 parents d153dff + 7e0c71e
commit 5ee5724
Show file tree

Hide file tree

Showing 10 changed files with 1,253 additions and 823 deletions.
diff --git a/EXAMPLES/MATRIX_MARKET/arpackmm.cpp b/EXAMPLES/MATRIX_MARKET/arpackmm.cpp
diff --git a/EXAMPLES/PYARPACK/pyarpack.cpp b/EXAMPLES/PYARPACK/pyarpack.cpp
diff --git a/EXAMPLES/README.CALLING-ARPACK-FROM-C-OR-CPP b/EXAMPLES/README.CALLING-ARPACK-FROM-C-OR-CPP
@@ -1,2 +1,4 @@
-In ../TESTS, the file icb_arpack_c.c     is an example of how to call arpack from C.
-In ../TESTS, the file icb_arpack_cpp.cpp is an example of how to call arpack from C++.
+In../ TESTS,
+    the file icb_arpack_c.c is an example of how to call arpack from C.In../
+        TESTS,
+    the file icb_arpack_cpp.cpp is an example of how to call arpack from C++.
diff --git a/PARPACK/EXAMPLES/MPI/README.CALLING-PARPACK-FROM-C-OR-CPP b/PARPACK/EXAMPLES/MPI/README.CALLING-PARPACK-FROM-C-OR-CPP
@@ -1,2 +1,5 @@
-In PARPACK/TESTS/MPI, the file icb_parpack_c.c     is an example of how to call parpack from C.
-In PARPACK/TESTS/MPI, the file icb_parpack_cpp.cpp is an example of how to call parpack from C++.
+In PARPACK / TESTS / MPI,
+    the file icb_parpack_c.c is an example of how to call parpack from
+            C.In PARPACK /
+        TESTS / MPI,
+    the file icb_parpack_cpp.cpp is an example of how to call parpack from C++.
diff --git a/PARPACK/TESTS/MPI/icb_parpack_c.c b/PARPACK/TESTS/MPI/icb_parpack_c.c
@@ -1,30 +1,31 @@
 /*
- * This example demonstrates the use of ISO_C_BINDING to call arpack (portability).
- * IMPORTANT: MPI communicators MUST be passed from C to Fortran using MPI_Comm_c2f.
+ * This example demonstrates the use of ISO_C_BINDING to call arpack
+ * (portability). IMPORTANT: MPI communicators MUST be passed from C to Fortran
+ * using MPI_Comm_c2f.
  *
- * Just use arpack as you would have normally done, but, use *[ae]upd_c instead of *[ae]upd_.
- * The main advantage is that compiler checks (arguments) are performed at build time.
- * Note: to debug parpack, call debug_c.
+ * Just use arpack as you would have normally done, but, use *[ae]upd_c instead
+ * of *[ae]upd_. The main advantage is that compiler checks (arguments) are
+ * performed at build time. Note: to debug parpack, call debug_c.
  */
 
+#include <complex.h>  // creal, cimag.
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
+
+#include "debug_c.h"  // debug parpack.
 #include "mpi.h"
 #include "parpack.h"
-#include <complex.h> // creal, cimag.
-#include "debug_c.h" // debug parpack.
-#include "stat_c.h" // arpack statistics.
+#include "stat_c.h"  // arpack statistics.
 
 /* test program to solve for the 9 largest eigenvalues of
  * A*x = lambda*x where A is the diagonal matrix
  * with entries 1000, 999, ... , 2, 1 on the diagonal.
  * */
 
-void dMatVec(double * x, double * y) {
+void dMatVec(double* x, double* y) {
   int i;
-  for ( i = 0; i < 1000; ++i)
-    y[i] = ((double) (i+1))*x[i];
+  for (i = 0; i < 1000; ++i) y[i] = ((double)(i + 1)) * x[i];
 };
 
 int ds() {
@@ -35,55 +36,54 @@ int ds() {
   a_int nev = 3;
   double tol = 0;
   double resid[N];
-  a_int ncv = 2*nev+1;
-  double V[ncv*N];
+  a_int ncv = 2 * nev + 1;
+  double V[ncv * N];
   a_int ldv = N;
   a_int iparam[11];
   a_int ipntr[14];
-  double workd[3*N];
+  double workd[3 * N];
   a_int rvec = 1;
   char howmny[] = "A";
-  double* d = (double*) malloc((nev+1)*sizeof(double));
+  double* d = (double*)malloc((nev + 1) * sizeof(double));
   a_int select[ncv];
   for (int i = 0; i < ncv; i++) select[i] = 1;
-  double z[(N+1)*(nev+1)];
-  a_int ldz = N+1;
-  double sigma=0;
+  double z[(N + 1) * (nev + 1)];
+  a_int ldz = N + 1;
+  double sigma = 0;
   int k;
-  for (k=0; k < 3*N; ++k )
-    workd[k] = 0;
-  double workl[3*(ncv*ncv) + 6*ncv];
-  for (k=0; k < 3*(ncv*ncv) + 6*ncv; ++k )
-    workl[k] = 0;
-  a_int lworkl = 3*(ncv*ncv) + 6*ncv;
+  for (k = 0; k < 3 * N; ++k) workd[k] = 0;
+  double workl[3 * (ncv * ncv) + 6 * ncv];
+  for (k = 0; k < 3 * (ncv * ncv) + 6 * ncv; ++k) workl[k] = 0;
+  a_int lworkl = 3 * (ncv * ncv) + 6 * ncv;
   a_int info = 0;
-  int rank; MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  int rank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
   iparam[0] = 1;
-  iparam[2] = 10*N;
+  iparam[2] = 10 * N;
   iparam[3] = 1;
-  iparam[4] = 0; // number of ev found by arpack.
+  iparam[4] = 0;  // number of ev found by arpack.
   iparam[6] = 1;
 
   MPI_Fint MCW = MPI_Comm_c2f(MPI_COMM_WORLD);
-  while(ido != 99) {
+  while (ido != 99) {
     /* call arpack like you would have, but, use dsaupd_c instead of dsaupd_ */
-    pdsaupd_c(MCW, &ido, bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam, ipntr,
-              workd, workl, lworkl, &info);
+    pdsaupd_c(MCW, &ido, bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam,
+              ipntr, workd, workl, lworkl, &info);
 
-    dMatVec(&(workd[ipntr[0]-1]), &(workd[ipntr[1]-1]));
+    dMatVec(&(workd[ipntr[0] - 1]), &(workd[ipntr[1] - 1]));
   }
-  if (iparam[4] != nev) return 1; // check number of ev found by arpack.
+  if (iparam[4] != nev) return 1;  // check number of ev found by arpack.
 
   /* call arpack like you would have, but, use dseupd_c instead of dseupd_ */
-  pdseupd_c(MCW, rvec, howmny, select, d, z, ldz, sigma,
-            bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam, ipntr,
-            workd, workl, lworkl, &info);
+  pdseupd_c(MCW, rvec, howmny, select, d, z, ldz, sigma, bmat, N, which, nev,
+            tol, resid, ncv, V, ldv, iparam, ipntr, workd, workl, lworkl,
+            &info);
   int i;
   for (i = 0; i < nev; ++i) {
     printf("rank %d - %f\n", rank, d[i]);
     /*eigen value order: smallest -> biggest*/
-    if(fabs(d[i] - (double)(1000-(nev-1)+i))>1e-6){
+    if (fabs(d[i] - (double)(1000 - (nev - 1) + i)) > 1e-6) {
       free(d);
       return 1;
     }
@@ -92,10 +92,9 @@ int ds() {
   return 0;
 }
 
-void zMatVec(double _Complex * x, double _Complex * y) {
+void zMatVec(double _Complex* x, double _Complex* y) {
   int i;
-  for (i = 0; i < 1000; ++i)
-    y[i] = x[i] * (i+1.0 + _Complex_I * (i+1.0));
+  for (i = 0; i < 1000; ++i) y[i] = x[i] * (i + 1.0 + _Complex_I * (i + 1.0));
 };
 
 int zn() {
@@ -106,57 +105,58 @@ int zn() {
   a_int nev = 1;
   double tol = 0;
   double _Complex resid[N];
-  a_int ncv = 2*nev+1;
-  double _Complex V[ncv*N];
+  a_int ncv = 2 * nev + 1;
+  double _Complex V[ncv * N];
   a_int ldv = N;
   a_int iparam[11];
   a_int ipntr[14];
-  double _Complex workd[3*N];
+  double _Complex workd[3 * N];
   a_int rvec = 0;
   char howmny[] = "A";
-  double _Complex* d = (double _Complex*) malloc((nev+1)*sizeof(double _Complex));
+  double _Complex* d =
+      (double _Complex*)malloc((nev + 1) * sizeof(double _Complex));
   a_int select[ncv];
   for (int i = 0; i < ncv; i++) select[i] = 1;
-  double _Complex z[(N+1)*(nev+1)];
-  a_int ldz = N+1;
-  double _Complex sigma=0. + I*0.;
+  double _Complex z[(N + 1) * (nev + 1)];
+  a_int ldz = N + 1;
+  double _Complex sigma = 0. + I * 0.;
   int k;
-  for (k=0; k < 3*N; ++k )
-    workd[k] = 0. + I * 0.;
-  double _Complex workl[3*(ncv*ncv) + 6*ncv];
-  for (k=0; k < 3*(ncv*ncv) + 6*ncv; ++k )
-    workl[k] = 0. + I * 0.;
-  a_int lworkl = 3*(ncv*ncv) + 6*ncv;
+  for (k = 0; k < 3 * N; ++k) workd[k] = 0. + I * 0.;
+  double _Complex workl[3 * (ncv * ncv) + 6 * ncv];
+  for (k = 0; k < 3 * (ncv * ncv) + 6 * ncv; ++k) workl[k] = 0. + I * 0.;
+  a_int lworkl = 3 * (ncv * ncv) + 6 * ncv;
   double _Complex rwork[ncv];
-  double _Complex workev[2*ncv];
+  double _Complex workev[2 * ncv];
   a_int info = 0;
-  int rank; MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  int rank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
   iparam[0] = 1;
-  iparam[2] = 10*N;
+  iparam[2] = 10 * N;
   iparam[3] = 1;
-  iparam[4] = 0; // number of ev found by arpack.
+  iparam[4] = 0;  // number of ev found by arpack.
   iparam[6] = 1;
 
   MPI_Fint MCW = MPI_Comm_c2f(MPI_COMM_WORLD);
-  while(ido != 99) {
+  while (ido != 99) {
     /* call arpack like you would have, but, use znaupd_c instead of znaupd_ */
-    pznaupd_c(MCW, &ido, bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam, ipntr,
-              workd, workl, lworkl, rwork, &info);
+    pznaupd_c(MCW, &ido, bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam,
+              ipntr, workd, workl, lworkl, rwork, &info);
 
-    zMatVec(&(workd[ipntr[0]-1]), &(workd[ipntr[1]-1]));
+    zMatVec(&(workd[ipntr[0] - 1]), &(workd[ipntr[1] - 1]));
   }
-  if (iparam[4] != nev) return 1; // check number of ev found by arpack.
+  if (iparam[4] != nev) return 1;  // check number of ev found by arpack.
 
   /* call arpack like you would have, but, use zneupd_c instead of zneupd_ */
-  pzneupd_c(MCW, rvec, howmny, select, d, z, ldz, sigma, workev,
-            bmat, N, which, nev, tol, resid, ncv, V, ldv, iparam, ipntr,
-            workd, workl, lworkl, rwork, &info);
+  pzneupd_c(MCW, rvec, howmny, select, d, z, ldz, sigma, workev, bmat, N, which,
+            nev, tol, resid, ncv, V, ldv, iparam, ipntr, workd, workl, lworkl,
+            rwork, &info);
   int i;
   for (i = 0; i < nev; ++i) {
     printf("rank %d - %f %f\n", rank, creal(d[i]), cimag(d[i]));
     /*eigen value order: smallest -> biggest*/
-    if(fabs(creal(d[i]) - (double)(1000-(nev-1)+i))>1e-6 || fabs(cimag(d[i]) - (double)(1000-(nev-1)+i))>1e-6){
+    if (fabs(creal(d[i]) - (double)(1000 - (nev - 1) + i)) > 1e-6 ||
+        fabs(cimag(d[i]) - (double)(1000 - (nev - 1) + i)) > 1e-6) {
       free(d);
       return 1;
     }
@@ -169,7 +169,7 @@ int main() {
   MPI_Init(NULL, NULL);
 
   sstats_c();
-  int rc = ds(); // parpack without debug.
+  int rc = ds();  // parpack without debug.
   fflush(stdout);
   MPI_Barrier(MPI_COMM_WORLD);
   if (rc != 0) return rc;
@@ -178,21 +178,25 @@ int main() {
   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;
   float tmvopx_c, tmvbx_c, tgetv0_c, titref_c, trvec_c;
-  stat_c(  &nopx_c,    &nbx_c, &nrorth_c, &nitref_c, &nrstrt_c,
-         &tsaupd_c, &tsaup2_c, &tsaitr_c, &tseigt_c, &tsgets_c, &tsapps_c, &tsconv_c,
-         &tnaupd_c, &tnaup2_c, &tnaitr_c, &tneigt_c, &tngets_c, &tnapps_c, &tnconv_c,
-         &tcaupd_c, &tcaup2_c, &tcaitr_c, &tceigt_c, &tcgets_c, &tcapps_c, &tcconv_c,
-         &tmvopx_c,  &tmvbx_c, &tgetv0_c, &titref_c,  &trvec_c);
-  printf("Timers : nopx %d, tmvopx %f - nbx %d, tmvbx %f\n", nopx_c, tmvopx_c, nbx_c, tmvbx_c);
-
-  int rank = 0; MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  stat_c(&nopx_c, &nbx_c, &nrorth_c, &nitref_c, &nrstrt_c, &tsaupd_c, &tsaup2_c,
+         &tsaitr_c, &tseigt_c, &tsgets_c, &tsapps_c, &tsconv_c, &tnaupd_c,
+         &tnaup2_c, &tnaitr_c, &tneigt_c, &tngets_c, &tnapps_c, &tnconv_c,
+         &tcaupd_c, &tcaup2_c, &tcaitr_c, &tceigt_c, &tcgets_c, &tcapps_c,
+         &tcconv_c, &tmvopx_c, &tmvbx_c, &tgetv0_c, &titref_c, &trvec_c);
+  printf("Timers : nopx %d, tmvopx %f - nbx %d, tmvbx %f\n", nopx_c, tmvopx_c,
+         nbx_c, tmvbx_c);
+
+  int rank = 0;
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   if (rank == 0) printf("------\n");
 
+  // clang-format off
   debug_c(6, -6, 1,
           1, 1, 1, 1, 1, 1, 1,
           1, 1, 1, 1, 1, 1, 1,
           1, 1, 1, 1, 1, 1, 1); // set debug flags.
-  rc = zn(); // parpack with debug.
+  // clang-format on
+  rc = zn();  // parpack with debug.
   fflush(stdout);
   MPI_Barrier(MPI_COMM_WORLD);
   if (rc != 0) return rc;

diff --git a/PARPACK/TESTS/MPI/icb_parpack_cpp.cpp b/PARPACK/TESTS/MPI/icb_parpack_cpp.cpp
@@ -11,15 +11,14 @@
  * with entries 1000, 999, ... , 2, 1 on the diagonal.
  */
 
-#include "parpack.hpp"
-
 #include <array>
 #include <cmath>
 #include <iostream>
 #include <vector>
 
 #include "debug_c.hpp"  // debug parpack.
-#include "stat_c.hpp"   // arpack statistics.
+#include "parpack.hpp"
+#include "stat_c.hpp"  // arpack statistics.
 
 void diagonal_matrix_vector_product(float const* const x, float* const y) {
   for (int i = 0; i < 1000; ++i) {
@@ -76,8 +75,10 @@ void real_symmetric_runner() {
                                    &(workd[ipntr[1] - 1]));
   }
   // check number of ev found by arpack.
-  if (iparam[4] < nev /*arpack may succeed to compute more EV than expected*/ || info != 0) {
-    std::cout << "ERROR: iparam[4] " << iparam[4] << ", nev " << nev << ", info " << info << std::endl;
+  if (iparam[4] < nev /*arpack may succeed to compute more EV than expected*/ ||
+      info != 0) {
+    std::cout << "ERROR: iparam[4] " << iparam[4] << ", nev " << nev
+              << ", info " << info << std::endl;
     throw std::domain_error("Error inside ARPACK routines");
   }
 
@@ -157,8 +158,10 @@ void complex_symmetric_runner() {
   }
 
   // check number of ev found by arpack
-  if (iparam[4] < nev /*arpack may succeed to compute more EV than expected*/ || info != 0) {
-    std::cout << "ERROR: iparam[4] " << iparam[4] << ", nev " << nev << ", info " << info << std::endl;
+  if (iparam[4] < nev /*arpack may succeed to compute more EV than expected*/ ||
+      info != 0) {
+    std::cout << "ERROR: iparam[4] " << iparam[4] << ", nev " << nev
+              << ", info " << info << std::endl;
     throw std::domain_error("Error inside ARPACK routines");
   }
 
@@ -173,8 +176,10 @@ void complex_symmetric_runner() {
     std::cout << "rank " << rank << " - " << std::real(d[i]) << " "
               << std::imag(d[i]) << '\n';
     /*eigen value order: smallest -> biggest*/
-    if (std::abs(std::real(d[i]) - static_cast<float>(1000 - (nev - 1) + i)) > 1. ||
-        std::abs(std::imag(d[i]) - static_cast<float>(1000 - (nev - 1) + i)) > 1.) {
+    if (std::abs(std::real(d[i]) - static_cast<float>(1000 - (nev - 1) + i)) >
+            1. ||
+        std::abs(std::imag(d[i]) - static_cast<float>(1000 - (nev - 1) + i)) >
+            1.) {
       throw std::domain_error("Correct eigenvalues not computed");
     }
   }