Merge branch 'test_parallel_execution' into 'master'

Always refer to np_int definition

See merge request giacomo.mulas/np_tmcode!25

src/cluster/cluster.cpp

@@ -37,17 +37,6 @@
 #include "../include/TransitionMatrix.h"
 #endif
 
-#ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
-#ifndef INCLUDE_LAPACK_CALLS_H_
-#include "../include/lapack_calls.h"
-#endif
-#endif
-
 #ifndef INCLUDE_ALGEBRAIC_H_
 #include "../include/algebraic.h"
 #endif
@@ -86,7 +75,7 @@ void cluster(string config_file, string data_file, string output_path) {
   if (sconf->number_of_spheres == gconf->number_of_spheres) {
     // Shortcuts to variables stored in configuration objects
     int nsph = gconf->number_of_spheres;
-    lapack_int mxndm = (lapack_int)gconf->mxndm;
+    np_int mxndm = (np_int)gconf->mxndm;
     int inpol = gconf->in_pol;
     int npnt = gconf->npnt;
     int npntts = gconf->npntts;
@@ -144,7 +133,7 @@ void cluster(string config_file, string data_file, string output_path) {
       if (sconf->iog_vec[ci -1] >= ci) configurations++;
     }
     C2 *c2 = new C2(nsph, configurations, npnt, npntts);
-    lapack_int ndit = 2 * nsph * c4->nlim;
+    np_int ndit = 2 * nsph * c4->nlim;
     dcomplex *am_vector = new dcomplex[ndit * ndit]();
     dcomplex **am = new dcomplex*[ndit];
     for (int ai = 0; ai < ndit; ai++) {

src/include/algebraic.h

@@ -12,23 +12,9 @@
  * legacy serial function implementation is used as a fall-back.
  */
 
-#ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
-#else
-#define lapack_int int64_t
-#endif
-
 #ifndef INCLUDE_ALGEBRAIC_H_
 #define INCLUDE_ALGEBRAIC_H_
 
-#ifndef np_int
-#define np_int lapack_int
-#endif
-
 /*! \brief Perform in-place matrix inversion.
  *
  * \param mat: `complex double **` The matrix to be inverted (must be a square matrix).

src/include/clu_subs.h

@@ -17,14 +17,6 @@
 #ifndef INCLUDE_CLU_SUBS_H_
 #define INCLUDE_CLU_SUBS_H_
 
-#ifndef np_int
-#ifndef lapack_int
-#define np_int int64_t
-#else
-#define np_int lapack_int
-#endif
-#endif
-
 /*! \brief Compute the asymmetry-corrected scattering cross-section of a cluster.
  *
  * This function computes the product between the geometrical asymmetry parameter and

src/include/lapack_calls.h

@@ -15,9 +15,9 @@
  * matrix with double precision elements.
  *
  * \param mat: Matrix of complex. The matrix to be inverted.
- * \param n: `lapack_int` The number of rows and columns of the [n x n] matrix.
+ * \param n: `np_int` The number of rows and columns of the [n x n] matrix.
  * \param jer: `int &` Reference to an integer return flag.
  */
-void zinvert(dcomplex **mat, lapack_int n, int &jer);
+void zinvert(dcomplex **mat, np_int n, int &jer);
 
 #endif

src/include/types.h

@@ -12,6 +12,22 @@
 
 typedef __complex__ double dcomplex;
 
+#ifdef USE_LAPACK
+#ifdef USE_MKL
+#include <mkl_lapacke.h>
+#else
+#include <lapacke.h>
+#endif
+#endif
+
+#ifndef np_int
+#ifdef lapack_int
+#define np_int lapack_int
+#else
+#define np_int int64_t
+#endif
+#endif
+
 /*! \brief Get the real part of a complex number.
  *
  * \param z: `complex double` The argument of the function.

src/libnptm/algebraic.cpp

@@ -9,11 +9,6 @@
 #endif
 
 #ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
 #ifndef INCLUDE_LAPACK_CALLS_H_
 #include "../include/lapack_calls.h"
 #endif

src/libnptm/lapack_calls.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #ifdef USE_LAPACK
-void zinvert(dcomplex **mat, lapack_int n, int &jer) {
+void zinvert(dcomplex **mat, np_int n, int &jer) {
   jer = 0;
   dcomplex *arr = &(mat[0][0]);
   const dcomplex uim = 0.0 + 1.0 * I;
@@ -30,7 +30,7 @@ void zinvert(dcomplex **mat, lapack_int n, int &jer) {
   MKL_Complex16 *arr2 = (MKL_Complex16 *) arr;
 #endif
   
-  lapack_int* IPIV = new lapack_int[n]();
+  np_int* IPIV = new np_int[n]();
   
 #ifdef USE_MKL
   LAPACKE_zgetrf(LAPACK_ROW_MAJOR, n, n, arr2, n, IPIV);