Commit e744c4dd authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Remove compilation dependent refinement flags

parent 4adf04ea

src/include/IterationData.h

+0 −12
Original line number Diff line number Diff line
@@ -133,14 +133,8 @@ public: 
  int lastxi;

  //! \brief ID of the GPU used by one MPI process.

  int proc_device;

  //! \brief Refinement mode selction flag.

  int refinemode;

  //! \brief flag defining a first iteration

  bool is_first_scale;

  //! \brief Maximum number of refinement iterations.

  int maxrefiters;

  //! \brief Required accuracy level.

  double accuracygoal;



  /*! \brief `ClusterIterationData` default instance constructor.

   *
@@ -319,14 +313,8 @@ public: 
  int lastxi;

  //! \brief ID of the GPU used by one MPI process.

  int proc_device;

  //! \brief Refinement mode selction flag.

  int refinemode;

  //! \brief flag defining a first iteration

  bool is_first_scale;

  //! \brief Maximum number of refinement iterations.

  int maxrefiters;

  //! \brief Required accuracy level.

  double accuracygoal;



  /*! \brief `InclusionIterationData` default instance constructor.

   *

src/include/algebraic.h

+1 −4
Original line number Diff line number Diff line
@@ -37,15 +37,12 @@ using namespace std; 
 * \param mat: `complex double **` The matrix to be inverted (must be a square matrix).

 * \param size: `np_int` The size of the matrix (i.e. the number of its rows or columns).

 * \param ier: `int &` Reference to an integer variable for returning a result flag.

 * \param maxrefiters: `int &` Reference to the maximum number of refinement iterations.

 * \param accuracygoal: `double &` Reference to the requested accuracy level.

 * \param refinemode: `int` Flag for refinement mode selection.

 * \param output_path: `const string &` Path where the output needs to be placed.

 * \param jxi488: `int` Index of the current wavelength calculation.

 * \param max_size: `np_int` The maximum expected size (required by some call-backs, optional, defaults to 0).

 * \param target_device: `int` ID of target GPU, if available (defaults to 0).

 * \param rs: `const RuntimeSettings &` Runtime options instance (optional).

 */

void invert_matrix(dcomplex **mat, np_int size, int &ier, int &maxrefiters, double &accuracygoal, int refinemode, const string& output_path, int jxi488, np_int max_size=0, int target_device=0, const RuntimeSettings& rs=RuntimeSettings());

void invert_matrix(dcomplex **mat, np_int size, int &ier, const string& output_path, int jxi488, np_int max_size=0, int target_device=0, const RuntimeSettings& rs=RuntimeSettings());



#endif

src/libnptm/algebraic.cpp

+1 −7
Original line number Diff line number Diff line
@@ -63,17 +63,11 @@ extern void lucin(dcomplex **am, const np_int nddmst, np_int n, int &ier); 
using namespace std;



void invert_matrix(

  dcomplex **mat, np_int size, int &ier, int &maxrefiters, double &accuracygoal,

  int refinemode, const string& output_path, int jxi488, np_int max_size,

  dcomplex **mat, np_int size, int &ier, const string& output_path, int jxi488, np_int max_size,

  int target_device, const RuntimeSettings& rs

) {

  ier = 0;

#ifdef USE_MAGMA

// #ifdef USE_REFINEMENT

//   magma_zinvert_and_refine(mat, size, ier, maxrefiters, accuracygoal, refinemode, target_device, output_path, jxi488);

// #else

//   magma_zinvert(mat, size, ier, target_device);

// #endif

  magma_zinvert(mat, size, ier, target_device, rs);

#elif defined USE_CUBLAS

  cublas_zinvert(mat, size, target_device, rs);