Tangle sources
This commit is contained in:
parent
d76c33f9e8
commit
bea9c7a75e
@ -17,6 +17,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <mpi.h>
|
||||||
|
|
||||||
|
|
||||||
#include <atrip/Utils.hpp>
|
#include <atrip/Utils.hpp>
|
||||||
@ -34,8 +35,9 @@ namespace atrip {
|
|||||||
|
|
||||||
static int rank;
|
static int rank;
|
||||||
static int np;
|
static int np;
|
||||||
|
static MPI_Comm communicator;
|
||||||
static Timings chrono;
|
static Timings chrono;
|
||||||
static void init();
|
static void init(MPI_Comm);
|
||||||
|
|
||||||
template <typename F=double>
|
template <typename F=double>
|
||||||
struct Input {
|
struct Input {
|
||||||
@ -68,6 +70,11 @@ namespace atrip {
|
|||||||
ADD_ATTRIBUTE(int, iterationMod, -1)
|
ADD_ATTRIBUTE(int, iterationMod, -1)
|
||||||
ADD_ATTRIBUTE(int, percentageMod, -1)
|
ADD_ATTRIBUTE(int, percentageMod, -1)
|
||||||
ADD_ATTRIBUTE(TuplesDistribution, tuplesDistribution, NAIVE)
|
ADD_ATTRIBUTE(TuplesDistribution, tuplesDistribution, NAIVE)
|
||||||
|
ADD_ATTRIBUTE(std::string, checkpointPath, "atrip-checkpoint.yaml")
|
||||||
|
ADD_ATTRIBUTE(bool, readCheckpointIfExists, true)
|
||||||
|
ADD_ATTRIBUTE(bool, writeCheckpoint, true)
|
||||||
|
ADD_ATTRIBUTE(float, checkpointAtPercentage, 10)
|
||||||
|
ADD_ATTRIBUTE(size_t, checkpointAtEveryIteration, 0)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
92
include/atrip/Checkpoint.hpp
Normal file
92
include/atrip/Checkpoint.hpp
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
// Copyright 2022 Alejandro Gallo
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
// [[file:../../atrip.org::*Prolog][Prolog:1]]
|
||||||
|
#pragma once
|
||||||
|
#include <fstream>
|
||||||
|
#include <iomanip>
|
||||||
|
|
||||||
|
#include <atrip/Atrip.hpp>
|
||||||
|
|
||||||
|
namespace atrip {
|
||||||
|
// Prolog:1 ends here
|
||||||
|
|
||||||
|
// [[file:../../atrip.org::checkpoint-definition][checkpoint-definition]]
|
||||||
|
// template <typename F>
|
||||||
|
struct Checkpoint {
|
||||||
|
size_t no, nv;
|
||||||
|
size_t nranks;
|
||||||
|
size_t nnodes;
|
||||||
|
double energy;
|
||||||
|
size_t iteration;
|
||||||
|
// TODO
|
||||||
|
// Input<F>::TuplesDistribution distribution(GROUP_AND_SORT);
|
||||||
|
bool rankRoundRobin;
|
||||||
|
};
|
||||||
|
// checkpoint-definition ends here
|
||||||
|
|
||||||
|
// [[file:../../atrip.org::*Input and output][Input and output:1]]
|
||||||
|
void write_checkpoint(Checkpoint const& c, std::string const& filepath) {
|
||||||
|
std::ofstream out(filepath);
|
||||||
|
out << "No: " << c.no
|
||||||
|
<< "\n"
|
||||||
|
<< "Nv: " << c.nv
|
||||||
|
<< "\n"
|
||||||
|
<< "Nranks: " << c.nranks
|
||||||
|
<< "\n"
|
||||||
|
<< "Nnodes: " << c.nnodes
|
||||||
|
<< "\n"
|
||||||
|
<< "Energy: " << std::setprecision(19) << c.energy
|
||||||
|
<< "\n"
|
||||||
|
<< "Iteration: " << c.iteration
|
||||||
|
<< "\n"
|
||||||
|
<< "RankRoundRobin: " << (c.rankRoundRobin ? "true" : "false")
|
||||||
|
<< "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Checkpoint read_checkpoint(std::ifstream& in) {
|
||||||
|
Checkpoint c;
|
||||||
|
// trim chars from the string, to be more sure and not use regexes
|
||||||
|
auto trim = [](std::string& s, std::string const& chars) {
|
||||||
|
s.erase(0, s.find_first_not_of(chars));
|
||||||
|
s.erase(s.find_last_not_of(chars) + 1);
|
||||||
|
return s;
|
||||||
|
};
|
||||||
|
for (std::string header, value; std::getline(in, header, ':');) {
|
||||||
|
std::getline(in, value, '\n');
|
||||||
|
trim(value, " \t"); // trim all whitespaces
|
||||||
|
trim(header, " \t");
|
||||||
|
|
||||||
|
/**/ if (header == "No") c.no = std::atoi(value.c_str());
|
||||||
|
else if (header == "Nv") c.nv = std::atoi(value.c_str());
|
||||||
|
else if (header == "Nranks") c.nranks = std::atoi(value.c_str());
|
||||||
|
else if (header == "Nnodes") c.nnodes = std::atoi(value.c_str());
|
||||||
|
else if (header == "Energy") c.energy = std::atof(value.c_str());
|
||||||
|
else if (header == "Iteration") c.iteration = std::atoi(value.c_str());
|
||||||
|
else if (header == "RankRoundRobin") c.rankRoundRobin = (value[0] == 't');
|
||||||
|
}
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Checkpoint read_checkpoint(std::string const& filepath) {
|
||||||
|
std::ifstream in(filepath);
|
||||||
|
return read_checkpoint(in);
|
||||||
|
}
|
||||||
|
// Input and output:1 ends here
|
||||||
|
|
||||||
|
// [[file:../../atrip.org::*Epilog][Epilog:1]]
|
||||||
|
}
|
||||||
|
// Epilog:1 ends here
|
||||||
@ -20,6 +20,7 @@
|
|||||||
#include <atrip/Equations.hpp>
|
#include <atrip/Equations.hpp>
|
||||||
#include <atrip/SliceUnion.hpp>
|
#include <atrip/SliceUnion.hpp>
|
||||||
#include <atrip/Unions.hpp>
|
#include <atrip/Unions.hpp>
|
||||||
|
#include <atrip/Checkpoint.hpp>
|
||||||
|
|
||||||
using namespace atrip;
|
using namespace atrip;
|
||||||
|
|
||||||
@ -28,6 +29,7 @@ template bool RankMap<double>::RANK_ROUND_ROBIN;
|
|||||||
template bool RankMap<Complex>::RANK_ROUND_ROBIN;
|
template bool RankMap<Complex>::RANK_ROUND_ROBIN;
|
||||||
int Atrip::rank;
|
int Atrip::rank;
|
||||||
int Atrip::np;
|
int Atrip::np;
|
||||||
|
MPI_Comm Atrip::communicator;
|
||||||
Timings Atrip::chrono;
|
Timings Atrip::chrono;
|
||||||
|
|
||||||
// user printing block
|
// user printing block
|
||||||
@ -36,9 +38,10 @@ void atrip::registerIterationDescriptor(IterationDescriptor d) {
|
|||||||
IterationDescription::descriptor = d;
|
IterationDescription::descriptor = d;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Atrip::init() {
|
void Atrip::init(MPI_Comm world) {
|
||||||
MPI_Comm_rank(MPI_COMM_WORLD, &Atrip::rank);
|
Atrip::communicator = world;
|
||||||
MPI_Comm_size(MPI_COMM_WORLD, &Atrip::np);
|
MPI_Comm_rank(world, &Atrip::rank);
|
||||||
|
MPI_Comm_size(world, &Atrip::np);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename F>
|
template <typename F>
|
||||||
@ -46,7 +49,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
|
|
||||||
const int np = Atrip::np;
|
const int np = Atrip::np;
|
||||||
const int rank = Atrip::rank;
|
const int rank = Atrip::rank;
|
||||||
MPI_Comm universe = in.ei->wrld->comm;
|
MPI_Comm universe = Atrip::communicator;
|
||||||
|
|
||||||
const size_t No = in.ei->lens[0];
|
const size_t No = in.ei->lens[0];
|
||||||
const size_t Nv = in.ea->lens[0];
|
const size_t Nv = in.ea->lens[0];
|
||||||
@ -70,10 +73,10 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
|
|
||||||
RankMap<F>::RANK_ROUND_ROBIN = in.rankRoundRobin;
|
RankMap<F>::RANK_ROUND_ROBIN = in.rankRoundRobin;
|
||||||
if (RankMap<F>::RANK_ROUND_ROBIN) {
|
if (RankMap<F>::RANK_ROUND_ROBIN) {
|
||||||
LOG(0,"Atrip") << "Doing rank round robin slices distribution" << "\n";
|
LOG(0,"Atrip") << "Doing rank round robin slices distribution\n";
|
||||||
} else {
|
} else {
|
||||||
LOG(0,"Atrip")
|
LOG(0,"Atrip")
|
||||||
<< "Doing node > local rank round robin slices distribution" << "\n";
|
<< "Doing node > local rank round robin slices distribution\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -146,7 +149,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
|
|
||||||
const size_t
|
const size_t
|
||||||
iterationMod = (in.percentageMod > 0)
|
iterationMod = (in.percentageMod > 0)
|
||||||
? nIterations * in.percentageMod / 100
|
? nIterations * in.percentageMod / 100.0
|
||||||
: in.iterationMod
|
: in.iterationMod
|
||||||
|
|
||||||
, iteration1Percent = nIterations * 0.01
|
, iteration1Percent = nIterations * 0.01
|
||||||
@ -300,8 +303,44 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
// START MAIN LOOP ======================================================{{{1
|
// START MAIN LOOP ======================================================{{{1
|
||||||
|
|
||||||
double energy(0.);
|
double energy(0.);
|
||||||
|
size_t first_iteration = 0;
|
||||||
|
Checkpoint c;
|
||||||
|
const size_t checkpoint_mod
|
||||||
|
= in.checkpointAtEveryIteration != 0
|
||||||
|
? in.checkpointAtEveryIteration
|
||||||
|
: nIterations * in.checkpointAtPercentage / 100;
|
||||||
|
if (in.readCheckpointIfExists) {
|
||||||
|
std::ifstream fin(in.checkpointPath);
|
||||||
|
if (fin.is_open()) {
|
||||||
|
LOG(0, "Atrip") << "Reading checkpoint from "
|
||||||
|
<< in.checkpointPath << "\n";
|
||||||
|
c = read_checkpoint(fin);
|
||||||
|
first_iteration = (size_t)c.iteration;
|
||||||
|
if (first_iteration > nIterations) {
|
||||||
|
// TODO: throw an error here
|
||||||
|
// first_iteration is bigger than nIterations,
|
||||||
|
// you probably started the program with a different number
|
||||||
|
// of cores
|
||||||
|
}
|
||||||
|
if (No != c.no) {/* TODO: write warning */}
|
||||||
|
if (Nv != c.nv) {/* TODO: write warning */}
|
||||||
|
// TODO write warnings for nrank and so on
|
||||||
|
if (Atrip::rank == 0) {
|
||||||
|
// take the negative of the energy to correct for the
|
||||||
|
// negativity of the equations, the energy in the checkpoint
|
||||||
|
// should always be the correct physical one.
|
||||||
|
energy = - (double)c.energy;
|
||||||
|
}
|
||||||
|
LOG(0, "Atrip") << "energy from checkpoint "
|
||||||
|
<< energy << "\n";
|
||||||
|
LOG(0, "Atrip") << "iteration from checkpoint "
|
||||||
|
<< first_iteration << "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for ( size_t i = 0, iteration = 1
|
for ( size_t
|
||||||
|
i = first_iteration,
|
||||||
|
iteration = first_iteration + 1
|
||||||
; i < tuplesList.size()
|
; i < tuplesList.size()
|
||||||
; i++, iteration++
|
; i++, iteration++
|
||||||
) {
|
) {
|
||||||
@ -316,6 +355,23 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
if (in.barrier) MPI_Barrier(universe);
|
if (in.barrier) MPI_Barrier(universe);
|
||||||
))
|
))
|
||||||
|
|
||||||
|
// write checkpoints
|
||||||
|
if (iteration % checkpoint_mod == 0) {
|
||||||
|
double globalEnergy = 0;
|
||||||
|
MPI_Reduce(&energy, &globalEnergy, 1, MPI_DOUBLE, MPI_SUM, 0, universe);
|
||||||
|
Checkpoint out
|
||||||
|
= {No,
|
||||||
|
Nv,
|
||||||
|
0, // TODO
|
||||||
|
0, // TODO
|
||||||
|
- globalEnergy,
|
||||||
|
iteration - 1,
|
||||||
|
in.rankRoundRobin};
|
||||||
|
LOG(0, "Atrip") << "Writing checkpoint\n";
|
||||||
|
if (Atrip::rank == 0) write_checkpoint(out, in.checkpointPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
// write reporting
|
||||||
if (iteration % iterationMod == 0 || iteration == iteration1Percent) {
|
if (iteration % iterationMod == 0 || iteration == iteration1Percent) {
|
||||||
|
|
||||||
if (IterationDescription::descriptor) {
|
if (IterationDescription::descriptor) {
|
||||||
@ -363,7 +419,7 @@ Atrip::Output Atrip::run(Atrip::Input<F> const& in) {
|
|||||||
|
|
||||||
|
|
||||||
// COMM FIRST DATABASE ================================================{{{1
|
// COMM FIRST DATABASE ================================================{{{1
|
||||||
if (i == 0) {
|
if (i == first_iteration) {
|
||||||
WITH_RANK << "__first__:first database ............ \n";
|
WITH_RANK << "__first__:first database ............ \n";
|
||||||
const auto db = communicateDatabase(abc, universe);
|
const auto db = communicateDatabase(abc, universe);
|
||||||
WITH_RANK << "__first__:first database communicated \n";
|
WITH_RANK << "__first__:first database communicated \n";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user