Final version with a working Incremental eigCG

Marcogarofalo · Mar 23, 2013 · fe4b586 · fe4b586
1 parent a2226a9
commit fe4b586
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/benchmark.c b/benchmark.c
@@ -115,7 +115,7 @@ int main(int argc,char *argv[])
 #endif
 
   g_rgi_C1 = 1.; 
-  
+
     /* Read the input file */
   if((status = read_input("benchmark.input")) != 0) {
     fprintf(stderr, "Could not find input file: benchmark.input\nAborting...\n");
@@ -127,6 +127,8 @@ int main(int argc,char *argv[])
 #endif
 
   tmlqcd_mpi_init(argc, argv);
+
+
 
   if(g_proc_id==0) {
 #ifdef SSE

diff --git a/benchmark.input b/benchmark.input
@@ -0,0 +1,7 @@
+T=16
+L=8
+NrXProcs = 1
+NrYProcs = 1
+NrZProcs = 1
+
+OMPNumThreads = 1
diff --git a/read_input.l b/read_input.l
@@ -543,6 +543,7 @@ inline void rmQuotes(char *str){
     optr->rel_prec = 0;
     if(myverbose) printf("  SolverRelativePrecision set to NO line %d operator %d\n",  line_of_file, current_operator);
   }
+
   {SPC}*EigCGnrhs{EQL}{DIGIT}+ {
     sscanf(yytext, " %[a-zA-Z] = %d", name, &a);
     (optr->solver_params).eigcg_nrhs = a;
@@ -2111,13 +2112,6 @@ int read_input(char * conf_file){
   stout_rho = _default_stout_rho;
   stout_no_iter = _default_stout_no_iter;
 
-  (optr->solver_params).eigcg_nrhs=1;
-  (optr->solver_params).eigcg_nev=0;
-  (optr->solver_params).eigcg_vmax=0;
-  (optr->solver_params).eigcg_plvl=1;
-  (optr->solver_params).eigcg_ldh=0;
-  (optr->solver_params).eigcg_restolsq=0;
-
   /* check for reread ! */ 
   phmc_compute_evs = _default_phmc_compute_evs;
   compute_evs = _default_compute_evs;

diff --git a/sample-input/sample-incr-eigcg-invert.input b/sample-input/sample-incr-eigcg-invert.input
@@ -5,6 +5,9 @@ NrXProcs = 1
 NrYProcs = 1
 NrZProcs = 1
 
+OmpNumThreads = 1
+
+
 DebugLevel = 5
 InitialStoreCounter = 200
 Measurements = 1
@@ -19,12 +22,6 @@ ReadSource = no
 NoSamples = 1
 DisableIOChecks = yes
 
-EigCGnrhs = 12
-EigCGnev  = 10
-EigCGvmax = 40
-EigCGldh  = 100
-EigCGplvl = 1
-EigCGrestolsq = 1e-8
 
 
 
@@ -33,11 +30,15 @@ BeginOperator TMWILSON
   2kappaMu = 0.0024135
   kappa = 0.160900
   UseEvenOdd = yes
-
   Solver = INCREIGCG
-  SolverPrecision = 1.e-16
+  SolverPrecision = 1.e-8
   MaxSolverIterations = 2000
-
+  EigCGnrhs = 12
+  EigCGnev  = 10
+  EigCGvmax = 40
+  EigCGldh  = 100
+  EigCGplvl = 2
+  EigCGrestolsq = 1e-4
   AddDownPropagator = no
 
 EndOperator