gallo/atrip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up couple of things

Browse Source
This commit is contained in:
Alejandro Gallo 2022-01-27 20:59:42 +01:00
parent e161e4c0d6
commit 7f455d54fd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atrip.org
View File

@ -2133,7 +2133,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
= [ &unions = [ &unions
, np , np
, &chrono , &chrono
] (ABCTuple const& abc, MPI_Comm const& c) -> typename Slice<F>::Database { ] (ABCTuple const& abc, MPI_Comm const& c) -> Database {
chrono["db:comm:type:do"].start(); chrono["db:comm:type:do"].start();
auto MPI_LDB_ELEMENT = Slice<F>::mpi::localDatabaseElement(); auto MPI_LDB_ELEMENT = Slice<F>::mpi::localDatabaseElement();
@ -2148,8 +2148,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
} }
chrono["db:comm:ldb"].stop(); chrono["db:comm:ldb"].stop();
typename Database db(np * ldb.size(), ldb[0]);
Slice<F>::Database db(np * ldb.size(), ldb[0]);
chrono["oneshot-db:comm:allgather"].start(); chrono["oneshot-db:comm:allgather"].start();
chrono["db:comm:allgather"].start(); chrono["db:comm:allgather"].start();
@ -2171,7 +2170,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
}; };
auto doIOPhase auto doIOPhase
= [&unions, &rank, &np, &universe, &chrono] (typename Slice<F>::Database const& db) { = [&unions, &rank, &np, &universe, &chrono] (Database const& db) {
const size_t localDBLength = db.size() / np; const size_t localDBLength = db.size() / np;
@ -2270,14 +2269,13 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
// START MAIN LOOP ======================================================{{{1 // START MAIN LOOP ======================================================{{{1
typename Slice<F>::Database db;
for ( size_t i = abcIndex.first, iteration = 1 for ( size_t i = abcIndex.first, iteration = 1
; i < abcIndex.second ; i < abcIndex.second
; i++, iteration++ ; i++, iteration++
) { ) {
chrono["iterations"].start(); chrono["iterations"].start();
// check overhead from chrono over all iterations // check overhead from chrono over all iterations
chrono["start:stop"].start(); chrono["start:stop"].stop(); chrono["start:stop"].start(); chrono["start:stop"].stop();
@ -2356,7 +2354,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
WITH_RANK << "__comm__:" << iteration << "th communicating database\n"; WITH_RANK << "__comm__:" << iteration << "th communicating database\n";
chrono["db:comm"].start(); chrono["db:comm"].start();
//const auto db = communicateDatabase(*abcNext, universe); //const auto db = communicateDatabase(*abcNext, universe);
db = communicateDatabase(*abcNext, universe); Database db = communicateDatabase(*abcNext, universe);
chrono["db:comm"].stop(); chrono["db:comm"].stop();
chrono["db:io"].start(); chrono["db:io"].start();
doIOPhase(db); doIOPhase(db);
@ -2377,7 +2375,6 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
))) )))
chrono["oneshot-doubles"].start(); chrono["oneshot-doubles"].start();
chrono["doubles"].start(); chrono["doubles"].start();
LOGREMOVE << "doubles " << iteration << "\n";
doublesContribution<F>( abc, (size_t)No, (size_t)Nv doublesContribution<F>( abc, (size_t)No, (size_t)Nv
// -- VABCI // -- VABCI
, abph.unwrapSlice(Slice<F>::AB, abc) , abph.unwrapSlice(Slice<F>::AB, abc)