miga-base 1.3.20.10 → 1.3.20.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f86ec82f63d08729e4f970919dba5762a2888c797cdf6a8a7f32805929508c
-  data.tar.gz: cb3e930ba1a4acb776bd7bcc7481470363109c2c01a67e1780f1d71dc29659c0
+  metadata.gz: 91302d7d75ccc35b6ff9606f8b6d777f1ed9d003884b1239ccf88d1a60e9cd23
+  data.tar.gz: d71e38b02f3e54695a4e2c40b07b910ebaf8719511f20fb5c19198aa9b4dbae2
 SHA512:
-  metadata.gz: aa6434515aaca67b727e2a725cd2013e3096eb638cfc590e452c4e33c0e72f4c788b14cc0e8254cb91f14082330c038fa826ecab2cca01ccc2d4f96272ce0bac
-  data.tar.gz: f5aec44b327725934d7585e157a68a653c9567743c46120e90d5280638935194684829acaa0003ff14ed239ee07ead6a604e25d423743986f627cb379767614c
+  metadata.gz: e0df7e189c74f4c791493d04f14000671c40a2fe5d9a50c92985a82eb0b7fe9670205a8d5b01ab7fb158df9836fb5d41040c1cf3ac81321dd66dde84d01adbe3
+  data.tar.gz: 0f30aac316c440e623405eab59855a3ace6d5bc04e452bfe67d67c1cb486670a48a629e0fd9f631cdd66446907147043d80d03e273423a620074d5a320bd3975

data/lib/miga/cli/action/doctor/base.rb

@@ -37,11 +37,12 @@ module MiGA::Cli::Action::Doctor::Base
     return if fix.empty?
 
     cli.say("- Fixing #{fix.size} datasets")
-    MiGA::Parallel.distribute(fix, cli[:threads]) do |d_n, idx, thr|
+    o = MiGA::Parallel.distribute(fix, cli[:threads]) do |d_n, idx, thr|
       cli.advance('  > Fixing', idx + 1, fix.size, false) if thr == 0
       p.dataset(d_n).cleanup_distances!
     end
     cli.say
+    MiGA::Parallel.assess_success(o)
   end
 
   ##

data/lib/miga/cli/action/doctor/distances.rb

@@ -103,7 +103,7 @@ module MiGA::Cli::Action::Doctor::Distances
     # Read data (threaded)
     FileUtils.mkdir_p(tmp)
     chunks_e = 0 .. chunks - 1
-    MiGA::Parallel.distribute(chunks_e, cli[:threads]) do |chunk, k, thr|
+    o = MiGA::Parallel.distribute(chunks_e, cli[:threads]) do |chunk, k, thr|
       cli.advance('Reading:', k, chunks, false) if thr == 0
       dist = {}
       [:aai, :ani].each do |metric|
@@ -121,6 +121,7 @@ module MiGA::Cli::Action::Doctor::Distances
     end
     cli.advance('Reading:', chunks, chunks, false)
     cli.say
+    MiGA::Parallel.assess_success(o)
 
     # Save information to indicate that the run is complete and return
     File.open(tmp_chunks, 'w') { |fh| fh.puts(chunks, n) }
@@ -135,12 +136,12 @@ module MiGA::Cli::Action::Doctor::Distances
     tmp_done = File.join(tmp, 'chunks.txt')
     chunks = File.readlines(tmp_done)[0].chomp.to_i
 
-    lower_triangle = []
+    lower_tr = []
     chunks.times.each do |i|
-      (0 .. i).to_a.each { |j| lower_triangle << [i, j] }
+      (0 .. i).to_a.each { |j| lower_tr << [i, j] }
     end
-    MiGA::Parallel.distribute(lower_triangle, cli[:threads]) do |cell, k, thr|
-      cli.advance('Writing:', k, lower_triangle.size, false) if thr == 0
+    o = MiGA::Parallel.distribute(lower_tr, cli[:threads]) do |cell, k, thr|
+      cli.advance('Writing:', k, lower_tr.size, false) if thr == 0
       done_f = File.join(tmp, "#{cell[0]}-#{cell[1]}.txt")
       next if File.exist?(done_f)
 
@@ -148,9 +149,11 @@ module MiGA::Cli::Action::Doctor::Distances
       File.open("#{done_f}.tmp", 'w') { |fh| fixed_ds.each { |ds| fh.puts ds } }
       File.rename("#{done_f}.tmp", done_f)
     end
-    cli.advance('Writing:', lower_triangle.size, lower_triangle.size, false)
+    cli.advance('Writing:', lower_tr.size, lower_tr.size, false)
     cli.say
-    lower_triangle.map do |cell|
+    MiGA::Parallel.assess_success(o)
+
+    lower_tr.map do |cell|
       Set.new.tap do |y|
         file = File.join(tmp, "#{cell[0]}-#{cell[1]}.txt")
         raise MiGA::Error.new(

data/lib/miga/common.rb

@@ -106,13 +106,13 @@ class MiGA::MiGA
         ''
       else
         left_time = @_advance_time[:avg] * (total - n) / 60 # <- in minutes
-        left_time < 0.01 ? '         ' :
-          left_time < 1 ? ('%.0fs left' % (left_time * 60)) :
+        left_time   < 0.01 ? '' :
+          left_time < 1    ? ('%.0fs left' % (left_time * 60))   :
           left_time > 1440 ? ('%.1fd left' % (left_time / 1440)) :
-          left_time > 60 ? ('%.1fh left' % (left_time / 60)) :
+          left_time > 60   ? ('%.1fh left' % (left_time / 60))   :
           ('%.1fm left' % left_time)
       end
-    $stderr.print("[%s] %s %s %s    \r" % [Time.now, step, adv, left])
+    $stderr.print("[%s] %s %s %-12s   \r" % [Time.now, step, adv, left])
   end
 
   ##

data/lib/miga/parallel.rb

@@ -8,10 +8,9 @@ class MiGA::Parallel < MiGA::MiGA
     # Executes the passed block with the thread number as argument (0-numbered)
     # in +threads+ processes
     def process(threads)
-      threads.times do |i|
-        Process.fork { yield(i) }
-      end
-      Process.waitall
+      threads.times
+        .map { |i| Process.fork { yield(i) } }
+        .map { |pid| Process.waitpid2(pid) }
     end
 
     ##
@@ -21,7 +20,6 @@ class MiGA::Parallel < MiGA::MiGA
     # 3. Index of the acting thread
     def distribute(enum, threads, &blk)
       process(threads) { |thr| thread_enum(enum, threads, thr, &blk) }
-      Process.waitall # <- Just to double-check, but `process` should suffice
     end
 
     ##
@@ -33,5 +31,23 @@ class MiGA::Parallel < MiGA::MiGA
         yield(obj, idx, thr) if idx % threads == thr
       end
     end
+
+    ##
+    # Assesses the success of all thread exit codes and raises an error if
+    # any of the children status in +status+ failed. It can be used as:
+    #
+    #   status = MiGA::Parallel.process(3) { |i| 1/i }
+    #   MiGA::Parallel.assess_success(status)
+    # 
+    # Or in conjunction with +MiGA::Parallel.distribute+
+    def assess_success(status)
+      failed = status.map { |i| i[1].success? ? 0 : 1 }.inject(:+)
+      return if failed.zero?
+
+      raise MiGA::Error.new(
+        "Child threads failed: #{failed}/#{status.size}. " \
+        "Maximum exit status: #{status.map { |i| i[1].exitstatus || 0 }.max}"
+      )
+    end
   end
 end

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.3, 20, 10].freeze
+  VERSION = [1.3, 20, 11].freeze
 
   ##
   # Nickname for the current major.minor version.
@@ -20,7 +20,7 @@ module MiGA
 
   ##
   # Date of the current gem relese.
-  VERSION_DATE = Date.new(2024, 9, 12)
+  VERSION_DATE = Date.new(2024, 9, 13)
 
   ##
   # References of MiGA

data/test/parallel_test.rb

@@ -19,6 +19,18 @@ class ParallelTest < Test::Unit::TestCase
     assert_equal([0, 0, 1, 1], t.sort)
   end
 
+  def test_assess_success
+    declare_forks
+
+    o = MiGA::Parallel.process(1) { |i| i / 2 }
+    assert(o.all? { |i| i[1].success? })
+    assert_nil(MiGA::Parallel.assess_success(o))
+
+    o = MiGA::Parallel.process(1) { |i| $stderr = StringIO.new ; 1 / i }
+    assert_equal(1, o.map { |i| i[1].success? ? 0 : 1 }.inject(:+))
+    assert_raise { MiGA::Parallel.assess_success(o) }
+  end
+
   def test_thread_enum
     MiGA::Parallel.thread_enum(%w[a b c d], 3, 1) do |o, _k, _t|
       assert_equal('b', o)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.3.20.10
+  version: 1.3.20.11
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons