From 7836cc2d747f044ebdef0098a7bcba6ba9baba0d Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 15 May 2018 10:10:08 +0100 Subject: [PATCH 1/3] No checksum output on log for scidac --- lib/qcd/hmc/checkpointers/ScidacCheckpointer.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/qcd/hmc/checkpointers/ScidacCheckpointer.h b/lib/qcd/hmc/checkpointers/ScidacCheckpointer.h index 0867b882..063a475c 100644 --- a/lib/qcd/hmc/checkpointers/ScidacCheckpointer.h +++ b/lib/qcd/hmc/checkpointers/ScidacCheckpointer.h @@ -86,10 +86,7 @@ class ScidacHmcCheckpointer : public BaseHmcCheckpointer { _ScidacWriter.writeScidacFieldRecord(U, MData); _ScidacWriter.close(); - std::cout << GridLogMessage << "Written Scidac Configuration on " << config - << " checksum " << std::hex << nersc_csum<<"/" - << scidac_csuma<<"/" << scidac_csumb - << std::dec << std::endl; + std::cout << GridLogMessage << "Written Scidac Configuration on " << config << std::endl; } }; From c2e8d0aa88bf4de3ad64c7e4e22064021f51d34c Mon Sep 17 00:00:00 2001 From: paboyle Date: Mon, 4 Jun 2018 18:34:15 +0100 Subject: [PATCH 2/3] Solve g++ problem on the lanczos test --- lib/algorithms/iterative/ImplicitlyRestartedLanczos.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h index 8011e796..cee566e6 100644 --- a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h +++ b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h @@ -57,8 +57,10 @@ void basisRotate(std::vector &basis,Eigen::MatrixXd& Qt,int j0, int j1, i parallel_region { - std::vector < vobj > B(Nm); // Thread private - + Vector < vobj > B; // Thread private + + PARALLEL_CRITICAL { B.resize(Nm); } + parallel_for_internal(int ss=0;ss < grid->oSites();ss++){ for(int j=j0; j Date: Mon, 4 Jun 2018 21:08:44 +0100 Subject: [PATCH 3/3] Better thread safety --- lib/algorithms/iterative/ImplicitlyRestartedLanczos.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h index cee566e6..64f1e9a7 100644 --- a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h +++ b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h @@ -57,9 +57,8 @@ void basisRotate(std::vector &basis,Eigen::MatrixXd& Qt,int j0, int j1, i parallel_region { - Vector < vobj > B; // Thread private - PARALLEL_CRITICAL { B.resize(Nm); } + std::vector < vobj , commAllocator > B(Nm); // Thread private parallel_for_internal(int ss=0;ss < grid->oSites();ss++){ for(int j=j0; j