QPhiX interface: prepare for two flavour implementation of simple

(non-multi-shift) solvers.

1) Remove source preparation and even-site reconstruction
   ability from interface because it would not be supported
   for the two-flavour case anyway. Also, it is generally not
   required. The base classes are still necessary to provide
   tests for single applications of the full operators.

2) In inverter, use vector of FourSpinorHandle for managing QPhiX spinor
   storage.

3) Remove unnecessary function arguments in some places.

Author: kostrzewa

invert_clover_eo.c

@@ -111,12 +111,12 @@ int invert_clover_eo(spinor * const Even_new, spinor * const Odd_new,
 #ifdef TM_USE_QPHIX
     if( inverter==QPHIX_INVERTER ) {
       // QPhiX inverts M(mu)M(mu)^dag or M(mu), no gamma_5 multiplication required
-      iter = invert_eo_qphix(NULL, Odd_new, NULL, g_spinor_field[DUM_DERI],
-                            precision, max_iter,
-                            solver_flag, rel_prec,
-                            solver_params,
-                            sloppy,
-                            compression, Qsq);
+      iter = invert_eo_qphix_oneflavour(Odd_new, g_spinor_field[DUM_DERI],
+                                        precision, max_iter,
+                                        solver_flag, rel_prec,
+                                        solver_params,
+                                        sloppy,
+                                        compression);
       // for solver_params.solution_type == TM_SOLUTION_M (the default)
       // QPhiX applies M(mu)^dag internally for normal equation solves, no call to tmLQCD operaor required
     } else

invert_eo.c

@@ -161,12 +161,12 @@ int invert_eo(spinor * const Even_new, spinor * const Odd_new,
 #ifdef TM_USE_QPHIX
     if( inverter==QPHIX_INVERTER ) {
       // QPhiX inverts M(mu)M(mu)^dag or M(mu), no gamma_5 source multiplication required
-      iter = invert_eo_qphix(NULL, Odd_new, NULL, g_spinor_field[DUM_DERI],
-                            precision, max_iter,
-                            solver_flag, rel_prec,
-                            solver_params,
-                            sloppy,
-                            compression, &Qtm_pm_psi);    
+      iter = invert_eo_qphix_oneflavour(Odd_new, g_spinor_field[DUM_DERI],
+                                        precision, max_iter,
+                                        solver_flag, rel_prec,
+                                        solver_params,
+                                        sloppy,
+                                        compression);    
       // for solver_params.solution_type == TM_SOLUTION_M (the default)
       // QPhiX applies M(mu)^dag internally for normal equation solves, no call to tmLQCD operaor required
     } else

qphix_interface.cpp

@@ -76,12 +76,23 @@ extern "C" {
 void initQPhiX(int argc, char** argv, QphixParams_t params, int c12, QphixPrec_t precision);
 void _endQphix();
 
-// Wrapper functions for Full Solver and Dslash
-int invert_eo_qphix(spinor* const Even_new, spinor* const Odd_new, spinor* const Even,
-                    spinor* const Odd, const double precision, const int max_iter,
-                    const int solver_flag, const int rel_prec, solver_params_t solver_params,
-                    const SloppyPrecision sloppy, const CompressionType compression,
-                    matrix_mult mat_op);
+int invert_eo_qphix_oneflavour(spinor * const Odd_out, spinor* const Odd_in, 
+                               const double precision, const int max_iter,
+                               const int solver_flag, const int rel_prec, solver_params_t solver_params,
+                               const SloppyPrecision sloppy, const CompressionType compression);
+
+int invert_eo_qphix_twoflavour(spinor * Odd_out_s, spinor * Odd_out_c,
+                               spinor * Odd_in_s, spinor * Odd_in_c, 
+                               const double precision, const int max_iter,
+                               const int solver_flag, const int rel_prec, solver_params_t solver_params,
+                               const SloppyPrecision sloppy, const CompressionType compression);
+
+int invert_eo_qphix_nflavour(spinor ** Odd_out, spinor ** Odd_in,
+                            const double target_precision, const double precision_lambda,
+                            const int max_iter,
+                            const int solver_flag, solver_params_t solver_params,
+                            const SloppyPrecision sloppy, const CompressionType compression,
+                            const int num_flavour);
 
 void Mfull_qphix(spinor* Even_out, spinor* Odd_out, const spinor* Even_in, const spinor* Odd_in,
                  const op_type_t op_type);

qphix_interface.h

@@ -95,7 +95,8 @@ int solve_degenerate(spinor * const P, spinor * const Q, solver_params_t solver_
     // gamma_5 (M M^dagger)^{-1} gamma_5 b
     // FIXME: this needs to be adjusted to also support BICGSTAB
     gamma5(temp[1], Q, VOLUME/2);
-    iteration_count = invert_eo_qphix(NULL, P, NULL, temp[1], eps_sq, max_iter, solver_type, rel_prec, solver_params, sloppy, compression, f);
+    iteration_count = invert_eo_qphix_oneflavour(P, temp[1], eps_sq, max_iter, solver_type, 
+                                                 rel_prec, solver_params, sloppy, compression);
     mul_gamma5(P, VOLUME/2);
 
 #ifdef WIP