Skip to content

make cohort initialization lighter #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pletzer wants to merge 3 commits into
base: phase3
Choose a base branch
from
Open

make cohort initialization lighter #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9df5b5e
make cohort initialization lighter
pletzer Jun 15, 2026
9f26d2f
moved reset to worker init
pletzer Jun 16, 2026
aa68038
moving up the reset call
pletzer Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/SeapodymCohort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ std::vector<double> SeapodymCohort::GetCohortDensity()
void SeapodymCohort::InitializeCohort(dvar_vector& x, DistDataCollector& dataCollector, const bool writeoutputfiles)
{

double t_all = MPI_Wtime();
double t_rs = 0.0;
double t_reset = MPI_Wtime();
//Reset model parameters:
reset(x);
time_xreset += MPI_Wtime() - t_reset;
double t_all = MPI_Wtime();
double t_rs = 0.0;
double t_reset = MPI_Wtime();
//Reset model parameters: moved to worker init in main_cohort.cpp
//reset(x);
time_xreset += MPI_Wtime() - t_reset;

//----------------------------------------------//
// ALLOCATE AND INITIALIZE COHORT DENSITY //
Expand Down
25 changes: 18 additions & 7 deletions src/main_cohort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "Tags.h"
#include <spdlog/spdlog.h>
#include <spdlog/sinks/basic_file_sink.h>
#include "admodel.h"

double time_ic_comm = 0.0, time_ic_flush = 0.0, time_ic_copy = 0.0, time_spawning = 0.0, time_getdata = 0.0, time_xreset = 0.0, time_init_cohort_spawning = 0.0, time_init_cohort_restart = 0.0, time_io_forcing = 0.0;
long n_ic = 0; // count of spawning-path inits, for per-init averages
Expand Down Expand Up @@ -56,7 +57,8 @@ SeapodymCohort xinit_prerun_wrapper(const char* parfile) {
void taskFunction(int task_id, int stepBeg, int stepEnd, MPI_Comm comm,
const std::shared_ptr<spdlog::logger>& logger,
DistDataCollector* dataCollector,
SeapodymCohort* cohort){
SeapodymCohort* cohort,
const independent_variables& x){

static double last_task_end = -1.0; // per-worker process, persists across calls
double t_in = MPI_Wtime();
Expand All @@ -68,11 +70,6 @@ void taskFunction(int task_id, int stepBeg, int stepEnd, MPI_Comm comm,
logger->info("> task id {} for steps {} to {}", task_id, stepBeg, stepEnd);

logger->info(" >> initialization of task id {}", task_id);
//initialize variables of optimization
const int nvar = cohort->nvarcalc();
independent_variables x(1, nvar);
adstring_array x_names(1,nvar);
cohort->xinit(x, x_names);

int cohort_id = task_id;
cohort->restart(cohort_id);
Expand Down Expand Up @@ -253,6 +250,14 @@ int main(int argc, char** argv) {

SeapodymCohort cohort= xinit_prerun_wrapper(parfile.c_str());

// Initialize optimization variables once; x is stable for all tasks
// (xinit fills x from fixed model parameters that don't change between tasks).
// x is captured by reference in taskFunc — lifetime matches the enclosing block.
const int nvar = cohort.nvarcalc();
independent_variables x(1, nvar);
adstring_array x_names(1, nvar);
cohort.xinit(x, x_names);

cohort.setDataProvider(&dp);

//MPI_Win_fence(0, dp.win());
Expand All @@ -261,6 +266,11 @@ int main(int argc, char** argv) {
//MPI_Win_fence(0, dp.win());
double t_shm = MPI_Wtime();
cohort.setShmForcing(); // every node-local worker reads its timestep slice

// Reset model parameters (applies boundp() transforms from optimisation space to
// physical parameter space) — done once here rather than per-task in InitializeCohort.
cohort.reset(dvar_vector(x));

MPI_Barrier(dp.getShmComm()); // per-node publish-sync: all slabs visible before any read

time_io_forcing += MPI_Wtime()-t_shm;
Expand All @@ -272,7 +282,8 @@ int main(int argc, char** argv) {
std::placeholders::_4, // MPI communicator so we can send messages to the manager at the end of each step
logger,
&dataCollect,
&cohort);
&cohort,
std::cref(x)); // x lives in this block, outlives taskFunc and worker.run()

TaskStepWorker worker(MPI_COMM_WORLD, taskFunc, stepBegMap, stepEndMap);

Expand Down