Minor modifications to test programs.

This commit is contained in:
Francois Coppens 2021-07-17 11:40:59 +02:00
parent f10502da9d
commit 2ec8fb278c
2 changed files with 11 additions and 8 deletions

View File

@ -10,7 +10,7 @@
#include <vector> #include <vector>
#define PERF #define PERF
// #define STATUS #define STATUS
// #define RESIDUAL // #define RESIDUAL
#ifdef PERF #ifdef PERF
@ -166,10 +166,6 @@ 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") {
// SMWB2(slater_inverse, dim, nupdates, u, col_update_index);
// } else if (version == "smwb3") {
// SMWB3(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);
#ifdef MKL #ifdef MKL
@ -213,14 +209,14 @@ int main(int argc, char **argv) {
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
<< "usage: test_h5 <version> <cycle file> <tolerance> <number of reps.>" << "usage: fnu_test_h5 <version> <cycle file> <tolerance> <number of reps.>"
<< 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 << "usage: test_h5 <version> <cycle file> <tolerance>" std::cerr << "usage: fnu_test_h5 <version> <cycle file> <tolerance>"
<< std::endl; << std::endl;
return 1; return 1;
} }

View File

@ -181,15 +181,22 @@ 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 != 6) { if (argc != 6) {
std::cerr << "Execute from within 'datasets/'" << std::endl;
std::cerr
<< "usage: test_h5 <version> <start cycle> <stop cycle> <tolerance> <number of reps.>"
<< std::endl;
return 1;
}
#else #else
if (argc != 5) { if (argc != 5) {
#endif
std::cerr << "Execute from within 'datasets/'" << std::endl; std::cerr << "Execute from within 'datasets/'" << std::endl;
std::cerr std::cerr
<< "usage: test_h5 <version> <start cycle> <stop cycle> <tolerance>" << "usage: test_h5 <version> <start cycle> <stop cycle> <tolerance>"
<< std::endl; << std::endl;
return 1; return 1;
} }
#endif
std::string version(argv[1]); std::string version(argv[1]);
int start_cycle = std::stoi(argv[2]); int start_cycle = std::stoi(argv[2]);
int stop_cycle = std::stoi(argv[3]); int stop_cycle = std::stoi(argv[3]);