TREX/Sherman-Morrison
1
0
Fork 0
mirror of https://github.com/TREX-CoE/Sherman-Morrison.git synced 2024-08-25 14:41:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from fmgjcoppens/optimise_wb3

Browse Source 
Woodbury 3x3 optimisations
This commit is contained in:
François Coppens 2021-07-12 08:20:19 +02:00 committed by GitHub
commit 05473c81d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 240 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/Helpers.hpp
View File

@ -98,11 +98,12 @@ template <typename T> void matMul(T *A, T *B, T *C, unsigned int M) {
} }
template <typename T1, typename T2, typename T3> template <typename T1, typename T2, typename T3>
void matMul2(T1 *A, T2 *B, T3 *C, unsigned int M, unsigned int N, unsigned int P) { void matMul2(T1 *A, T2 *B, T3 *C, unsigned int M, unsigned int N,
for(unsigned int i = 0; i < M; i++) { unsigned int P) {
for(unsigned int j = 0; j < P; j++) { for (unsigned int i = 0; i < M; i++) {
for (unsigned int j = 0; j < P; j++) {
C[i * P + j] = 0; C[i * P + j] = 0;
for(unsigned int k = 0; k < N; k++) { for (unsigned int k = 0; k < N; k++) {
C[i * P + j] += A[i * N + k] * B[k * P + j]; C[i * P + j] += A[i * N + k] * B[k * P + j];
} }
} }
@ -265,13 +266,12 @@ template <typename T> T residual_frobenius2(T *A, unsigned int Dim) {
return res; return res;
} }
template <typename T> T residual2(T *A, unsigned int Dim) {
template <typename T> T residual2(T * A, unsigned int Dim) {
double res = 0.0; double res = 0.0;
for (unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
for (unsigned int j = 0; j < Dim; j++) { for (unsigned int j = 0; j < Dim; j++) {
T delta = (A[i * Dim + j] - (i == j)); T delta = (A[i * Dim + j] - (i == j));
res += delta*delta; res += delta * delta;
} }
} }
return res; return res;

10
include/SMWB.hpp
View File

@ -1,7 +1,8 @@
// Sherman-Morrison-Woodbury kernel 1 // Sherman-Morrison-Woodbury kernel 1
// WB2, WB3, SM2 mixing scheme // WB2, WB3, SM2 mixing scheme
void SMWB1(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SMWB1(double *Slater_inv, const unsigned int Dim,
double *Updates, unsigned int *Updates_index); const unsigned int N_updates, double *Updates,
unsigned int *Updates_index);
// // Sherman-Morrison-Woodbury kernel 2 // // Sherman-Morrison-Woodbury kernel 2
// // WB2, WB3, SM3 mixing scheme // // WB2, WB3, SM3 mixing scheme
@ -15,5 +16,6 @@ void SMWB1(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Sherman-Morrison-Woodbury kernel 4 // Sherman-Morrison-Woodbury kernel 4
// WB2, SM2 mixing scheme // WB2, SM2 mixing scheme
void SMWB4(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SMWB4(double *Slater_inv, const unsigned int Dim,
double *Updates, unsigned int *Updates_index); const unsigned int N_updates, double *Updates,
unsigned int *Updates_index);

4
include/SM_Standard.hpp
View File

@ -8,7 +8,9 @@ void SM2(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index); double *Updates, unsigned int *Updates_index);
void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index, double *later_updates, unsigned int* later_index, unsigned int *later); double *Updates, unsigned int *Updates_index,
double *later_updates, unsigned int *later_index,
unsigned int *later);
// Sherman Morrison, leaving zero denominators for later // Sherman Morrison, leaving zero denominators for later
void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,

8
include/Woodbury.hpp
View File

@ -1,7 +1,7 @@
// Woodbury 2x2 kernel // Woodbury 2x2 kernel
bool WB2(double *Slater_inv, unsigned int Dim, bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
double *Updates, unsigned int *Updates_index); unsigned int *Updates_index);
// Woodbury 3x3 kernel // Woodbury 3x3 kernel
bool WB3(double *Slater_inv, unsigned int Dim, bool WB3(double *Slater_inv, unsigned int Dim, double *Updates,
double *Updates, unsigned int *Updates_index); unsigned int *Updates_index);

77
src/SMWB.cpp
View File

@ -1,16 +1,19 @@
#include "SMWB.hpp" #include "SMWB.hpp"
#include "Helpers.hpp"
#include "SM_Standard.hpp" #include "SM_Standard.hpp"
#include "Woodbury.hpp" #include "Woodbury.hpp"
#include "Helpers.hpp"
// #define DEBUG1 // #define DEBUG1
// #define DEBUG2 // #define DEBUG2
// Sherman-Morrison-Woodbury kernel 1 // Sherman-Morrison-Woodbury kernel 1
// WB2, WB3, SM2 mixing scheme // WB2, WB3, SM2 mixing scheme
void SMWB1(double *Slater_inv, unsigned int Dim, unsigned int N_updates, double *Updates, unsigned int *Updates_index) { void SMWB1(double *Slater_inv, const unsigned int Dim,
const unsigned int N_updates, double *Updates,
unsigned int *Updates_index) {
#ifdef DEBUG2 #ifdef DEBUG2
std::cerr << "Called Sherman-Morrison-Woodbury kernel 1 with " << N_updates << " updates" << std::endl; std::cerr << "Called Sherman-Morrison-Woodbury kernel 1 with " << N_updates
<< " updates" << std::endl;
showMatrix2(Updates_index, 1, N_updates, "Updates_index"); showMatrix2(Updates_index, 1, N_updates, "Updates_index");
showMatrix2(Updates, N_updates, Dim, "Updates"); showMatrix2(Updates, N_updates, Dim, "Updates");
#endif #endif
@ -21,7 +24,8 @@ void SMWB1(double *Slater_inv, unsigned int Dim, unsigned int N_updates, double
unsigned int length_2block = 2 * Dim; unsigned int length_2block = 2 * Dim;
unsigned int length_1block = 1 * Dim; unsigned int length_1block = 1 * Dim;
// Apply first 3*n_of_3blocks updates in n_of_3blocks blocks of 3 updates with Woodbury 3x3 kernel // Apply first 3*n_of_3blocks updates in n_of_3blocks blocks of 3 updates with
// Woodbury 3x3 kernel
double later_updates[Dim * N_updates]; double later_updates[Dim * N_updates];
unsigned int later_index[N_updates]; unsigned int later_index[N_updates];
unsigned int later = 0; unsigned int later = 0;
@ -32,50 +36,58 @@ void SMWB1(double *Slater_inv, unsigned int Dim, unsigned int N_updates, double
bool ok; bool ok;
ok = WB3(Slater_inv, Dim, Updates_3block, Updates_index_3block); ok = WB3(Slater_inv, Dim, Updates_3block, Updates_index_3block);
if (!ok) { // Send the entire block to SM2 if (!ok) { // Send the entire block to SM2
#ifdef DEBUG2 #ifdef DEBUG2
std::cerr << "Woodbury 3x3 kernel failed! Sending block to SM2" << std::endl; std::cerr << "Woodbury 3x3 kernel failed! Sending block to SM2"
<< std::endl;
showMatrix2(Updates_3block, 3, Dim, "Updates_3block"); showMatrix2(Updates_3block, 3, Dim, "Updates_3block");
showMatrix2(Updates_index_3block, 1, 3, "Updates_index_3block"); showMatrix2(Updates_index_3block, 1, 3, "Updates_index_3block");
#endif #endif
unsigned int l = 0; unsigned int l = 0;
SM2star(Slater_inv, Dim, 3, Updates_3block, Updates_index_3block, later_updates + (Dim * later), later_index + later, &l); SM2star(Slater_inv, Dim, 3, Updates_3block, Updates_index_3block,
later_updates + (Dim * later), later_index + later, &l);
later = later + l; later = later + l;
} }
} }
} }
if (remainder == 2) { // Apply last remaining block of 2 updates with Woodbury 2x2 kernel if (remainder ==
2) { // Apply last remaining block of 2 updates with Woodbury 2x2 kernel
double *Updates_2block = &Updates[n_of_3blocks * length_3block]; double *Updates_2block = &Updates[n_of_3blocks * length_3block];
unsigned int *Updates_index_2block = &Updates_index[3 * n_of_3blocks]; unsigned int *Updates_index_2block = &Updates_index[3 * n_of_3blocks];
bool ok; bool ok;
ok = WB2(Slater_inv, Dim, Updates_2block, Updates_index_2block); ok = WB2(Slater_inv, Dim, Updates_2block, Updates_index_2block);
if (!ok) { // Send the entire block to SM2 if (!ok) { // Send the entire block to SM2
#ifdef DEBUG2 #ifdef DEBUG2
std::cerr << "Woodbury 2x2 kernel failed! Sending block to SM2" << std::endl; std::cerr << "Woodbury 2x2 kernel failed! Sending block to SM2"
#endif << std::endl;
#endif
unsigned int l = 0; unsigned int l = 0;
SM2star(Slater_inv, Dim, 2, Updates_2block, Updates_index_2block, later_updates+(Dim * later), later_index + later, &l); SM2star(Slater_inv, Dim, 2, Updates_2block, Updates_index_2block,
later_updates + (Dim * later), later_index + later, &l);
later = later + l; later = later + l;
} }
} else if (remainder == 1) { // Apply last remaining update with SM2 } else if (remainder == 1) { // Apply last remaining update with SM2
double *Updates_1block = &Updates[n_of_3blocks * length_3block]; double *Updates_1block = &Updates[n_of_3blocks * length_3block];
unsigned int *Updates_index_1block = &Updates_index[3 * n_of_3blocks]; unsigned int *Updates_index_1block = &Updates_index[3 * n_of_3blocks];
unsigned int l = 0; unsigned int l = 0;
SM2star(Slater_inv, Dim, 1, Updates_1block, Updates_index_1block, later_updates+(Dim * later), later_index + later, &l); SM2star(Slater_inv, Dim, 1, Updates_1block, Updates_index_1block,
later_updates + (Dim * later), later_index + later, &l);
later = later + l; later = later + l;
} }
if (later > 0) { if (later > 0) {
SM2(Slater_inv, Dim, later, later_updates, later_index); SM2(Slater_inv, Dim, later, later_updates, later_index);
} }
} }
// Sherman-Morrison-Woodbury kernel 4 // Sherman-Morrison-Woodbury kernel 4
// WB2, SM2 mixing scheme // WB2, SM2 mixing scheme
void SMWB4(double *Slater_inv, const unsigned int Dim, const unsigned int N_updates, double *Updates, unsigned int *Updates_index) { void SMWB4(double *Slater_inv, const unsigned int Dim,
const unsigned int N_updates, double *Updates,
unsigned int *Updates_index) {
#ifdef DEBUG2 #ifdef DEBUG2
std::cerr << "Called Sherman-Morrison-Woodbury kernel 1 with " << N_updates << " updates" << std::endl; std::cerr << "Called Sherman-Morrison-Woodbury kernel 1 with " << N_updates
<< " updates" << std::endl;
showMatrix2(Updates_index, 1, N_updates, "Updates_index"); showMatrix2(Updates_index, 1, N_updates, "Updates_index");
showMatrix2(Updates, N_updates, Dim, "Updates"); showMatrix2(Updates, N_updates, Dim, "Updates");
#endif #endif
@ -85,7 +97,8 @@ void SMWB4(double *Slater_inv, const unsigned int Dim, const unsigned int N_upda
unsigned int length_2block = 2 * Dim; unsigned int length_2block = 2 * Dim;
unsigned int length_1block = 1 * Dim; unsigned int length_1block = 1 * Dim;
// Apply first 2*n_of_2blocks updates in n_of_2blocks blocks of 2 updates with Woodbury 2x2 kernel // Apply first 2*n_of_2blocks updates in n_of_2blocks blocks of 2 updates with
// Woodbury 2x2 kernel
double later_updates[Dim * N_updates]; double later_updates[Dim * N_updates];
unsigned int later_index[N_updates]; unsigned int later_index[N_updates];
unsigned int later = 0; unsigned int later = 0;
@ -96,15 +109,17 @@ void SMWB4(double *Slater_inv, const unsigned int Dim, const unsigned int N_upda
bool ok; bool ok;
ok = WB2(Slater_inv, Dim, Updates_2block, Updates_index_2block); ok = WB2(Slater_inv, Dim, Updates_2block, Updates_index_2block);
if (!ok) { // Send the entire block to SM2 if (!ok) { // Send the entire block to SM2
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Woodbury 2x2 kernel failed! Sending block to SM2star" << std::endl; std::cerr << "Woodbury 2x2 kernel failed! Sending block to SM2star"
#endif << std::endl;
#ifdef DEBUG2 #endif
#ifdef DEBUG2
showMatrix2(Updates_2block, 2, Dim, "Updates_2block"); showMatrix2(Updates_2block, 2, Dim, "Updates_2block");
showMatrix2(Updates_index_2block, 1, 2, "Updates_index_2block"); showMatrix2(Updates_index_2block, 1, 2, "Updates_index_2block");
#endif #endif
unsigned int l = 0; unsigned int l = 0;
SM2star(Slater_inv, Dim, 2, Updates_2block, Updates_index_2block, later_updates + (Dim * later), later_index + later, &l); SM2star(Slater_inv, Dim, 2, Updates_2block, Updates_index_2block,
later_updates + (Dim * later), later_index + later, &l);
later = later + l; later = later + l;
} }
} }
@ -113,24 +128,24 @@ void SMWB4(double *Slater_inv, const unsigned int Dim, const unsigned int N_upda
if (remainder == 1) { // Apply last remaining update with SM2 if (remainder == 1) { // Apply last remaining update with SM2
double *Updates_1block = &Updates[n_of_2blocks * length_2block]; double *Updates_1block = &Updates[n_of_2blocks * length_2block];
unsigned int *Updates_index_1block = &Updates_index[2 * n_of_2blocks]; unsigned int *Updates_index_1block = &Updates_index[2 * n_of_2blocks];
unsigned int l = 0; unsigned int l = 0;
SM2star(Slater_inv, Dim, 1, Updates_1block, Updates_index_1block, later_updates + (Dim * later), later_index + later, &l); SM2star(Slater_inv, Dim, 1, Updates_1block, Updates_index_1block,
later = later + l; later_updates + (Dim * later), later_index + later, &l);
later = later + l;
} }
if (later > 0) { if (later > 0) {
SM2(Slater_inv, Dim, later, later_updates, later_index); SM2(Slater_inv, Dim, later, later_updates, later_index);
} }
} }
extern "C" { extern "C" {
void SMWB1_f(double **linSlater_inv, unsigned int *Dim, unsigned int *N_updates, void SMWB1_f(double **linSlater_inv, unsigned int *Dim, unsigned int *N_updates,
double **linUpdates, unsigned int **Updates_index) { double **linUpdates, unsigned int **Updates_index) {
SMWB1(*linSlater_inv, *Dim, *N_updates, *linUpdates, *Updates_index); SMWB1(*linSlater_inv, *Dim, *N_updates, *linUpdates, *Updates_index);
} }
void SMWB4_f(double **linSlater_inv, unsigned int *Dim, unsigned int *N_updates, void SMWB4_f(double **linSlater_inv, unsigned int *Dim, unsigned int *N_updates,
double **linUpdates, unsigned int **Updates_index) { double **linUpdates, unsigned int **Updates_index) {
SMWB4(*linSlater_inv, *Dim, *N_updates, *linUpdates, *Updates_index); SMWB4(*linSlater_inv, *Dim, *N_updates, *linUpdates, *Updates_index);
} }
} }

8
src/SM_Maponi.cpp
View File

@ -75,10 +75,10 @@ void MaponiA3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (std::fabs(beta) < threshold()) { if (std::fabs(beta) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
#endif #endif
} }
double ibeta = 1.0 / beta; double ibeta = 1.0 / beta;
@ -209,10 +209,10 @@ void MaponiA3S(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (std::fabs(beta) < threshold()) { if (std::fabs(beta) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
#endif #endif
for (unsigned int i = 1; i < Dim + 1; i++) { for (unsigned int i = 1; i < Dim + 1; i++) {
ylk[l][p[l + 1]][i] *= 0.5; ylk[l][p[l + 1]][i] *= 0.5;
later_updates[later * Dim + i - 1] = Updates[l * Dim + i - 1] * 0.5; later_updates[later * Dim + i - 1] = Updates[l * Dim + i - 1] * 0.5;

49
src/SM_Standard.cpp
View File

@ -8,9 +8,9 @@
// Naïve Sherman Morrison // Naïve Sherman Morrison
void SM1(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM1(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index) { double *Updates, unsigned int *Updates_index) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called SM1 with " << N_updates << " updates" << std::endl; std::cerr << "Called SM1 with " << N_updates << " updates" << std::endl;
#endif #endif
double C[Dim]; double C[Dim];
double D[Dim]; double D[Dim];
@ -29,10 +29,10 @@ void SM1(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Denominator // Denominator
double den = 1 + C[Updates_index[l] - 1]; double den = 1 + C[Updates_index[l] - 1];
if (std::fabs(den) < threshold()) { if (std::fabs(den) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
#endif #endif
} }
double iden = 1 / den; double iden = 1 / den;
@ -57,9 +57,9 @@ void SM1(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// http://hdl.handle.net/10919/52966 // http://hdl.handle.net/10919/52966
void SM2(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM2(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index) { double *Updates, unsigned int *Updates_index) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called SM2 with " << N_updates << " updates" << std::endl; std::cerr << "Called SM2 with " << N_updates << " updates" << std::endl;
#endif #endif
double later_updates[Dim * N_updates]; double later_updates[Dim * N_updates];
unsigned int later_index[N_updates]; unsigned int later_index[N_updates];
@ -82,11 +82,11 @@ void SM2(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Denominator // Denominator
double den = 1 + C[Updates_index[l] - 1]; double den = 1 + C[Updates_index[l] - 1];
if (std::fabs(den) < threshold()) { if (std::fabs(den) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
std::cerr << "Denominator = " << den << std::endl; std::cerr << "Denominator = " << den << std::endl;
#endif #endif
// U_l = U_l / 2 (do the split) // U_l = U_l / 2 (do the split)
for (unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
@ -123,10 +123,12 @@ void SM2(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Sherman Morrison, with J. Slagel splitting // Sherman Morrison, with J. Slagel splitting
// http://hdl.handle.net/10919/52966 // http://hdl.handle.net/10919/52966
void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index, double *later_updates, unsigned int* later_index, unsigned int *later) { double *Updates, unsigned int *Updates_index,
#ifdef DEBUG1 double *later_updates, unsigned int *later_index,
unsigned int *later) {
#ifdef DEBUG1
std::cerr << "Called SM2* with " << N_updates << " updates" << std::endl; std::cerr << "Called SM2* with " << N_updates << " updates" << std::endl;
#endif #endif
double C[Dim]; double C[Dim];
double D[Dim]; double D[Dim];
@ -145,11 +147,11 @@ void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Denominator // Denominator
double den = 1 + C[Updates_index[l] - 1]; double den = 1 + C[Updates_index[l] - 1];
if (std::fabs(den) < threshold()) { if (std::fabs(den) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
std::cerr << "Denominator = " << den << std::endl; std::cerr << "Denominator = " << den << std::endl;
#endif #endif
// U_l = U_l / 2 (do the split) // U_l = U_l / 2 (do the split)
for (unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
@ -179,13 +181,12 @@ void SM2star(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
} }
} }
// Sherman Morrison, leaving zero denominators for later // Sherman Morrison, leaving zero denominators for later
void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index) { double *Updates, unsigned int *Updates_index) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called SM3 with " << N_updates << " updates" << std::endl; std::cerr << "Called SM3 with " << N_updates << " updates" << std::endl;
#endif #endif
double C[Dim]; double C[Dim];
double D[Dim]; double D[Dim];
@ -208,10 +209,10 @@ void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Denominator // Denominator
double den = 1 + C[Updates_index[l] - 1]; double den = 1 + C[Updates_index[l] - 1];
if (std::fabs(den) < threshold()) { if (std::fabs(den) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
#endif #endif
for (unsigned int j = 0; j < Dim; j++) { for (unsigned int j = 0; j < Dim; j++) {
later_updates[later * Dim + j] = Updates[l * Dim + j]; later_updates[later * Dim + j] = Updates[l * Dim + j];
} }
@ -239,10 +240,10 @@ void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// If all the updates have failed, exit early with an error // If all the updates have failed, exit early with an error
if (later == N_updates) { if (later == N_updates) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "SM3 cannot invert matrix." << std::endl; std::cerr << "SM3 cannot invert matrix." << std::endl;
showMatrix(Slater_inv, Dim, "Slater_inverse"); showMatrix(Slater_inv, Dim, "Slater_inverse");
#endif #endif
return; return;
} }
// If some have failed, make a recursive call // If some have failed, make a recursive call
@ -256,9 +257,9 @@ void SM3(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// (SM2) // (SM2)
void SM4(double *Slater_inv, unsigned int Dim, unsigned int N_updates, void SM4(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
double *Updates, unsigned int *Updates_index) { double *Updates, unsigned int *Updates_index) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called SM4 with " << N_updates << " updates" << std::endl; std::cerr << "Called SM4 with " << N_updates << " updates" << std::endl;
#endif #endif
double C[Dim]; double C[Dim];
double D[Dim]; double D[Dim];
@ -281,10 +282,10 @@ void SM4(double *Slater_inv, unsigned int Dim, unsigned int N_updates,
// Denominator // Denominator
double den = 1 + C[Updates_index[l] - 1]; double den = 1 + C[Updates_index[l] - 1];
if (std::fabs(den) < threshold()) { if (std::fabs(den) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Breakdown condition triggered at " << Updates_index[l] std::cerr << "Breakdown condition triggered at " << Updates_index[l]
<< std::endl; << std::endl;
#endif #endif
for (unsigned int j = 0; j < Dim; j++) { for (unsigned int j = 0; j < Dim; j++) {
later_updates[later * Dim + j] = Updates[l * Dim + j]; later_updates[later * Dim + j] = Updates[l * Dim + j];
} }

142
src/Woodbury.cpp
View File

@ -16,11 +16,11 @@
// Woodbury 2x2 kernel // Woodbury 2x2 kernel
bool WB2(double *Slater_inv, unsigned int Dim, double *Updates, bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
unsigned int *Updates_index) { unsigned int *Updates_index) {
/* /*
C := S^{-1} * U, dim x 2 C := S^{-1} * U, dim x 2
B := 1 + V * C, 2 x 2 B := 1 + V * C, 2 x 2
D := V * S^{-1}, 2 x dim D := V * S^{-1}, 2 x dim
*/ */
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called Woodbury 2x2 kernel" << std::endl; std::cerr << "Called Woodbury 2x2 kernel" << std::endl;
#endif #endif
@ -28,13 +28,13 @@ bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
const unsigned int row1 = (Updates_index[0] - 1); const unsigned int row1 = (Updates_index[0] - 1);
const unsigned int row2 = (Updates_index[1] - 1); const unsigned int row2 = (Updates_index[1] - 1);
// Compute C = S_inv * U !! NON-STANDARD MATRIX MULTIPLICATION BECAUSE // Compute C = S_inv * U !! NON-STANDARD MATRIX MULTIPLICATION BECAUSE
// OF LAYOUT OF 'Updates' !! // OF LAYOUT OF 'Updates' !!
double C[2 * Dim]; double C[2 * Dim];
for(unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
for(unsigned int j = 0; j < 2; j++) { for (unsigned int j = 0; j < 2; j++) {
C[i * 2 + j] = 0; C[i * 2 + j] = 0;
for(unsigned int k = 0; k < Dim; k++) { for (unsigned int k = 0; k < Dim; k++) {
C[i * 2 + j] += Slater_inv[i * Dim + k] * Updates[Dim * j + k]; C[i * 2 + j] += Slater_inv[i * Dim + k] * Updates[Dim * j + k];
} }
} }
@ -51,10 +51,11 @@ bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
// Check if determinant of inverted matrix is not zero // Check if determinant of inverted matrix is not zero
double det = B[0] * B[3] - B[1] * B[2]; double det = B[0] * B[3] - B[1] * B[2];
if (std::fabs(det) < threshold()) { if (std::fabs(det) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Determinant too close to zero! No inverse found." << std::endl; std::cerr << "Determinant too close to zero! No inverse found."
<< std::endl;
std::cerr << "Determinant = " << det << std::endl; std::cerr << "Determinant = " << det << std::endl;
#endif #endif
return false; return false;
} }
@ -67,17 +68,17 @@ bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
// Compute tmp = B^{-1} x (V.S^{-1}) // Compute tmp = B^{-1} x (V.S^{-1})
double tmp[2 * Dim]; double tmp[2 * Dim];
for(unsigned int i = 0; i < 2; i++) { for (unsigned int i = 0; i < 2; i++) {
for(unsigned int j = 0; j < Dim; j++) { for (unsigned int j = 0; j < Dim; j++) {
tmp[i * Dim + j] = Binv[i * 2] * Slater_inv[row1*Dim + j]; tmp[i * Dim + j] = Binv[i * 2] * Slater_inv[row1 * Dim + j];
tmp[i * Dim + j] += Binv[i * 2 + 1] * Slater_inv[row2*Dim + j]; tmp[i * Dim + j] += Binv[i * 2 + 1] * Slater_inv[row2 * Dim + j];
} }
} }
// Compute (S + U V)^{-1} = S^{-1} - C x tmp // Compute (S + U V)^{-1} = S^{-1} - C x tmp
for(unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
for(unsigned int j = 0; j < Dim; j++) { for (unsigned int j = 0; j < Dim; j++) {
Slater_inv[i * Dim + j] -= C[i * 2 ] * tmp[j]; Slater_inv[i * Dim + j] -= C[i * 2] * tmp[j];
Slater_inv[i * Dim + j] -= C[i * 2 + 1] * tmp[Dim + j]; Slater_inv[i * Dim + j] -= C[i * 2 + 1] * tmp[Dim + j];
} }
} }
@ -86,41 +87,28 @@ bool WB2(double *Slater_inv, unsigned int Dim, double *Updates,
} }
// Woodbury 3x3 kernel // Woodbury 3x3 kernel
bool WB3(double *Slater_inv, unsigned int Dim, double *Updates, bool WB3(double *Slater_inv, unsigned int Dim, double *Updates,
unsigned int *Updates_index) { unsigned int *Updates_index) {
/* /*
C := S^{-1} * U, dim x 3 C := S^{-1} * U, dim x 3
B := 1 + V * C, 3 x 3 B := 1 + V * C, 3 x 3
D := V * S^{-1}, 3 x dim D := V * S^{-1}, 3 x dim
*/ */
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Called Woodbury 3x3 kernel" << std::endl; std::cerr << "Called Woodbury 3x3 kernel" << std::endl;
#endif #endif
#ifdef DEBUG2
showMatrix2(Slater_inv, Dim, Dim, "Slater_inv BEFORE update");
showMatrix2(Updates, 3, Dim, "Updates");
showMatrix2(Updates_index, 1, 3, "Updates_index");
#endif
// Compute D = V * S^{-1} const unsigned int row1 = (Updates_index[0] - 1);
double D[3 * Dim]; const unsigned int row2 = (Updates_index[1] - 1);
unsigned int row1, row2, row3; const unsigned int row3 = (Updates_index[2] - 1);
row1 = Updates_index[0] - 1;
row2 = Updates_index[1] - 1;
row3 = Updates_index[2] - 1;
for (unsigned int i = 0; i < Dim; i++) {
D[i] = Slater_inv[row1 * Dim + i];
D[Dim + i] = Slater_inv[row2 * Dim + i];
D[2 * Dim + i] = Slater_inv[row3 * Dim + i];
}
// Compute C = S_inv * U !! NON-STANDARD MATRIX MULTIPLICATION BECAUSE // Compute C = S_inv * U !! NON-STANDARD MATRIX MULTIPLICATION BECAUSE
// OF LAYOUT OF 'Updates' !! // OF LAYOUT OF 'Updates' !!
double C[3 * Dim]; double C[3 * Dim];
for(unsigned int i = 0; i < Dim; i++) { for (unsigned int i = 0; i < Dim; i++) {
for(unsigned int j = 0; j < 3; j++) { for (unsigned int j = 0; j < 3; j++) {
C[i * 3 + j] = 0; C[i * 3 + j] = 0;
for(unsigned int k = 0; k < Dim; k++) { for (unsigned int k = 0; k < Dim; k++) {
C[i * 3 + j] += Slater_inv[i * Dim + k] * Updates[Dim * j + k]; C[i * 3 + j] += Slater_inv[i * Dim + k] * Updates[Dim * j + k];
} }
} }
@ -128,9 +116,6 @@ bool WB3(double *Slater_inv, unsigned int Dim, double *Updates,
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix2(C, Dim, 3, "C = S_inv * U"); showMatrix2(C, Dim, 3, "C = S_inv * U");
#endif
#ifdef DEBUG2
showMatrix2(D, 3, Dim, "D = V * S_inv"); showMatrix2(D, 3, Dim, "D = V * S_inv");
#endif #endif
@ -154,55 +139,58 @@ bool WB3(double *Slater_inv, unsigned int Dim, double *Updates,
// Check if determinant of B is not too close to zero // Check if determinant of B is not too close to zero
double det; double det;
det = B[0] * (B[4] * B[8] - B[5] * B[7]) - det = B[0] * (B[4] * B[8] - B[5] * B[7]) -
B[1] * (B[3] * B[8] - B[5] * B[6]) + B[1] * (B[3] * B[8] - B[5] * B[6]) + B[2] * (B[3] * B[7] - B[4] * B[6]);
B[2] * (B[3] * B[7] - B[4] * B[6]); #ifdef DEBUG2
#ifdef DEBUG2
std::cerr << "Determinant of B = " << det << std::endl; std::cerr << "Determinant of B = " << det << std::endl;
#endif #endif
if (std::fabs(det) < threshold()) { if (std::fabs(det) < threshold()) {
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "Determinant too close to zero! No inverse found." << std::endl; std::cerr << "Determinant too close to zero! No inverse found."
<< std::endl;
std::cerr << "Determinant = " << det << std::endl; std::cerr << "Determinant = " << det << std::endl;
#endif #endif
return false; return false;
} }
// Compute B^{-1} with explicit formula for 3x3 inversion // Compute B^{-1} with explicit formula for 3x3 inversion
double Binv[9], idet = 1.0 / det; double Binv[9], idet = 1.0 / det;
Binv[0] = ( B[4] * B[8] - B[7] * B[5] ) * idet; Binv[0] = (B[4] * B[8] - B[7] * B[5]) * idet;
Binv[1] = - ( B[1] * B[8] - B[7] * B[2] ) * idet; Binv[1] = -(B[1] * B[8] - B[7] * B[2]) * idet;
Binv[2] = ( B[1] * B[5] - B[4] * B[2] ) * idet; Binv[2] = (B[1] * B[5] - B[4] * B[2]) * idet;
Binv[3] = - ( B[3] * B[8] - B[6] * B[5] ) * idet; Binv[3] = -(B[3] * B[8] - B[6] * B[5]) * idet;
Binv[4] = ( B[0] * B[8] - B[6] * B[2] ) * idet; Binv[4] = (B[0] * B[8] - B[6] * B[2]) * idet;
Binv[5] = - ( B[0] * B[5] - B[3] * B[2] ) * idet; Binv[5] = -(B[0] * B[5] - B[3] * B[2]) * idet;
Binv[6] = ( B[3] * B[7] - B[6] * B[4] ) * idet; Binv[6] = (B[3] * B[7] - B[6] * B[4]) * idet;
Binv[7] = - ( B[0] * B[7] - B[6] * B[1] ) * idet; Binv[7] = -(B[0] * B[7] - B[6] * B[1]) * idet;
Binv[8] = ( B[0] * B[4] - B[3] * B[1] ) * idet; Binv[8] = (B[0] * B[4] - B[3] * B[1]) * idet;
#ifdef DEBUG2 #ifdef DEBUG2
std::cerr << "Conditioning number of B = " << condition1(B, Binv, 3) << std::endl; std::cerr << "Conditioning number of B = " << condition1(B, Binv, 3)
<< std::endl;
showMatrix2(Binv, 3, 3, "Binv"); showMatrix2(Binv, 3, 3, "Binv");
#endif #endif
// Compute B^{-1} x D // Compute tmp = B^{-1} x (V.S^{-1})
double tmp[3 * Dim]; double tmp[3 * Dim];
matMul2(Binv, D, tmp, 3, 3, Dim); for (unsigned int i = 0; i < 3; i++) {
for (unsigned int j = 0; j < Dim; j++) {
tmp[i * Dim + j] = Binv[i * 3] * Slater_inv[row1 * Dim + j];
tmp[i * Dim + j] += Binv[i * 3 + 1] * Slater_inv[row2 * Dim + j];
tmp[i * Dim + j] += Binv[i * 3 + 2] * Slater_inv[row3 * Dim + j];
}
}
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix2(tmp, 3, Dim, "tmp = Binv * D"); showMatrix2(tmp, 3, Dim, "tmp = Binv * D");
#endif #endif
// Compute C x B^{-1} x D // Compute (S + U V)^{-1} = S^{-1} - C x tmp
double tmp2[Dim * Dim]; for (unsigned int i = 0; i < Dim; i++) {
matMul2(C, tmp, tmp2, Dim, 3, Dim); for (unsigned int j = 0; j < Dim; j++) {
Slater_inv[i * Dim + j] -= C[i * 3] * tmp[j];
#ifdef DEBUG2 Slater_inv[i * Dim + j] -= C[i * 3 + 1] * tmp[Dim + j];
showMatrix2(tmp2, Dim, Dim, "tmp2 = C * tmp"); Slater_inv[i * Dim + j] -= C[i * 3 + 2] * tmp[2 * Dim + j];
#endif }
// Compute (S + U V)^{-1} = S^{-1} - C B^{-1} D
for (unsigned int i = 0; i < Dim * Dim; i++) {
Slater_inv[i] -= tmp2[i];
} }
#ifdef DEBUG2 #ifdef DEBUG2

104
tests/fnu_test_h5.cpp
View File

@ -2,10 +2,10 @@
#include "hdf5/serial/hdf5.h" #include "hdf5/serial/hdf5.h"
#include "Helpers.hpp" #include "Helpers.hpp"
#include "SMWB.hpp"
#include "SM_Maponi.hpp" #include "SM_Maponi.hpp"
#include "SM_Standard.hpp" #include "SM_Standard.hpp"
#include "Woodbury.hpp" #include "Woodbury.hpp"
#include "SMWB.hpp"
#include <fstream> #include <fstream>
#include <vector> #include <vector>
@ -59,10 +59,10 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
double *u = new double[nupdates * dim]; double *u = new double[nupdates * dim];
/* Test */ /* Test */
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix(slater_inverse, dim, "OLD Inverse"); showMatrix(slater_inverse, dim, "OLD Inverse");
#endif #endif
// Transform replacement updates in 'updates[]' into additive updates in 'u[]' // Transform replacement updates in 'updates[]' into additive updates in 'u[]'
for (j = 0; j < nupdates; j++) { for (j = 0; j < nupdates; j++) {
@ -74,70 +74,80 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
} }
} }
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix(slater_matrix, dim, "OLD Slater"); showMatrix(slater_matrix, dim, "OLD Slater");
showMatrix(u, dim, "Updates"); showMatrix(u, dim, "Updates");
#endif #endif
#ifdef PERF #ifdef PERF
#ifdef DEBUG1 #ifdef DEBUG1
std::cerr << "# of reps. = " << repetition_number << std::endl; std::cerr << "# of reps. = " << repetition_number << std::endl;
#endif // DEBUG1 #endif // DEBUG1
double *slater_inverse_nonpersistent = new double[dim * dim]; double *slater_inverse_nonpersistent = new double[dim * dim];
if (version == "sm1") { if (version == "sm1") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SM1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SM1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
} else if (version == "sm2") { } else if (version == "sm2") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SM2(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SM2(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
} else if (version == "sm3") { } else if (version == "sm3") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SM3(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SM3(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
} else if (version == "sm4") { } else if (version == "sm4") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SM4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SM4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
} else if (version == "wb2") { } else if (version == "wb2") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
WB2(slater_inverse_nonpersistent, dim, u, col_update_index); WB2(slater_inverse_nonpersistent, dim, u, col_update_index);
} }
} else if (version == "wb3") { } else if (version == "wb3") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
WB3(slater_inverse_nonpersistent, dim, u, col_update_index); WB3(slater_inverse_nonpersistent, dim, u, col_update_index);
} }
} else if (version == "smwb1") { } else if (version == "smwb1") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SMWB1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SMWB1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
} else if (version == "smwb4") { } else if (version == "smwb4") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
SMWB4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SMWB4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} }
#ifdef MKL #ifdef MKL
} else if (version == "lapack") { } else if (version == "lapack") {
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_matrix, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_matrix,
dim * dim * sizeof(double));
inverse(slater_inverse_nonpersistent, dim); inverse(slater_inverse_nonpersistent, dim);
} }
#endif // MKL #endif // MKL
} else { } else {
std::cerr << "Unknown version " << version << std::endl; std::cerr << "Unknown version " << version << std::endl;
exit(1); exit(1);
} }
std::memcpy(slater_inverse, slater_inverse_nonpersistent, dim * dim * sizeof(double)); std::memcpy(slater_inverse, slater_inverse_nonpersistent,
dim * dim * sizeof(double));
delete[] slater_inverse_nonpersistent; delete[] slater_inverse_nonpersistent;
#else // No performance measurements repetition #else // No performance measurements repetition
if (version == "maponia3") { if (version == "maponia3") {
MaponiA3(slater_inverse, dim, nupdates, u, col_update_index); MaponiA3(slater_inverse, dim, nupdates, u, col_update_index);
} else if (version == "maponia3s") { } else if (version == "maponia3s") {
@ -156,27 +166,27 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
WB3(slater_inverse, dim, u, col_update_index); WB3(slater_inverse, dim, u, col_update_index);
} else if (version == "smwb1") { } else if (version == "smwb1") {
SMWB1(slater_inverse, dim, nupdates, u, col_update_index); SMWB1(slater_inverse, dim, nupdates, u, col_update_index);
// } else if (version == "smwb2") { // } else if (version == "smwb2") {
// SMWB2(slater_inverse, dim, nupdates, u, col_update_index); // SMWB2(slater_inverse, dim, nupdates, u, col_update_index);
// } else if (version == "smwb3") { // } else if (version == "smwb3") {
// SMWB3(slater_inverse, dim, nupdates, u, col_update_index); // SMWB3(slater_inverse, dim, nupdates, u, col_update_index);
} else if (version == "smwb4") { } else if (version == "smwb4") {
SMWB4(slater_inverse, dim, nupdates, u, col_update_index); SMWB4(slater_inverse, dim, nupdates, u, col_update_index);
#ifdef MKL #ifdef MKL
} else if (version == "lapack") { } else if (version == "lapack") {
memcpy(slater_inverse, slater_matrix, dim * dim * sizeof(double)); memcpy(slater_inverse, slater_matrix, dim * dim * sizeof(double));
inverse(slater_inverse, dim); inverse(slater_inverse, dim);
#endif // MKL #endif // MKL
} else { } else {
std::cerr << "Unknown version " << version << std::endl; std::cerr << "Unknown version " << version << std::endl;
exit(1); exit(1);
} }
#endif // PERF #endif // PERF
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix(slater_matrix, dim, "NEW Slater"); showMatrix(slater_matrix, dim, "NEW Slater");
showMatrix(slater_inverse, dim, "NEW Inverse"); showMatrix(slater_inverse, dim, "NEW Inverse");
#endif #endif
double *res = new double[dim * dim]{0}; double *res = new double[dim * dim]{0};
matMul(slater_matrix, slater_inverse, res, dim); matMul(slater_matrix, slater_inverse, res, dim);
@ -184,14 +194,14 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
double res_max = residual_max(res, dim); double res_max = residual_max(res, dim);
double res2 = residual_frobenius2(res, dim); double res2 = residual_frobenius2(res, dim);
#ifdef RESIDUAL #ifdef RESIDUAL
std::cout << "Residual = " << version << " " << cycle << " " << res_max << " " std::cout << "Residual = " << version << " " << cycle << " " << res_max << " "
<< res2 << std::endl; << res2 << std::endl;
#endif #endif
#ifdef DEBUG2 #ifdef DEBUG2
showMatrix(res, dim, "Result"); showMatrix(res, dim, "Result");
#endif #endif
delete[] res, updates, u, col_update_index, slater_matrix, slater_inverse; delete[] res, updates, u, col_update_index, slater_matrix, slater_inverse;
@ -199,7 +209,7 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef PERF #ifdef PERF
if (argc != 5) { if (argc != 5) {
std::cerr << "Execute from within 'datasets/'" << std::endl; std::cerr << "Execute from within 'datasets/'" << std::endl;
std::cerr std::cerr
@ -207,38 +217,38 @@ int main(int argc, char **argv) {
<< std::endl; << std::endl;
return 1; return 1;
} }
#else #else
if (argc != 4) { if (argc != 4) {
std::cerr << "Execute from within 'datasets/'" << std::endl; std::cerr << "Execute from within 'datasets/'" << std::endl;
std::cerr std::cerr << "usage: test_h5 <version> <cycle file> <tolerance>"
<< "usage: test_h5 <version> <cycle file> <tolerance>" << std::endl;
<< std::endl;
return 1; return 1;
} }
#endif #endif
std::string version(argv[1]); std::string version(argv[1]);
std::string cyclefile_name(argv[2]); std::string cyclefile_name(argv[2]);
std::ifstream cyclefile(cyclefile_name); std::ifstream cyclefile(cyclefile_name);
std::vector<int> cycles; std::vector<int> cycles;
unsigned int cycle; unsigned int cycle;
while (cyclefile >> cycle) cycles.push_back(cycle); while (cyclefile >> cycle)
cycles.push_back(cycle);
double tolerance = std::stod(argv[3]); double tolerance = std::stod(argv[3]);
H5File file(FILE_NAME, H5F_ACC_RDONLY); H5File file(FILE_NAME, H5F_ACC_RDONLY);
#ifdef PERF #ifdef PERF
repetition_number = std::stoi(argv[4]); repetition_number = std::stoi(argv[4]);
#endif #endif
bool ok; bool ok;
for (auto & cycle : cycles) { for (auto &cycle : cycles) {
ok = test_cycle(file, cycle, version, tolerance); ok = test_cycle(file, cycle, version, tolerance);
#ifdef STATUS #ifdef STATUS
if (ok) { if (ok) {
std::cerr << "ok -- cycle " << std::to_string(cycle) << std::endl; std::cerr << "ok -- cycle " << std::to_string(cycle) << std::endl;
} else { } else {
std::cerr << "failed -- cycle " << std::to_string(cycle) << std::endl; std::cerr << "failed -- cycle " << std::to_string(cycle) << std::endl;
} }
#endif #endif
} }
return ok; return ok;

35
tests/test_h5.cpp
View File

@ -2,10 +2,10 @@
#include "hdf5/serial/hdf5.h" #include "hdf5/serial/hdf5.h"
#include "Helpers.hpp" #include "Helpers.hpp"
#include "SMWB.hpp"
#include "SM_Maponi.hpp" #include "SM_Maponi.hpp"
#include "SM_Standard.hpp" #include "SM_Standard.hpp"
#include "Woodbury.hpp" #include "Woodbury.hpp"
#include "SMWB.hpp"
#define PERF #define PERF
@ -82,11 +82,14 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
std::cout << "# of reps. = " << repetition_number << std::endl; std::cout << "# of reps. = " << repetition_number << std::endl;
double *slater_inverse_nonpersistent = new double[dim * dim]; double *slater_inverse_nonpersistent = new double[dim * dim];
for (unsigned int i = 0; i < repetition_number; i++) { for (unsigned int i = 0; i < repetition_number; i++) {
std::memcpy(slater_inverse_nonpersistent, slater_inverse, dim * dim * sizeof(double)); std::memcpy(slater_inverse_nonpersistent, slater_inverse,
dim * dim * sizeof(double));
if (version == "maponia3") { if (version == "maponia3") {
MaponiA3(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); MaponiA3(slater_inverse_nonpersistent, dim, nupdates, u,
col_update_index);
} else if (version == "maponia3s") { } else if (version == "maponia3s") {
MaponiA3S(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); MaponiA3S(slater_inverse_nonpersistent, dim, nupdates, u,
col_update_index);
} else if (version == "sm1") { } else if (version == "sm1") {
SM1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SM1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
} else if (version == "sm2") { } else if (version == "sm2") {
@ -101,15 +104,18 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
WB3(slater_inverse_nonpersistent, dim, u, col_update_index); WB3(slater_inverse_nonpersistent, dim, u, col_update_index);
} else if (version == "smwb1") { } else if (version == "smwb1") {
SMWB1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SMWB1(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
// } else if (version == "smwb2") { // } else if (version == "smwb2") {
// SMWB2(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); // SMWB2(slater_inverse_nonpersistent, dim, nupdates, u,
// } else if (version == "smwb3") { // col_update_index);
// SMWB3(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); // } else if (version == "smwb3") {
// SMWB3(slater_inverse_nonpersistent, dim, nupdates, u,
// col_update_index);
} else if (version == "smwb4") { } else if (version == "smwb4") {
SMWB4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index); SMWB4(slater_inverse_nonpersistent, dim, nupdates, u, col_update_index);
#ifdef MKL #ifdef MKL
} else if (version == "lapack") { } else if (version == "lapack") {
memcpy(slater_inverse_nonpersistent, slater_matrix, dim * dim * sizeof(double)); memcpy(slater_inverse_nonpersistent, slater_matrix,
dim * dim * sizeof(double));
inverse(slater_inverse_nonpersistent, dim); inverse(slater_inverse_nonpersistent, dim);
#endif // MKL #endif // MKL
} else { } else {
@ -117,7 +123,8 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
exit(1); exit(1);
} }
} }
std::memcpy(slater_inverse, slater_inverse_nonpersistent, dim * dim * sizeof(double)); std::memcpy(slater_inverse, slater_inverse_nonpersistent,
dim * dim * sizeof(double));
delete[] slater_inverse_nonpersistent; delete[] slater_inverse_nonpersistent;
#else #else
if (version == "maponia3") { if (version == "maponia3") {
@ -138,10 +145,10 @@ int test_cycle(H5File file, int cycle, std::string version, double tolerance) {
WB3(slater_inverse, dim, u, col_update_index); WB3(slater_inverse, dim, u, col_update_index);
} else if (version == "smwb1") { } else if (version == "smwb1") {
SMWB1(slater_inverse, dim, nupdates, u, col_update_index); SMWB1(slater_inverse, dim, nupdates, u, col_update_index);
// } else if (version == "smwb2") { // } else if (version == "smwb2") {
// SMWB2(slater_inverse, dim, nupdates, u, col_update_index); // SMWB2(slater_inverse, dim, nupdates, u, col_update_index);
// } else if (version == "smwb3") { // } else if (version == "smwb3") {
// SMWB3(slater_inverse, dim, nupdates, u, col_update_index); // SMWB3(slater_inverse, dim, nupdates, u, col_update_index);
} else if (version == "smwb4") { } else if (version == "smwb4") {
SMWB4(slater_inverse, dim, nupdates, u, col_update_index); SMWB4(slater_inverse, dim, nupdates, u, col_update_index);
#ifdef MKL #ifdef MKL

4
tests/vfc_test_h5.cpp
View File

@ -166,7 +166,7 @@ int main(int argc, char **argv) {
bool ok; bool ok;
for (int i = 0; i < cycles_list.size(); i++) { for (int i = 0; i < cycles_list.size(); i++) {
for(const auto& version: versions) { for (const auto &version : versions) {
ok = test_cycle(file, cycles_list[i], version, &probes); ok = test_cycle(file, cycles_list[i], version, &probes);
if (ok) { if (ok) {
@ -174,9 +174,7 @@ int main(int argc, char **argv) {
} else { } else {
std::cerr << "failed -- cycle " << std::to_string(i) << std::endl; std::cerr << "failed -- cycle " << std::to_string(i) << std::endl;
} }
} }
} }
vfc_dump_probes(&probes); vfc_dump_probes(&probes);

2
tools/restyle.sh
View File

@ -11,5 +11,5 @@ fi
for ext in c cc cpp h hpp for ext in c cc cpp h hpp
do do
find $SMROOT -type f -iname "*.${ext}" -exec echo "$FORMATER $STYLE" {} \; find $SMROOT -type f -iname "*.${ext}" -exec $FORMATER $STYLE {} \;
done done