comp_tree 0.7.2 → 0.7.3

data/CHANGES.rdoc

@@ -1,6 +1,10 @@
 
 = CompTree ChangeLog
 
+== Version 0.7.3
+
+* replace standard Queue class
+
 == Version 0.7.2
 
 * check for number of threads < 1

data/README.rdoc

@@ -5,7 +5,8 @@
 
 == Summary
 
-Automatic parallelism and lazy evaluation.
+Automatic parallelism and lazy evaluation via pure functional
+programming.
 
 == Synopsis
   
@@ -52,7 +53,7 @@ Or for the (non-gem) .tgz package,
 
 == Description
 
-A computation tree for pure functional programming in Ruby.
+CompTree is a framework for parallelizing interrelated computations.
 
 The user should have a basic understanding of <em>functional
 programming</em> (see for example
@@ -103,7 +104,7 @@ depends on that state</em>.  This is the principle under which
 
 == License
   
-  Copyright (c) 2008 James M. Lawrence.  All rights reserved.
+  Copyright (c) 2008, 2009 James M. Lawrence.  All rights reserved.
   
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation files

data/Rakefile

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift "devel"
+$LOAD_PATH.unshift 'devel'
 
 require 'jumpstart'
 

data/devel/jumpstart.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
 require 'ostruct'
@@ -10,9 +10,9 @@ require 'rake/clean'
 
 require 'rdoc/rdoc'
 
-require "jumpstart/ruby"
-require "jumpstart/lazy_attribute"
-require "jumpstart/simple_installer"
+require 'jumpstart/ruby'
+require 'jumpstart/lazy_attribute'
+require 'jumpstart/simple_installer'
 
 class Jumpstart
   include LazyAttribute
@@ -112,7 +112,19 @@ class Jumpstart
     end
     
     attribute :files do
-      `git ls-files`.split("\n")
+      if File.exist?(manifest = "Manifest.txt")
+        File.read(manifest).split("\n")
+      elsif File.directory? ".git"
+        `git ls-files`.split("\n")
+      elsif File.directory? ".svn"
+        `svn status --verbose`.split("\n").map { |t|
+          t.split[3]
+        }.select { |t|
+          t and File.file?(t)
+        }
+      else
+        []
+      end
     end
 
     attribute :rdoc_files do
@@ -302,7 +314,7 @@ class Jumpstart
         run_ruby_on_each(*spec_files)
       end
 
-      task :prerelease => :spec_deps
+      task :prerelease => [:spec, :spec_deps]
       task :default => :spec
 
       CLEAN.include spec_output
@@ -337,7 +349,7 @@ class Jumpstart
         run_ruby_on_each(*test_files)
       end
       
-      task :prerelease => :test_deps
+      task :prerelease => [:test, :test_deps]
       task :default => :test
       
       CLEAN.include rcov_dir
@@ -417,7 +429,7 @@ class Jumpstart
       def debug_info(enable)
         Find.find("lib", "test") { |path|
           if path =~ %r!\.rb\Z!
-            replace_file(path) { |contents|
+            Jumpstart.replace_file(path) { |contents|
               result = comment_regions(!enable, contents, "debug")
               comment_lines(!enable, result, "trace")
             }
@@ -539,17 +551,6 @@ class Jumpstart
     sh(*([browser].flatten + files))
   end
 
-  def replace_file(file)
-    old_contents = File.read(file)
-    yield(old_contents).tap { |new_contents|
-      if old_contents != new_contents
-        File.open(file, "wb") { |output|
-          output.print(new_contents)
-        }
-      end
-    }
-  end
-
   def write_file(file)
     yield.tap { |contents|
       File.open(file, "wb") { |out|
@@ -568,12 +569,25 @@ class Jumpstart
     str.split('_').map { |t| t.capitalize }.join
   end
 
-  unless respond_to? :tap
-    class Object
-      def tap
-        yield self
-        self
-      end
+  class << self
+    def replace_file(file)
+      old_contents = File.read(file)
+      yield(old_contents).tap { |new_contents|
+        if old_contents != new_contents
+          File.open(file, "wb") { |output|
+            output.print(new_contents)
+          }
+        end
+      }
+    end
+  end
+end
+
+unless respond_to? :tap
+  class Object
+    def tap
+      yield self
+      self
     end
   end
 end

data/install.rb

@@ -1,3 +1,3 @@
-$LOAD_PATH.unshift "rakelib"
+$LOAD_PATH.unshift 'rakelib'
 require 'jumpstart/simple_installer'
 Jumpstart::SimpleInstaller.new.run

data/lib/comp_tree/algorithm.rb

@@ -1,4 +1,6 @@
 
+require 'comp_tree/queue'
+
 module CompTree
   module Algorithm
     module_function
@@ -6,52 +8,53 @@ module CompTree
     def compute_parallel(root, num_threads)
       to_workers = Queue.new
       from_workers = Queue.new
-
-      node_to_worker = nil
-      node_from_worker = nil
-
-      num_working = 0
-      finished = nil
+      final_node = nil
 
       workers = (1..num_threads).map {
         Thread.new {
-          until (node = to_workers.pop) == :finished
+          until (node = to_workers.pop) == nil
             node.compute
             from_workers.push node
           end
         }
       }
 
-      while true
-        if num_working == num_threads or not (node_to_worker = find_node(root))
-          #
-          # max computations running or no nodes available -- wait for results
-          #
-          node_from_worker = from_workers.pop
-          node_from_worker.unlock
-          num_working -= 1
-          if node_from_worker == root or
-              node_from_worker.computed.is_a? Exception
-            finished = node_from_worker
-            break
+      Thread.new {
+        node_to_worker = nil
+        node_from_worker = nil
+        num_working = 0
+        while true
+          if num_working == num_threads or
+              not (node_to_worker = find_node(root))
+            #
+            # maxed out or no nodes available -- wait for results
+            #
+            node_from_worker = from_workers.pop
+            node_from_worker.unlock
+            num_working -= 1
+            if node_from_worker == root or
+                node_from_worker.computed.is_a? Exception
+              final_node = node_from_worker
+              break
+            end
+          elsif node_to_worker
+            #
+            # found a node
+            #
+            to_workers.push node_to_worker
+            num_working += 1
+            node_to_worker = nil
           end
-        elsif node_to_worker
-          #
-          # found a node
-          #
-          to_workers.push node_to_worker
-          num_working += 1
-          node_to_worker = nil
         end
-      end
-      
-      num_threads.times { to_workers.push :finished }
+        num_threads.times { to_workers.push nil }
+      }.join
+
       workers.each { |t| t.join }
       
-      if finished.computed.is_a? Exception
-        raise finished.computed
+      if final_node.computed.is_a? Exception
+        raise final_node.computed
       else
-        finished.result
+        final_node.result
       end
     end
 

data/lib/comp_tree/driver.rb

@@ -3,8 +3,6 @@ require 'comp_tree/algorithm'
 require 'comp_tree/node'
 require 'comp_tree/error'
 
-require 'thread'
-
 module CompTree
   #
   # Driver is the main interface to the computation tree.  It is
@@ -14,7 +12,7 @@ module CompTree
     include Algorithm
 
     #
-    # See CompTree.build.
+    # See CompTree.build
     #
     def initialize(opts = nil)  #:nodoc:
       @node_class =
@@ -34,7 +32,7 @@ module CompTree
     #
     # _name_ -- unique node identifier (for example a symbol).
     #
-    # _child_names_ -- unique node identifiers for children.
+    # _child_names_ -- unique node identifiers of children.
     #
     # Define a computation node.
     #

data/lib/comp_tree/error.rb

@@ -13,8 +13,4 @@ module CompTree
   
   # Encountered a node without a function during a computation.
   class NoFunctionError < Error ; end
-
-  #debug {
-  #  class AssertionFailedError < Error ; end
-  #}
 end

data/lib/comp_tree/node.rb

@@ -105,8 +105,8 @@ module CompTree
         end
         @result = @function.call(*@children_results)
         @computed = true
-      rescue Exception => e
-        @computed = e
+      rescue Exception => exception
+        @computed = exception
       end
       @result
     end

data/lib/comp_tree/queue.rb

@@ -0,0 +1 @@
+require "comp_tree/queue_" + (RUBY_VERSION < "1.9.0" ? "old" : "new")

data/lib/comp_tree/queue_new.rb

@@ -0,0 +1,33 @@
+
+module CompTree
+  #
+  # minimal version of standard Queue
+  #
+  class Queue
+    def initialize
+      @queue = []
+      @waiting = []
+      @mutex = Mutex.new
+    end
+    
+    def push(object)
+      @mutex.synchronize {
+        @queue.push object
+        thread = @waiting.shift and thread.wakeup
+      }
+    end
+
+    def pop
+      @mutex.synchronize {
+        while true
+          if @queue.empty?
+            @waiting.push Thread.current
+            @mutex.sleep
+          else
+            return @queue.shift
+          end
+        end
+      }
+    end
+  end
+end

data/lib/comp_tree/queue_old.rb

@@ -0,0 +1,34 @@
+
+require 'thread'
+
+module CompTree
+  #
+  # minimal version of standard Queue
+  #
+  class Queue
+    def initialize
+      @queue = []
+      @waiting = []
+    end
+
+    def push(object)
+      Thread.critical = true
+      @queue.push object
+      begin
+        thread = @waiting.shift and thread.wakeup
+      ensure
+        Thread.critical = false
+      end
+    end
+
+    def pop
+      while (Thread.critical = true; @queue.empty?)
+        @waiting.push Thread.current
+        Thread.stop
+      end
+      @queue.shift
+    ensure
+      Thread.critical = false
+    end
+  end
+end

data/lib/comp_tree.rb

@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2008 James M. Lawrence.  All rights reserved.
+# Copyright (c) 2008, 2009 James M. Lawrence.  All rights reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ require 'comp_tree/driver'
 # See README.rdoc.
 #
 module CompTree
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 
   class << self
     #

data/test/common.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'test/unit'
 require 'comp_tree'

data/test/test_basic.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestBasic < Test::Unit::TestCase
   def test_define

data/test/test_circular.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestCircular < Test::Unit::TestCase
   def test_circular

data/test/test_drain.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestDrain < Test::Unit::TestCase
   include TestCommon

data/test/test_exception.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestException < Test::Unit::TestCase
   def test_exception

data/test/test_flood.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestFlood < Test::Unit::TestCase
   def test_thread_flood

data/test/test_grind.rb

@@ -1,16 +1,17 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestGrind < Test::Unit::TestCase
   include TestCommon
 
   GENERATOR_DATA = {
-    :level_range => 1..10,
-    :children_range => 1..10,
+    :level_range => 1..5,
+    :children_range => 1..5,
     :thread_range => 1..10,
     :drain_iterations => 30,
   }
 
   ROOT = 'a'
+  RETURN_FLAG = rand
 
   def test_grind
     run_generated_tree(GENERATOR_DATA)
@@ -28,6 +29,7 @@ class TestGrind < Test::Unit::TestCase
       drain = lambda { |*args|
         drain_iterations.times {
         }
+        RETURN_FLAG
       }
       build_tree = lambda { |parent, children, level|
         #trace "building #{parent} --> #{children.join(' ')}"
@@ -44,7 +46,7 @@ class TestGrind < Test::Unit::TestCase
           }
         end
       }
-      build_tree.call(ROOT, pick_names.call, drain_iterations)
+      build_tree.call(ROOT, pick_names.call, 0)
       driver
     }
   end
@@ -69,7 +71,7 @@ class TestGrind < Test::Unit::TestCase
             #}
             result = driver.compute(ROOT, threads)
             #bench_output bench
-            assert_equal(result, args[:drain_iterations])
+            assert_equal(result, RETURN_FLAG)
           }
         }
       }

data/test/test_sequential.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/common'
 
 class TestSequential < Test::Unit::TestCase
   def test_sequential

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: comp_tree
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2009-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: A computation tree for pure functional programming in Ruby.
+description: CompTree is a framework for parallelizing interrelated computations.
 email: 
 - quixoticsycophant@gmail.com
 executables: []
@@ -36,6 +36,9 @@ files:
 - lib/comp_tree/driver.rb
 - lib/comp_tree/error.rb
 - lib/comp_tree/node.rb
+- lib/comp_tree/queue.rb
+- lib/comp_tree/queue_new.rb
+- lib/comp_tree/queue_old.rb
 - test/common.rb
 - test/test_basic.rb
 - test/test_circular.rb
@@ -51,7 +54,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- "comp_tree: Automatic parallelism and lazy evaluation."
+- "comp_tree: Automatic parallelism and lazy evaluation via pure functional programming."
 - --exclude
 - CHANGES.rdoc
 - --exclude
@@ -104,6 +107,6 @@ rubyforge_project: comptree
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Automatic parallelism and lazy evaluation.
+summary: Automatic parallelism and lazy evaluation via pure functional programming.
 test_files: []