Merge pull request #2089 from DARMA-tasking/2086-loosen-when-lbdatare…

…startreader-is-created

2086 loosen when lbdatarestartreader is created

src/vt/configs/arguments/app_config.h

@@ -145,6 +145,7 @@ struct AppConfig {
   bool vt_lb_keep_last_elm       = false;
   bool vt_lb_data                = false;
   bool vt_lb_data_compress       = true;
+  bool vt_lb_data_in             = false;
   std::string vt_lb_data_dir     = "vt_lb_data";
   std::string vt_lb_data_file    = "data.%p.json";
   std::string vt_lb_data_dir_in  = "vt_lb_data_in";
@@ -319,6 +320,7 @@ struct AppConfig {
       | vt_lb_data_compress
       | vt_lb_data_dir
       | vt_lb_data_file
+      | vt_lb_data_in
       | vt_lb_data_dir_in
       | vt_lb_data_file_in
       | vt_lb_statistics

src/vt/configs/arguments/args.cc

@@ -465,6 +465,7 @@ void addLbArgs(CLI::App& app, AppConfig& appConfig) {
   auto lb_interval   = "Load balancing interval";
   auto lb_keep_last_elm = "Do not migrate last element in collection";
   auto lb_data      = "Enable load balancing data";
+  auto lb_data_in   = "Enable load balancing data input";
   auto lb_data_comp = "Compress load balancing data output with brotli";
   auto lb_data_dir  = "Load balancing data output directory";
   auto lb_data_file = "Load balancing data output file name";
@@ -486,6 +487,7 @@ void addLbArgs(CLI::App& app, AppConfig& appConfig) {
   auto w  = app.add_option("--vt_lb_interval", appConfig.vt_lb_interval, lb_interval)->capture_default_str();
   auto wl = app.add_flag("--vt_lb_keep_last_elm", appConfig.vt_lb_keep_last_elm, lb_keep_last_elm);
   auto ww = app.add_flag("--vt_lb_data", appConfig.vt_lb_data, lb_data);
+  auto za = app.add_flag("--vt_lb_data_in", appConfig.vt_lb_data_in, lb_data_in);
   auto xz = app.add_flag("--vt_lb_data_compress", appConfig.vt_lb_data_compress, lb_data_comp);
   auto wx = app.add_option("--vt_lb_data_dir", appConfig.vt_lb_data_dir, lb_data_dir)->capture_default_str();
   auto wy = app.add_option("--vt_lb_data_file", appConfig.vt_lb_data_file, lb_data_file)->capture_default_str();
@@ -499,6 +501,10 @@ void addLbArgs(CLI::App& app, AppConfig& appConfig) {
   auto lbspec = app.add_flag("--vt_lb_spec",            appConfig.vt_lb_spec,                lb_spec);
   auto lbspecfile = app.add_option("--vt_lb_spec_file", appConfig.vt_lb_spec_file,           lb_spec_file)->capture_default_str()->check(CLI::ExistingFile);
 
+  // --vt_lb_name excludes --vt_lb_file_name, and vice versa
+  v->excludes(u);
+  u->excludes(v);
+
   auto debugLB = "Load Balancing";
   s->group(debugLB);
   t1->group(debugLB);
@@ -510,6 +516,7 @@ void addLbArgs(CLI::App& app, AppConfig& appConfig) {
   wl->group(debugLB);
   ww->group(debugLB);
   wx->group(debugLB);
+  za->group(debugLB);
   wy->group(debugLB);
   xx->group(debugLB);
   xy->group(debugLB);

src/vt/runtime/runtime.cc

@@ -384,15 +384,11 @@ bool Runtime::tryFinalize(bool const disable_sig) {
 
 bool Runtime::needLBDataRestartReader() {
   #if vt_check_enabled(lblite)
-    if (arg_config_->config_.vt_lb_data) {
-      auto lbNames = vrt::collection::balance::get_lb_names();
-      auto mapLB = vrt::collection::balance::LBType::OfflineLB;
-      if (arg_config_->config_.vt_lb_name == lbNames[mapLB]) {
-        return true;
-      }
-    }
+  if (true) {
+    return arg_config_->config_.vt_lb_data_in;
+  } else
   #endif
-  return false;
+    return false;
 }
 
 bool Runtime::initialize(bool const force_now) {

src/vt/runtime/runtime_banner.cc

@@ -339,6 +339,11 @@ void Runtime::printStartupBanner() {
       auto f12 = opt_on("--vt_lb_data_dir", f11);
       fmt::print("{}\t{}{}", vt_pre, f12, reset);
     }
+  }
+
+  if (getAppConfig()->vt_lb_data_in) {
+    auto f9 = opt_on("--vt_lb_data_in", "Load balancing data input");
+    fmt::print("{}\t{}{}", vt_pre, f9, reset);
 
     auto const fnamein = getAppConfig()->vt_lb_data_file_in;
     if (fnamein != "") {