drake 0.8.2.1.0.6 → 0.8.2.1.0.7

data/CHANGES.drake

@@ -1,6 +1,11 @@
 
 = Drake Changelog
 
+== Version 0.8.2.1.0.7
+
+* new --rand option, suggested by Thomas Sawyer.
+* merged latest cleaned-up comp_tree
+
 == Version 0.8.2.1.0.6
 
 * Restored original 'multitask' behavior when -j1 (default)

data/README

@@ -75,6 +75,43 @@ other tasks is rather contrary to this notion, throwing a monkey
 wrench into the system.  An exception will be raised when this is
 attempted in multi-threaded mode.
 
+=== Migrating to -j
+
+First of all, do you want to bother with <tt>-j</tt>?  If you are
+satisfied with your build time, then there is really no reason to use
+it.
+
+If on the other hand your build takes twenty minutes to complete, you
+may be interested in investing some time getting the full dependency
+tree correct in order to take advantage of multiple CPUs or cores.
+
+Though there is no way for Drake to fathom what <em>you</em> mean by a
+correct dependency, there is a tool available which helps you get
+closer to saying what you mean.
+
+  % drake --rand[=SEED]
+
+This will randomize the order of sibling prerequisites for each task.
+When given the optional SEED integer, it will call
+<tt>srand(SEED)</tt> to produce the same permutation each time.  The
+randomize option also disables +multitask+.
+
+Though this option may produce an error due to an unspecified
+dependency, at least it will be an error which is exactly the same on
+each run (with SEED).  In addition, you'll have the major debugging
+advantage of using a single thread.
+
+This option will also work in multi-threaded mode.  After all, once
+<tt>-jN</tt> is running smoothly there is <em>still</em> no guarantee
+that you have it right.  However with each successful execution of
+<tt>drake -jN --rand</tt>, the probability of correctness approaches 1
+(though asymptotically so).
+
+(The only way to <em>prove</em> correctness is to test <em>all</em>
+such permutations, which for any non-trivial project would be
+prohibitively large, especially those which meaningfully benefit from
+<tt>-j</tt>.)
+
 == Links
 
 * Download: http://rubyforge.org/frs/?group_id=6530

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.2.1.0.6'
+RAKEVERSION = '0.8.2.1.0.7'
 
 require 'rbconfig'
 require 'getoptlong'
@@ -595,6 +595,11 @@ module Rake
         end
         return if @already_invoked
         @already_invoked = true
+
+        if application.options.randomize
+          @prerequisites = @prerequisites.sort_by { rand }
+        end
+
         prereqs = 
           if application.num_threads == 1
             invoke_prerequisites(task_args, new_chain)
@@ -602,6 +607,7 @@ module Rake
           else
             invoke_prerequisites_parallel(task_args, new_chain)
           end
+
         if needed?
           if application.num_threads == 1
             execute(task_args) 
@@ -2276,9 +2282,15 @@ module Rake
         ['--threads', '-j N', "Specifies the number of threads to run simultaneously.",
           lambda { |value| self.num_threads = value.to_i }
         ],
-        #['--fork', '-k', "When --threads=N given, run each thread in a separate process.",
-        #  lambda { options.fork = true }
-        #],
+        ['--rand[=SEED]', "Randomize task prerequisite orders",
+          lambda { |value|
+            MultiTask.class_eval { remove_method(:invoke_prerequisites) }
+            options.randomize = true
+            if value
+              srand(value.to_i)
+            end
+          }
+        ],
         ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
           lambda { |value| $:.push(value) }
         ],

data/lib/rake/comp_tree/algorithm.rb

@@ -1,10 +1,10 @@
 
-require 'rake/comp_tree/quix/diagnostic'
+require 'rake/comp_tree/diagnostic'
 require 'rake/comp_tree/retriable_fork'
 
 module Rake::CompTree
   module Algorithm
-    include Quix::Diagnostic
+    include Diagnostic
 
     def compute_multithreaded(root, num_threads, use_fork, buckets)
       trace "Computing #{root.name} with #{num_threads} threads"

data/lib/rake/comp_tree/bucket_ipc.rb

@@ -3,13 +3,13 @@ require 'drb'
 require 'thread'
 
 require 'rake/comp_tree/retriable_fork'
-require 'rake/comp_tree/quix/diagnostic'
-require 'rake/comp_tree/quix/builtin/kernel/tap'
+require 'rake/comp_tree/diagnostic'
+require 'rake/comp_tree/tap'
 
 module Rake::CompTree
   module BucketIPC
     class Bucket
-      include Quix::Diagnostic
+      include Diagnostic
       include RetriableFork
 
       def initialize(address, timeout, wait_interval)

data/lib/rake/comp_tree/{quix/diagnostic.rb → diagnostic.rb}

@@ -1,7 +1,7 @@
 
-require 'rake/comp_tree/quix/builtin/kernel/tap'
+require 'rake/comp_tree/tap'
 
-module Rake::CompTree::Quix
+module Rake::CompTree
   module Diagnostic
     def show(desc = nil, stream = STDOUT, &block)
       if desc

data/lib/rake/comp_tree/driver.rb

@@ -1,7 +1,7 @@
 
 require 'rake/comp_tree/bucket_ipc'
-require 'rake/comp_tree/quix/diagnostic'
-require 'rake/comp_tree/quix/kernel'
+require 'rake/comp_tree/diagnostic'
+require 'rake/comp_tree/misc'
 require 'rake/comp_tree/algorithm'
 require 'rake/comp_tree/node'
 require 'rake/comp_tree/task_node'
@@ -22,8 +22,8 @@ module Rake::CompTree
       :wait_interval => 0.02,
     }
 
-    include Quix::Diagnostic #:nodoc:
-    include Quix::Kernel #:nodoc:
+    include Diagnostic
+    include Misc
     
     #
     # Begin a new computation tree.

data/lib/rake/comp_tree/{quix/kernel.rb → misc.rb}

@@ -1,8 +1,8 @@
 
 require 'thread'
 
-module Rake::CompTree::Quix
-  module Kernel
+module Rake::CompTree
+  module Misc
     def let
       yield self
     end

data/lib/rake/comp_tree/node.rb

@@ -1,5 +1,5 @@
 
-require 'rake/comp_tree/quix/diagnostic'
+require 'rake/comp_tree/diagnostic'
 require 'thread'
 
 module Rake::CompTree
@@ -7,7 +7,7 @@ module Rake::CompTree
   # Base class for nodes in the computation tree.
   # 
   class Node
-    include Quix::Diagnostic #:nodoc:
+    include Diagnostic
 
     attr_reader :name                   #:nodoc:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.2.1.0.6
+  version: 0.8.2.1.0.7
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -71,13 +71,13 @@ files:
 - lib/rake.rb
 - lib/rake/comp_tree/algorithm.rb
 - lib/rake/comp_tree/bucket_ipc.rb
+- lib/rake/comp_tree/diagnostic.rb
 - lib/rake/comp_tree/driver.rb
 - lib/rake/comp_tree/error.rb
+- lib/rake/comp_tree/misc.rb
 - lib/rake/comp_tree/node.rb
-- lib/rake/comp_tree/quix/builtin/kernel/tap.rb
-- lib/rake/comp_tree/quix/diagnostic.rb
-- lib/rake/comp_tree/quix/kernel.rb
 - lib/rake/comp_tree/retriable_fork.rb
+- lib/rake/comp_tree/tap.rb
 - lib/rake/comp_tree/task_node.rb
 - test/capture_stdout.rb
 - test/check_expansion.rb