option for mining hours (#136)

Author: ckrause

CHANGELOG.md

@@ -2,6 +2,10 @@ To install or update LODA, please follow the [installation instructions](https:/
 
 ## [Unreleased]
 
+### Features
+
+* Added option `-H` for settings the number of mining hours (useful for BOINC)
+
 # v22.4.17
 
 ### Enhancements

README.md

@@ -57,6 +57,7 @@ Options:
   -i <string>         Name of miner configuration from miners.json
   -p                  Parallel mining using default number of instances
   -P <number>         Parallel mining using custom number of instances
+  -H <number>         Number of mining hours (default unlimited)
 ```
 
 ### Core Commands

src/commands.cpp

@@ -48,9 +48,9 @@ void Commands::help() {
             << std::endl;
 
   std::cout << std::endl << "OEIS Commands:" << std::endl;
-  std::cout
-      << "  mine                Mine programs for OEIS sequences (see -i,-p)"
-      << std::endl;
+  std::cout << "  mine                Mine programs for OEIS sequences (see "
+               "-i,-p,-P,-H)"
+            << std::endl;
   std::cout << "  check <program>     Check a program for an OEIS sequence "
                "(see -b)"
             << std::endl;
@@ -95,6 +95,9 @@ void Commands::help() {
   std::cout << "  -P <number>         Parallel mining using custom number of "
                "instances"
             << std::endl;
+  std::cout
+      << "  -H <number>         Number of mining hours (default unlimited)"
+      << std::endl;
 }
 
 std::pair<std::string, size_t> getProgramPathAndSeqId(std::string arg) {

src/include/miner.hpp

@@ -31,7 +31,7 @@ class Miner {
   void submit(const std::string &path, std::string id);
 
  private:
-  void checkRegularTasks();
+  bool checkRegularTasks();
 
   void reload();
 
@@ -58,6 +58,7 @@ class Miner {
   int64_t num_new;
   int64_t num_updated;
   int64_t num_removed;
+  int64_t num_hours;
   int64_t current_fetch;
   std::map<std::string, int64_t> num_received_per_profile;
 };

src/include/util.hpp

@@ -67,6 +67,7 @@ class Settings {
   bool parallel_mining;
   bool report_cpu_hours;
   int64_t num_miner_instances;
+  int64_t num_mine_hours;
   std::string miner_profile;
 
   // flag and offset for printing evaluation results in b-file format

src/main.cpp

@@ -68,6 +68,7 @@ void mineParallel(const Settings& settings,
     num_instances = Setup::getMaxInstances();
   }
   const bool has_miner_profile = settings.miner_profile.empty();
+  const bool restart_miners = (settings.num_mine_hours <= 0);
 
   // prepare instance settings
   auto instance_settings = settings;
@@ -79,22 +80,34 @@ void mineParallel(const Settings& settings,
   AdaptiveScheduler cpuhours_scheduler(3600);  // 1 hour (fixed!!)
   ApiClient api_client;
 
-  // run miner processes and monitor them
   Log::get().info("Starting parallel mining using " +
-                  std::to_string(num_instances) + " miner instances");
-  while (true) {
-    // check if miner processes are alive
+                  std::to_string(num_instances) + " instances");
+  const auto start_time = std::chrono::steady_clock::now();
+
+  // run miner processes and monitor them
+  bool finished = false;
+  while (!finished) {
+    // check if miner processes are alive, restart them if should not stop
+    finished = true;
     for (size_t i = 0; i < children_pids.size(); i++) {
-      if (!isChildProcessAlive(children_pids[i])) {
+      const auto pid = children_pids[i];
+      if (pid != 0 && isChildProcessAlive(pid)) {
+        // still alive
+        finished = false;
+      } else if (pid == 0 || restart_miners) {
+        // restart process
         if (has_miner_profile) {
           instance_settings.miner_profile = std::to_string(i);
         }
         children_pids[i] = fork(instance_settings, args);
         std::this_thread::sleep_for(std::chrono::seconds(5));
+        finished = false;
       }
     }
+
     // wait some time
     std::this_thread::sleep_for(std::chrono::seconds(10));
+
     // report CPU hours
     if (cpuhours_scheduler.isTargetReached()) {
       cpuhours_scheduler.reset();
@@ -106,6 +119,14 @@ void mineParallel(const Settings& settings,
       }
     }
   }
+
+  // finished log message
+  auto cur_time = std::chrono::steady_clock::now();
+  int64_t mins =
+      std::chrono::duration_cast<std::chrono::minutes>(cur_time - start_time)
+          .count();
+  Log::get().info("Finished parallel mining after " + std::to_string(mins) +
+                  " minutes");
 }
 
 int dispatch(Settings settings, const std::vector<std::string>& args) {

src/miner.cpp

@@ -30,6 +30,7 @@ Miner::Miner(const Settings &settings)
       num_new(0),
       num_updated(0),
       num_removed(0),
+      num_hours(0),
       current_fetch(0) {}
 
 void Miner::reload() {
@@ -49,13 +50,16 @@ void Miner::reload() {
 }
 
 void Miner::mine() {
-  if (!manager) {
-    reload();
-  }
   Parser parser;
   std::stack<Program> progs;
   Sequence norm_seq;
   Program program;
+  const auto start_time = std::chrono::steady_clock::now();
+
+  // load manager
+  if (!manager) {
+    reload();
+  }
 
   // print info
   Log::get().info("Mining programs for OEIS sequences in " +
@@ -143,11 +147,22 @@ void Miner::mine() {
     }
 
     num_processed++;
-    checkRegularTasks();
+    if (!checkRegularTasks()) {
+      break;
+    }
   }
+
+  // finish with log message
+  auto cur_time = std::chrono::steady_clock::now();
+  int64_t mins =
+      std::chrono::duration_cast<std::chrono::minutes>(cur_time - start_time)
+          .count();
+  Log::get().info("Finished mining after " + std::to_string(mins) + " minutes");
 }
 
-void Miner::checkRegularTasks() {
+bool Miner::checkRegularTasks() {
+  bool result = true;
+
   // regular task: log info about generated programs
   if (log_scheduler.isTargetReached()) {
     log_scheduler.reset();
@@ -195,13 +210,19 @@ void Miner::checkRegularTasks() {
     if (Setup::shouldReportCPUHours() && settings.report_cpu_hours) {
       api_client->postCPUHour();
     }
+    num_hours++;
+    if (settings.num_mine_hours > 0 && num_hours >= settings.num_mine_hours) {
+      result = false;
+    }
   }
 
   // regular task: reload oeis manager and generators
   if (reload_scheduler.isTargetReached()) {
     reload_scheduler.reset();
     reload();
   }
+
+  return result;
 }
 
 void Miner::submit(const std::string &path, std::string id) {

src/util.cpp

@@ -204,6 +204,7 @@ Settings::Settings()
       parallel_mining(false),
       report_cpu_hours(true),
       num_miner_instances(0),
+      num_mine_hours(0),
       print_as_b_file(false),
       print_as_b_file_offset(0) {}
 
@@ -214,6 +215,7 @@ enum class Option {
   MAX_CYCLES,
   B_FILE_OFFSET,
   NUM_INSTANCES,
+  NUM_MINE_HOURS,
   MINER,
   LOG_LEVEL
 };
@@ -225,7 +227,7 @@ std::vector<std::string> Settings::parseArgs(int argc, char *argv[]) {
     std::string arg(argv[i]);
     if (option == Option::NUM_TERMS || option == Option::MAX_MEMORY ||
         option == Option::MAX_CYCLES || option == Option::B_FILE_OFFSET ||
-        option == Option::NUM_INSTANCES) {
+        option == Option::NUM_INSTANCES || option == Option::NUM_MINE_HOURS) {
       std::stringstream s(arg);
       int64_t val;
       s >> val;
@@ -250,6 +252,9 @@ std::vector<std::string> Settings::parseArgs(int argc, char *argv[]) {
         case Option::NUM_INSTANCES:
           num_miner_instances = val;
           break;
+        case Option::NUM_MINE_HOURS:
+          num_mine_hours = val;
+          break;
         case Option::LOG_LEVEL:
         case Option::MINER:
         case Option::NONE:
@@ -291,6 +296,8 @@ std::vector<std::string> Settings::parseArgs(int argc, char *argv[]) {
       } else if (opt == "P") {
         parallel_mining = true;
         option = Option::NUM_INSTANCES;
+      } else if (opt == "H") {
+        option = Option::NUM_MINE_HOURS;
       } else if (opt == "b") {
         print_as_b_file = true;
       } else if (opt == "B") {
@@ -332,6 +339,10 @@ void Settings::printArgs(std::vector<std::string> &args) {
   if (parallel_mining) {
     args.push_back("-p");
   }
+  if (num_mine_hours > 0) {
+    args.push_back("-H");
+    args.push_back(std::to_string(num_mine_hours));
+  }
   if (!report_cpu_hours) {
     args.push_back("--no-report-cpu-hours");
   }