From 8e582d17116657a9e851d9d2455c427cd53943e0 Mon Sep 17 00:00:00 2001
From: Kyle Klenk <kyle.c.klenk@gmail.com>
Date: Mon, 1 Apr 2024 15:11:19 +0000
Subject: [PATCH] Remove unnecessary timing code and add load balancing in
distributed job actor
---
build/source/file_access_actor/file_access_actor.cpp | 4 ----
build/source/job_actor/distributed_job_actor.cpp | 1 +
build/source/job_actor/node_actor.cpp | 3 ---
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/build/source/file_access_actor/file_access_actor.cpp b/build/source/file_access_actor/file_access_actor.cpp
index ba9a521..e715bca 100644
--- a/build/source/file_access_actor/file_access_actor.cpp
+++ b/build/source/file_access_actor/file_access_actor.cpp
@@ -31,7 +31,6 @@ behavior file_access_actor(stateful_actor<file_access_state>* self,
self->state.num_output_steps = fa_settings.num_timesteps_in_output_buffer;
- self->state.file_access_timing.addTimePoint("init_duration");
int num_hru = self->state.num_gru;
int err = 0;
fileAccessActor_init_fortran(self->state.handle_forcing_file_info,
@@ -220,9 +219,6 @@ behavior file_access_actor(stateful_actor<file_access_state>* self,
<< "Total Write Duration = "
<< self->state.file_access_timing.getDuration("write_duration")
.value_or(-1.0) << " Seconds\n"
- << "Total Init Duration = "
- << self->state.file_access_timing.getDuration("init_duration")
- .value_or(-1.0) << " Seconds\n"
<< "\n__________________________________________________\n";
diff --git a/build/source/job_actor/distributed_job_actor.cpp b/build/source/job_actor/distributed_job_actor.cpp
index 90801d8..fed9ca6 100644
--- a/build/source/job_actor/distributed_job_actor.cpp
+++ b/build/source/job_actor/distributed_job_actor.cpp
@@ -325,6 +325,7 @@ behavior distributed_job_actor(stateful_actor<distributed_job_state>* self,
self->send(node, access_forcing_v, self->state.iFile + 1);
}
} else if (load_balance) {
+ aout(self) << "Distributed Job_Actor: Load Balancing\n";
self->send(self, load_balance_v);
} else {
self->send(self, update_hru_v);
diff --git a/build/source/job_actor/node_actor.cpp b/build/source/job_actor/node_actor.cpp
index bc79379..b1b0c2d 100644
--- a/build/source/job_actor/node_actor.cpp
+++ b/build/source/job_actor/node_actor.cpp
@@ -74,7 +74,6 @@ behavior node_actor(stateful_actor<node_state>* self, std::string host,
}
- self->state.node_timing.addTimePoint("node_init");
int err, file_gru_to_remove;
job_init_fortran(self->state.job_actor_settings.file_manager_path.c_str(),
&start_gru, &num_gru, &num_hru, &file_gru_to_remove, &err);
@@ -90,7 +89,6 @@ behavior node_actor(stateful_actor<node_state>* self, std::string host,
self->monitor(self->state.file_access_actor);
self->send(self->state.file_access_actor, def_output_v,
self->state.num_gru_info.file_gru);
- self->state.node_timing.updateEndPoint("node_init");
},
[=](init_file_access_actor, int num_timesteps) {
@@ -250,7 +248,6 @@ behavior node_actor(stateful_actor<node_state>* self, std::string host,
aout(self) << "Total Duration: " << total_duration << " seconds\n"
<< "Total Duration: " << total_dur_min << " minutes\n"
<< "Total Duration: " << total_dur_hr << " hours\n"
- << "Init Duration: " << init_duration << " seconds\n"
<< "___________________Node Finished__________________\n";
exit(1);
});
--
GitLab