pwrake 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4053be2a3de706030e8ee37157453416b379f22c7751db94d2122b607eec6d3a
-  data.tar.gz: c76ad99c55d4ee592522337d66327845d72c239df9cfd8bed294e7d7acdc3e83
+  metadata.gz: 93b60deb41a4fda0bafa94a5b240812e5c5925ab204f8b802ef63d78fbcf81b2
+  data.tar.gz: 6ac5c66ad22c8ba3316bca3aeab8b34fe0a4e9189f50a99b2056c5a8cced7277
 SHA512:
-  metadata.gz: bc954608b0bf14af8782f27273cc9a802951a31a04c2507ef42255a0855af738c9ab71dc9cc5f6afdde2d8c097b27cc01d606d2cf667b083e270a138e9e5ac4d
-  data.tar.gz: 192a8cbc976188d637f74b08cec65054235e156e82ecaa1354a75a2dbdadd91e1c8b14b0d21733f15c0d85d601c15db366f0c91c95d0b4919e25a23b886cdb87
+  metadata.gz: 7b0d50fb5cb90b8c7682be343c4ef70acfb324d01b46903f39606f8e044d3315ae7cf7a6cd8e4074e5b5178b3e16aa224c827f53b1ef8ea74a27b6176f84b39b
+  data.tar.gz: 90911a12880e22276be78feae3e13b850d9614f93fc30195a7fb253e730a369bc51783778524aca2213672fca6b290c7622bdf503278f0e04dfe2eb29d46acb5

data/lib/pwrake/master/master.rb

@@ -329,7 +329,7 @@ module Pwrake
       if count == 0 && !@task_queue.empty? && @hostinfo_by_taskname.empty?
         m="No task was invoked while unexecuted tasks remain"
         Log.error m
-        Log.error "count=#{count} @hostinfo_by_taskname.empty?=#{@hostinfo_by_taskname.empty?} @task_queue=\n"+@task_queue.inspect_q
+        Log.error "count=#{count} @hostinfo_by_taskname.empty?=#{@hostinfo_by_taskname.empty?} @task_queue.empty?={@task_queue.empty?} @task_queue=\n"+@task_queue.inspect_q
         raise RuntimeError,m
       end
       #Log.debug "#{self.class}#send_task_to_idle_core end time=#{Time.now-tm}"

data/lib/pwrake/option/host_map.rb

@@ -139,6 +139,18 @@ module Pwrake
     end
     attr_reader :by_id, :by_name
 
+    def max_ncore
+      by_id.map{|host_info| host_info.ncore}.max
+    end
+
+    def min_ncore
+      by_id.map{|host_info| host_info.ncore}.max
+    end
+
+    def total_ncore
+      by_id.inject(0){|sum,host_info| host_info.ncore + sum}
+    end
+
     def local?
       @is_local
     end

data/lib/pwrake/queue/locality_aware_queue.rb

@@ -59,7 +59,7 @@ module Pwrake
     def turn_empty?(turn)
       case turn
       when 0
-        @q_no_action.empty? && @size_q == 0 && @q_remote.empty?
+        empty?
       when 1
         @size_q == 0
       end
@@ -158,6 +158,7 @@ module Pwrake
       end
       s << _qstr("local*#{n}",[]) if n > 0
       s << _qstr("remote",@q_remote)
+      s << _qstr("reserved",@q_reserved)
       s << "@size_q=#{@size_q}"
       s
     end

data/lib/pwrake/queue/task_queue.rb

@@ -9,6 +9,12 @@ module Pwrake
       @enable_steal = true
       @q_no_action = NoActionQueue.new
       @q_reserved = Hash.new
+      def @q_reserved.first
+        super.last
+      end
+      def @q_reserved.last
+        self[keys.last]
+      end
 
       @hostinfo_by_id = hostinfo_by_id
 
@@ -158,7 +164,8 @@ module Pwrake
     def inspect_q
       _qstr("noaction",@q_no_action) +
       _qstr("input",   @q_input) +
-      _qstr("no_input",@q_no_input)
+      _qstr("no_input",@q_no_input) +
+      _qstr("reserved",@q_reserved)
     end
 
     def drop_host(host_info)

data/lib/pwrake/task/task_manager.rb

@@ -16,8 +16,8 @@ module Pwrake
     end
 
     def define_task(task_class, *args, &block) # :nodoc:
-      prop = @property_by_block[block.object_id]
-      if prop.nil?
+      prop = block && @property_by_block[block.source_location]
+      unless prop
         prop = @last_property
         @last_property = TaskProperty.new
       end
@@ -35,7 +35,9 @@ module Pwrake
     end
 
     def create_rule(*args, &block) # :nodoc:
-      @property_by_block[block.object_id] = @last_property
+      if block
+        @property_by_block[block.source_location] = @last_property
+      end
       @last_property = TaskProperty.new
       super
     end

data/lib/pwrake/version.rb

@@ -1,3 +1,3 @@
 module Pwrake
-  VERSION = "2.2.8"
+  VERSION = "2.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwrake
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-06-14 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.
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parallel and distributed Rake for workflow execution on multicores, clusters,