pwrake 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a7b5b9f4ecf97b511f58495f6b22facbd66c97d79aa0cab9f452d96ae44ea4
-  data.tar.gz: 2874a8eec50b7f508138567899da703e4c5d18687d58ad53a715ffa81b7fa402
+  metadata.gz: e666a4e98f080f07f41475896df0a2d115805b8af57e3541b8d898c60a8122c9
+  data.tar.gz: a320f42590130bab37518996ed11496d8b107ba3162a8458c896aa6daa3b322d
 SHA512:
-  metadata.gz: c49bcd791f52010a2a221118bec1f59c08796c053ef43127f68142bd97d95499d23becf2c3d6ab9f351bc48384300999824fd3bd0f6fe1e94cba5de6b291664a
-  data.tar.gz: af1ecd762e914f1e891a40639ab8f59a55165132646816ccb1a5209e9c761a518cb09f0c4385086f23bb7d172e658127852780577d748baa0c83313edb72e848
+  metadata.gz: cd4a9b2641c220d2a1265ccdf76ed87f2594ce0d498f521a24d67a6428d5c757129c31408f9fb9058b4e184aa2a09b01096edb17e2b42c5d5f634bd5b61125dc
+  data.tar.gz: 92f066ae2246bdd86097795432124d129a21e60e27d96515fe16059a05e14c0c7d4a1eefff85e574860626f600efb6c8698e1969824bcffdd5429c0905cc75cf

data/README.md

@@ -93,8 +93,8 @@ In this case, you need the rehash of command paths:
     -L, --log, --log-dir [DIRECTORY] [Pw] Write log to DIRECTORY
         --ssh-opt, --ssh-option OPTION
                                      [Pw] Option passed to SSH
-        --filesystem FILESYSTEM      [Pw] Specify FILESYSTEM (nfs|gfarm)
-        --gfarm                      [Pw] FILESYSTEM=gfarm
+        --filesystem FILESYSTEM      [Pw] Specify FILESYSTEM (nfs|gfarm2fs)
+        --gfarm                      [Pw] (obsolete; Start pwrake on Gfarm FS)
     -A, --disable-affinity           [Pw] Turn OFF affinity (AFFINITY=off)
     -S, --disable-steal              [Pw] Turn OFF task steal
     -d, --debug                      [Pw] Output Debug messages
@@ -151,6 +151,7 @@ In this case, you need the rehash of command paths:
         GFARM_PREFIX        default="pwrake_$USER"
         GFARM_SUBDIR        default='/'
         MAX_GFWHERE_WORKER  default=8
+        GFARM2FS_COMMAND    default='gfarm2fs'
         GFARM2FS_OPTION     default=""
         GFARM2FS_DEBUG      default=false
         GFARM2FS_DEBUG_WAIT default=1
@@ -177,14 +178,14 @@ end
 
 Properties (The leftmost item is default):
 
-    ncore=integer     - The number of cores used by this task.
-    exclusive=no|yes  - Exclusively execute this task in a single node.
-    reserve=no|yes    - Gives higher priority to this task if ncore>1. (reserve a host)
-    allow=hostname    - Allow this host to execute this task. (accepts wild card)
-    deny=hostname     - Deny this host to execute this task. (accepts wild card)
-    order=deny,allow|allow,deny - The order of evaluation.
-    steal=yes|no      - Allow task stealing for this task.
-    retry=integer     - The number of retry for this task.
+    ncore=integer|rational - The number of cores used by this task.
+    exclusive=no|yes       - Exclusively execute this task in a single node.
+    reserve=no|yes         - Gives higher priority to this task if ncore>1. (reserve a host)
+    allow=hostname         - Allow this host to execute this task. (accepts wild card)
+    deny=hostname          - Deny this host to execute this task. (accepts wild card)
+    order=deny,allow|a     llow,deny - The order of evaluation.
+    steal=yes|no           - Allow task stealing for this task.
+    retry=integer          - The number of retry for this task.
 
 ## Note for Gfarm
 

data/lib/pwrake/branch/branch.rb

@@ -42,6 +42,7 @@ module Pwrake
       setup_shell
       setup_fiber
       setup_master_channel
+      setup_search_thread
       @cs.run("task execution")
       Log.debug "Branch#run end"
     end
@@ -193,6 +194,29 @@ module Pwrake
       end.resume
     end
 
+    def setup_search_thread
+      @search_que = Queue.new
+      Thread.new do
+        while a = @search_que.deq
+          t,args,w = *a
+          t.pw_search_tasks(args)
+          w.puts(t.name)
+        end
+      end
+    end
+
+    def invoke(t,args)
+      Log.debug "Branch#invoke start: #{t.class}[#{t.name}]"
+      r,w = IO.pipe
+      rd = NBIO::Reader.new(@selector,r)
+      @search_que.enq([t,args,w])
+      task_name = rd.get_line.chomp
+      if t.name != task_name
+        raise "t.name=#{t.name} != task_name=#{task_name}"
+      end
+      Log.debug "Branch#invoke end: #{t.class}[#{t.name}]"
+    end
+
     def kill(sig="INT")
       Log.warn "Branch#kill #{sig}"
       @cs.kill(sig)

data/lib/pwrake/branch/communicator.rb

@@ -90,7 +90,6 @@ class Communicator
 
     sel = @set.selector
     @reader = NBIO::MultiReader.new(sel,@ior)
-    @rd_err = NBIO::Reader.new(sel,@ioe)
     @writer = NBIO::Writer.new(sel,@iow)
     @handler = NBIO::Handler.new(@reader,@writer,@host)
 
@@ -146,48 +145,39 @@ class Communicator
   end
 
   def dropout(exc=nil)
-    # Error output
-    err_out = []
+    # Finish worker
     begin
       finish_shells
       if @handler
         @handler.exit
         @handler = nil
       end
-      if @rd_err
-        while s = @rd_err.get_line
-          err_out << s
-        end
-      end
     rescue => e
       m = Log.bt(e)
-      #$stderr.puts m
+      $stderr.puts(m)
       Log.error(m)
     end
-    # Error output
-    if !err_out.empty?
-      $stderr.puts err_out.join("\n")
-      Log.error((["process error output:"]+err_out).join("\n "))
+    # Error output from worker
+    if @ioe
+      err_out = ["standard error from worker:"]
+      while s = @ioe.gets
+        err_out << s.chomp
+      end
+      if err_out.size > 1
+        m = err_out.join("\n ")
+        $stderr.puts(m)
+        Log.error(m)
+      end
     end
-    # Exception
+    # Exception message
     if exc
       m = Log.bt(exc)
-      #$stderr.puts m
-      Log.error m
+      $stderr.puts(m)
+      Log.error(m)
     end
   ensure
     @set.delete(self)
   end
 
-  def finish
-    @iow.close
-    while s=@ior.gets
-      puts "out=#{s.chomp}"
-    end
-    while s=@ioe.gets
-      puts "err=#{s.chomp}"
-    end
-  end
-
 end
 end

data/lib/pwrake/gfarm/gfarm_postprocess.rb

@@ -43,7 +43,7 @@ module Pwrake
           break
         end
       end
-      Log.debug "Gfarm file=#{filename} nodes=#{a.join("|")}"
+      #Log.debug "Gfarm file=#{filename} nodes=#{a.join("|")}"
       a
     end
 

data/lib/pwrake/master/master.rb

@@ -226,11 +226,11 @@ module Pwrake
       if ending?
         @post_pool.finish # need?
       else
-        setup_fiber(t)
+        setup_fiber
       end
     end
 
-    def setup_fiber(t)
+    def setup_fiber
       @host_fail = @option["HOST_FAILURE"]
       create_fiber(@hdl_set) do |hdl|
         while s = hdl.get_line
@@ -295,15 +295,17 @@ module Pwrake
             $stderr.puts(s)
           end
         end
-        Log.debug "Master#invoke: fiber end"
+        Log.debug "Master#setup_fiber: end of fiber"
       end
+
       if !ending?
         Log.debug "@selector.run begin"
         @selector.run
         Log.debug "@selector.run end"
+      else
+        Log.debug "@selector.run skipped"
       end
       @post_pool.finish
-      Log.debug "Master#invoke: end of task=#{t.name}"
     end
 
     def send_task_to_idle_core
@@ -361,7 +363,7 @@ module Pwrake
 
     def task_end(tw,host_info)
       return if host_info.nil?
-      host_info.idle(tw.n_used_cores)
+      host_info.idle(tw.n_used_cores||1)
       if host_info.retired?
         # all retired
         Log.warn("retired host:#{host_info.name} because all core retired")
@@ -396,8 +398,9 @@ module Pwrake
           Log.debug " @task_queue.empty?=#{@task_queue.empty?}" if @task_queue.empty?
           Log.debug " @hostinfo_by_id.empty?=#{@hostinfo_by_id.empty?}" if @hostinfo_by_id.empty?
           Log.debug " @hostinfo_by_taskname.keys=#{@hostinfo_by_taskname.keys.inspect}"
+          Log.debug " @post_pool.empty?=#{@post_pool.empty?}" if @post_pool.empty?
         end
-        @hostinfo_by_taskname.empty?
+        @hostinfo_by_taskname.empty? && @post_pool.empty?
       else
         false
       end

data/lib/pwrake/master/master_application.rb

@@ -26,13 +26,13 @@ module Pwrake
         @master.setup_branches
         load_rakefile
         begin
-          Log.debug "init: #{Pwrake.clock-t} sec"
+          Log.debug "init: %.6f sec" % (Pwrake.clock-t)
           t = Pwrake.clock
           top_level
-          Log.debug "main: #{Pwrake.clock-t} sec"
+          Log.debug "main: %.6f sec" % (Pwrake.clock-t)
           t = Pwrake.clock
           @failed = @master.finish
-          Log.debug "finish: #{Pwrake.clock-t} sec"
+          Log.debug "finish: %.6f sec" % (Pwrake.clock-t)
         rescue SystemExit => e
           @failed = true
         rescue Exception => e
@@ -84,7 +84,11 @@ module Pwrake
     end
 
     def invoke(t,*args)
-      @master.invoke(t,args)
+      if Thread.current == @master.thread
+        @branch.invoke(t,args)
+      else
+        @master.invoke(t,args)
+      end
     end
 
     def standard_rake_options
@@ -139,14 +143,15 @@ module Pwrake
           options.ssh_option = value
         }
        ],
-       ['--filesystem FILESYSTEM', "[Pw] Specify FILESYSTEM (nfs|gfarm)",
+       ['--filesystem FILESYSTEM', "[Pw] Specify FILESYSTEM (nfs|gfarm2fs)",
         lambda { |value|
           options.filesystem = value
         }
        ],
-       ['--gfarm', "[Pw] FILESYSTEM=gfarm",
+       ['--gfarm', "[Pw] FILESYSTEM=gfarm2fs",
         lambda { |value|
-          options.filesystem = "gfarm"
+          warn 'The --gfarm option may not work correctly. Execute pwrake under gfarm2fs.'
+          options.filesystem = "gfarm2fs"
         }
        ],
        ['-A', '--disable-affinity', "[Pw] Turn OFF affinity (AFFINITY=off)",

data/lib/pwrake/nbio.rb

@@ -506,8 +506,17 @@ module NBIO
       end
       @exited = true
       exit_msg = "exited"
-      #return if iow.closed?
-      @writer.put_line "exit"
+      begin
+        @writer.put_line "exit"
+      rescue Errno::EPIPE => e
+        m = "#{e} in #{self.class}.exit iow=#{iow.inspect}"
+        if defined? Log
+          Log.warn m
+        else
+          $stderr.puts m
+        end
+        return
+      end
       Log.debug "Handler#exit: end: @writer.put_line \"exit\"" if defined? Log
       #
       if @reader.class == Reader # MultiReader not work
@@ -518,9 +527,6 @@ module NBIO
           return if line == exit_msg
         end
       end
-    rescue Errno::EPIPE => e
-      Log.error "Errno::EPIPE in #{self.class}.exit iow=#{iow.inspect}\n"+
-        e.backtrace.join("\n") if defined? Log
     end
 
     def halt

data/lib/pwrake/option/host_map.rb

@@ -13,7 +13,7 @@ module Pwrake
 
     def initialize(name,id,ncore,weight,group=nil)
       @name = name
-      @ncore = ncore
+      @ncore = ncore || 1
       @weight = weight || 1.0
       @group = group || 0
       @id = id
@@ -32,6 +32,17 @@ module Pwrake
     attr_reader :continuous_fail
     attr_accessor :idle_cores
 
+    def add_line(ncore=nil,weight=nil,group=nil)
+      ncore ||= 1
+      weight ||= 1.0
+      group ||= 0
+      if @group != group
+        raise "different group=#{group} for host=#{@name}"
+      end
+      @weight = (@weight*@ncore + weight*ncore)/(@ncore+ncore)
+      @ncore += ncore
+    end
+
     def local?
       ipa = IPSocket.getaddress(@name)
       HostInfo.local_ip.include?(ipa)
@@ -231,7 +242,7 @@ module Pwrake
           #weight = (weight || 1).to_f
           group  &&= group.to_i
           if host_info = @by_name[host]
-            raise RuntimeError,"duplicated hostname: #{host}"
+            host_info.add_line(ncore,weight,group)
           else
             id = @by_id.size
             host_info = HostInfo.new(host,id,ncore,weight,group)

data/lib/pwrake/option/option.rb

@@ -61,11 +61,11 @@ module Pwrake
     # ----------------------------------------------------------
 
     def init_filesystem
-      @filesystem = Rake.application.options.filesystem
-      @filesystem ||= mount_type.sub(/fuse\./,"")
-      begin
-        require "pwrake/option/option_#{@filesystem}"
-      rescue LoadError
+      @filesystem = Rake.application.options.filesystem || mount_type
+      case @filesystem
+      when 'gfarm2fs'
+        require "pwrake/option/option_gfarm2fs"
+      else
         require "pwrake/option/option_default_filesystem"
       end
     end
@@ -73,15 +73,15 @@ module Pwrake
     attr_reader :worker_option
     attr_reader :queue_class
 
-    def mount_type(d=nil)
+    def mount_type(dir=nil)
       mtab = '/etc/mtab'
       if File.exist?(mtab)
-        d ||= mountpoint_of_cwd
+        dir ||= mountpoint_of_cwd
         open(mtab,'r') do |f|
           f.each_line do |l|
             a = l.split
-            if a[1] == d
-              return a[2]
+            if a[1] == dir
+              return a[2].sub(/^fuse\./,'')
             end
           end
         end
@@ -354,6 +354,14 @@ module Pwrake
     # ----------------------------------------------------------
 
     def setup_hosts
+      if f = ENV['PBS_NODEFILE']
+        if @hostfile
+          Log.info "HOSTFILE=#{@hostfile} overrides PBS_NODEFILE=#{f}"
+        else
+          Log.info "use PBS_NODEFILE=#{f}"
+          @hostfile = f
+        end
+      end
       if @hostfile && @num_threads
         raise "Cannot set `hostfile' and `num_threads' simultaneously"
       end
@@ -364,6 +372,7 @@ module Pwrake
     # ----------------------------------------------------------
 
     def put_log
+      Log.info "Pwrake::VERSION=#{Pwrake::VERSION}"
       Log.info "Options:"
       self.each do |k,v|
         Log.info " #{k} = #{v.inspect}"

data/lib/pwrake/option/option_default_filesystem.rb

@@ -29,7 +29,6 @@ module Pwrake
         :heartbeat => self['HEARTBEAT'],
         :shared_directory => "SharedDirectory"
       }
-      @filesystem  = "default"
       @queue_class = "NonLocalityQueue"
     end
 

data/lib/pwrake/option/option_gfarm2fs.rb

@@ -8,6 +8,7 @@ module Pwrake
 
     def option_data_filesystem
       [
+        'GFARM2FS_COMMAND',
         'GFARM2FS_OPTION',
         'GFARM2FS_DEBUG',
         ['GFARM2FS_DEBUG_WAIT', proc{|v| v ? v.to_i : 1}],
@@ -21,7 +22,6 @@ module Pwrake
     end
 
     def set_filesystem_option
-      @filesystem  = 'gfarm'
       GfarmPath.subdir = self['GFARM_SUBDIR']
       @worker_option = {
         :log_dir   => self['LOG_DIR'],
@@ -33,6 +33,7 @@ module Pwrake
         :shared_directory => "GfarmDirectory",
         :base_dir => self['GFARM_BASEDIR']+"/"+self['GFARM_PREFIX'],
         :work_dir => GfarmPath.pwd.to_s,
+        :gfarm2fs_command => self['GFARM2FS_COMMAND'],
         :gfarm2fs_option => self['GFARM2FS_OPTION'],
         :gfarm2fs_debug => self['GFARM2FS_DEBUG'],
         :gfarm2fs_debug_wait => self['GFARM2FS_DEBUG_WAIT'],

data/lib/pwrake/queue/no_action_queue.rb

@@ -30,13 +30,12 @@ module Pwrake
     def pop
       case @prio
       when 0
-        x = @que.shift
+        @que.shift
       when 1
-        x = @que.pop
+        @que.pop
       when 2
-        x = @que.delete_at(rand(@que.size))
+        @que.delete_at(rand(@que.size))
       end
-      return x
     end
 
     alias shift pop

data/lib/pwrake/queue/task_queue.rb

@@ -9,8 +9,11 @@ module Pwrake
     def initialize(queue_class, hostinfo_by_id, group_map=nil)
       @queue_class = Pwrake.const_get(queue_class)
       @hostinfo_by_id = hostinfo_by_id
+      @lock = Monitor.new
       @q_no_action = NoActionQueue.new
       @q_reserved = Hash.new
+      @nenq = 0
+      @ndeq = 0
       def @q_reserved.first
         super.last
       end
@@ -40,27 +43,39 @@ module Pwrake
     end
 
     def enq(tw)
+      @lock.synchronize do
       if tw.nil? || tw.actions.empty?
         @q_no_action.push(tw)
       else
         @q.enq_impl(tw)
       end
+      @nenq += 1
+      end
     end
 
     def deq_task(&block)
-      Log.debug "deq_task from:"+(empty? ? " (empty)" : "\n#{inspect_q}")
+      @lock.synchronize do
+      if @nenq > 0
+        Log.debug "deq_task nenq=#{@nenq}:"+(empty? ? " (empty)" : "\n"+inspect_q)
+        @nenq = 0
+      end
       deq_noaction_task(&block)
       deq_reserve(&block)
       @q.deq_start
       unless @q.empty?
         @q.turns.each{|turn| deq_turn(turn,&block) }
       end
+      if @ndeq > 0
+        Log.debug "deq_task ndeq=#{@ndeq}:"+(empty? ? " (empty)" : "\n"+inspect_q)
+        @ndeq = 0
+      end
+      end
     end
 
     def deq_noaction_task(&block)
       while tw = @q_no_action.shift
-        Log.debug "deq_noaction: #{tw.name}"
         yield(tw)
+        @ndeq += 1
       end
     end
 
@@ -72,6 +87,7 @@ module Pwrake
           @q_reserved.delete(host_info)
           Log.debug "deq_reserve: #{tw.name} n_use_cores=#{n_core}"
           yield(tw,host_info,n_core)
+          @ndeq += 1
         end
       end
     end
@@ -89,6 +105,7 @@ module Pwrake
               Log.debug "deq: #{tw.name} n_use_cores=#{n_core}"
               yield(tw,host_info,n_core)
               count += 1
+              @ndeq += 1
             else
               @q_reserved[host_info] = tw
               Log.debug "reserve host: #{host_info.name} for #{tw.name} (#{n_core} cores)"

data/lib/pwrake/report/parallelism.rb

@@ -93,6 +93,7 @@ module Pwrake
 
       t_end = (a.last)[0]
 
+      begin
       if system("which gnuplot >/dev/null 2>&1")
         IO.popen("gnuplot","r+") do |f|
           f.print "
@@ -112,6 +113,10 @@ plot '-' w l notitle
           end
         end
       end
+      rescue => exc
+        $stderr.puts exc
+        $stderr.puts exc.backtrace.join("\n")
+      end
 
       #puts "Parallelism plot: #{fimg}"
       fimg
@@ -151,6 +156,7 @@ plot '-' w l notitle
 
       t_end = (a.last)[0]
 
+      begin
       if system("which gnuplot >/dev/null 2>&1")
       IO.popen("gnuplot","r+") do |f|
         f.print "
@@ -177,6 +183,10 @@ plot '-' w l axis x1y1 title 'parallelism', '-' w l axis x1y2 title 'exec/sec'
         end
       end
       end
+      rescue => exc
+        $stderr.puts exc
+        $stderr.puts exc.backtrace.join("\n")
+      end
 
       #puts "Parallelism plot: #{fimg}"
       fimg
@@ -341,6 +351,7 @@ set ylabel '# of cores'
         grid << a
       end
 
+      begin
       if system("which gnuplot >/dev/null 2>&1")
       IO.popen("gnuplot","r+") do |f|
         f.puts "
@@ -376,6 +387,10 @@ set format y ''
         f.printf "e\n"
       end
       end
+      rescue => exc
+        $stderr.puts exc
+        $stderr.puts exc.backtrace.join("\n")
+      end
       fimg
     end
 

data/lib/pwrake/task/file_task_algorithm.rb

@@ -2,15 +2,60 @@ module Pwrake
 
   module FileTaskAlgorithm
 
+    def needed?
+      !_exist?(name) || out_of_date?(timestamp) || @application.options.build_all
+    end
+
     # Cache time stamp to reduce load on file system.
     def timestamp
       @file_mtime ||
-        if File.exist?(name)
-          @file_mtime = File.mtime(name.to_s)
+        if _exist?(name)
+          @file_mtime = _mtime(name.to_s)
         else
           Rake::LATE
         end
     end
 
+    private
+
+    @@t_mtime = 0
+    @@n_mtime = 0
+    @@l_mtime = 100
+    @@c_mtime = 0
+    @@t_exist = 0
+    @@n_exist = 0
+    @@l_exist = 100
+    @@c_exist = 0
+
+    def _mtime(name)
+      t = Pwrake.clock
+      m = File.mtime(name.to_s)
+      @@t_mtime = @@t_mtime + (Pwrake.clock-t)
+      @@n_mtime += 1
+      if @@n_mtime >= 100
+        Log.debug('mtime: mean=%.9f s (%d times)'%[@@t_mtime/@@n_mtime,@@n_mtime])
+        @@t_mtime = 0
+        @@n_mtime = 0
+        @@c_mtime += 1
+        @@l_mtime = 1000 if @@c_mtime == 10
+      end
+      m
+    end
+
+    def _exist?(name)
+      t = Pwrake.clock
+      e = File.exist?(name.to_s)
+      @@t_exist = @@t_exist + (Pwrake.clock-t)
+      @@n_exist += 1
+      if @@n_exist >= @@l_exist
+        Log.debug('exist: mean=%.9f s (%d times)'%[@@t_exist/@@n_exist,@@n_exist])
+        @@t_exist = 0
+        @@n_exist = 0
+        @@c_exist += 1
+        @@l_exist = 1000 if @@c_exist == 10
+      end
+      e
+    end
+
   end
 end

data/lib/pwrake/task/task_algorithm.rb

@@ -12,20 +12,24 @@ module Pwrake
 
     def wrapper
       if @wrapper.nil?
-        raise "TaskWrapper is not defined for #{self.class}[#{name}]"
+        Log.debug "TaskWrapper is not defined for #{self.class}[#{name}]"
+        @wrapper = TaskWrapper.new(self)
       end
       @wrapper
     end
 
     def pw_search_tasks(args)
-      Log.debug "#{self.class}#pw_search_tasks start, task=#{name} args=#{args.inspect}"
+      Log.debug "#{self.class}[#{name}]#pw_search_tasks start, args=#{args.inspect}"
+      if application.options.trace
+        application.trace "** Search #{name}#{format_search_flags}"
+      end
       cl = Pwrake.clock
       TaskWrapper.clear_rank
       task_args = TaskArguments.new(arg_names, args)
       # not synchronize owing to fiber
       search_with_call_chain(nil, task_args, InvocationChain::EMPTY)
       #
-      Log.debug "#{self.class}#pw_search_tasks end #{Pwrake.clock-cl}"
+      Log.debug "#{self.class}[#{name}]#pw_search_tasks end t=%.6f" % (Pwrake.clock-cl)
     end
 
     # Same as search, but explicitly pass a call chain to detect
@@ -33,11 +37,6 @@ module Pwrake
     def search_with_call_chain(subseq, task_args, invocation_chain) # :nodoc:
       new_chain = InvocationChain.append(self, invocation_chain)
       @lock.synchronize do
-        if application.options.trace
-          #Log.debug "** Search #{name}#{format_search_flags}"
-          application.trace "** Search #{name}#{format_search_flags}"
-        end
-
         return true if @already_finished # <<--- competition !!!
         @subsequents ||= []
         @subsequents << subseq if subseq # <<--- competition !!!

data/lib/pwrake/task/task_property.rb

@@ -89,14 +89,10 @@ module Pwrake
       end
 
       case @ncore
-      when Rational
-        if @ncore > 0 && @ncore <= 1
-          return [(@ncore*ppn).to_i, 1].min
-        end
-      when 1-ppn..ppn
-        return (@ncore>0) ? @ncore : @ncore+ppn
       when nil
         return 1
+      when 1-ppn..ppn
+        return (@ncore>0) ? @ncore : @ncore+ppn
       end
 
       m = "ncore=#{@ncore} is out of range of cores per node: #{ppn}"

data/lib/pwrake/task/task_wrapper.rb

@@ -10,6 +10,7 @@ module Pwrake
     @@current_id = 1
     @@task_logger = nil
     @@instances = []
+    LOCK = Monitor.new
 
     def initialize(task,task_args=nil)
       @task = task
@@ -68,8 +69,10 @@ module Pwrake
     end
 
     def self.clear_rank
-      Log.debug "#{self}.clear_rank"
-      @@instances.each{|w| w.clear_rank}
+      LOCK.synchronize do
+        Log.debug "#{self}.clear_rank"
+        @@instances.each{|w| w.clear_rank}
+      end
     end
 
     def preprocess
@@ -87,15 +90,12 @@ module Pwrake
 
     def postprocess(postproc)
       @executed = true if !@task.actions.empty?
-      #tm_taskend = Pwrake.clock
       if is_file_task?
-        #t = Pwrake.clock
         if File.exist?(name)
           @file_stat = File::Stat.new(name)
           @location = postproc.run(self)
         end
       end
-      #Log.debug "postprocess time=#{Pwrake.clock-tm_taskend}"
       log_task
     end
 
@@ -129,7 +129,12 @@ module Pwrake
       end
       return if !@@task_logger
       #
-      elap = @clock_end - @clock_start
+      if @clock_start
+        elap = @clock_end - @clock_start
+      else
+        Loag.debug "@clock_start is not defined for #{@task.class}[#{name}]"
+        elap = 0
+      end
       if has_output_file?
         RANK_STAT.add_sample(rank,elap)
       end
@@ -231,6 +236,7 @@ module Pwrake
 
     def suggest_location
       if has_input_file? && @suggest_location.nil?
+        cl = Pwrake.clock
         @suggest_location = []
         loc_fsz = Hash.new(0)
         prerequisites.each do |preq|
@@ -246,18 +252,19 @@ module Pwrake
         #Log.debug "input=#{prerequisites.join('|')}"
         if !loc_fsz.empty?
           half_max_fsz = loc_fsz.values.max / 2
-          Log.debug "loc_fsz=#{loc_fsz.inspect} half_max_fsz=#{half_max_fsz}"
           loc_fsz.each do |h,sz|
             if sz > half_max_fsz
               @suggest_location << h
             end
           end
+          Log.debug "locate:%.6f #{name} loc_fsz=#{loc_fsz.inspect} half_max_fsz=#{half_max_fsz} suggest=#{@suggest_location.inspect}"%(Pwrake.clock-cl)
         end
       end
       @suggest_location
     end
 
     def rank
+      LOCK.synchronize do
       if @rank.nil?
         if subsequents.nil? || subsequents.empty?
           @rank = 0
@@ -265,8 +272,12 @@ module Pwrake
           max_rank = 0
           subsequents.each do |subsq|
             r = subsq.wrapper.rank
-            if max_rank < r
-              max_rank = r
+            if r
+              if max_rank < r
+                max_rank = r
+              end
+            else
+              Log.warn "subsq.wrapper.rank=#{rank.inspect}"
             end
           end
           if has_output_file?
@@ -276,9 +287,9 @@ module Pwrake
           end
           @rank = max_rank + step
         end
-        Log.debug "Task[#{name}] rank=#{@rank.inspect}"
       end
       @rank
+      end
     end
 
     def clear_rank
@@ -348,7 +359,7 @@ module Pwrake
         else
           @priority = 0
         end
-        Log.debug "task_name=#{name} priority=#{@priority} sum_file_size=#{sum_sz}"
+        Log.debug "task=#{name} priority=#{@priority} sum_file_size=#{sum_sz}"
       end
       @priority || 0
     end

data/lib/pwrake/version.rb

@@ -1,3 +1,3 @@
 module Pwrake
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/lib/pwrake/worker/gfarm_directory.rb

@@ -16,6 +16,7 @@ module Pwrake
       @@prefix   = opts[:base_dir]
       @@work_dir = opts[:work_dir]
       @@log_dir  = opts[:log_dir]
+      @@gfarm2fs_command = opts[:gfarm2fs_command] || 'gfarm2fs'
       @@gfarm2fs_option = opts[:gfarm2fs_option]
       @@gfarm2fs_debug = opts[:gfarm2fs_debug]
       @@gfarm2fs_debug_wait = opts[:gfarm2fs_debug_wait]
@@ -56,13 +57,14 @@ module Pwrake
 
     def open
       FileUtils.mkdir_p @gfarm_mountpoint
+      @log.info "mkdir -p #{@@hostname}:#{@gfarm_mountpoint}"
       path = @log.path
       begin
         if @@gfarm2fs_debug && path
           f = path+("gfarm2fs-"+@@hostname+"-"+@suffix)
-          spawn_cmd "gfarm2fs #{@@gfarm2fs_option} -d #{@gfarm_mountpoint} > #{f} 2>&1 & sleep #{@@gfarm2fs_debug_wait}"
+          spawn_cmd "#{@@gfarm2fs_command} #{@@gfarm2fs_option} -d #{@gfarm_mountpoint} > #{f} 2>&1 & sleep #{@@gfarm2fs_debug_wait}"
         else
-          spawn_cmd "gfarm2fs #{@@gfarm2fs_option} #{@gfarm_mountpoint}"
+          spawn_cmd "#{@@gfarm2fs_command} #{@@gfarm2fs_option} #{@gfarm_mountpoint}"
         end
       rescue => exc
         sleep 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwrake
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies: []
 description: Parallel and distributed Rake for workflow execution on multicores, clusters,
   clouds using SSH. It has locality-aware scheduling designed for Gfarm file system.
@@ -58,7 +58,6 @@ files:
 - lib/pwrake/option/host_map.rb
 - lib/pwrake/option/option.rb
 - lib/pwrake/option/option_default_filesystem.rb
-- lib/pwrake/option/option_gfarm.rb
 - lib/pwrake/option/option_gfarm2fs.rb
 - lib/pwrake/queue/locality_aware_queue.rb
 - lib/pwrake/queue/no_action_queue.rb

data/lib/pwrake/option/option_gfarm.rb

@@ -1 +0,0 @@
-lib/pwrake/option/option_gfarm2fs.rb