parallelize 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -0,0 +1,9 @@
+=== 0.3.0 / 2012/06/10
+* Added `pmap`
+
+=== 0.2.1 / 2011/08/02
+* Compatible to Ruby 1.8 
+
+=== 0.2.0 / 2011/08/02
+* Initial release
+

data/Gemfile

@@ -7,7 +7,5 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -6,9 +6,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
+    rake (0.9.2.2)
     yard (0.6.8)
 
 PLATFORMS
@@ -16,7 +14,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  rcov
   yard (~> 0.6.0)

data/README.markdown

@@ -0,0 +1,67 @@
+# parallelize
+
+Simple multi-threading for Ruby.
+
+## Installation
+```
+gem install parallelize
+```
+
+## Examples
+```ruby
+require 'rubygems'
+require 'parallelize'
+
+parallelize(4) do
+  puts "I'm a thread"
+
+  # ...
+end
+
+# Zero-based thread index
+parallelize(4) do |thread_idx|
+  puts "I'm thread ##{thread_idx}"
+
+  # ...
+end
+
+# Enumerable#peach
+(0..100).peach(4) do |elem, thread_idx|
+  puts "Thread ##{thread_idx} processing #{elem}"
+end
+
+# Enumerable#pmap
+(0..100).pmap(4) do |elem|
+  elem ** 2
+end
+
+(0..100).pmap(8) do |elem, thread_idx|
+  elem * thread_idx
+end
+```
+
+### Collecting exceptions
+```ruby
+begin
+  parallelize(4, true) do |elem, thread_idx|
+    # Each thread can complete its block even when some other threads throw exceptions
+  end
+rescue ParallelException => e
+  p e.exceptions
+end
+```
+
+## Contributing to parallelize
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2011 Junegunn Choi. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -32,13 +32,14 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
+# TODO: simplecov
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/parallelize.rb

@@ -6,6 +6,6 @@ require 'parallelize/enumerable_ext'
 # @param [Fixnum] num_threads Number of concurrent threads
 # @param [Boolean] collect_exceptions If true, waits for all threads to complete even in case of exception, and throws ParallelException at the end. If false exception is immediately thrown.
 def parallelize num_threads, collect_exceptions = false, &block
-	num_threads.times.map.peach(num_threads, collect_exceptions, &block)
+	num_threads.times.peach(num_threads, collect_exceptions, &block)
 end
 

data/lib/parallelize/enumerable_ext.rb

@@ -1,53 +1,72 @@
 module Enumerable
+  module Parallelize
+    def self.it enum, num_threads, method, collect_exceptions, &block
+      raise ArgumentError.new("Block not given") unless block_given?
+      raise ArgumentError.new("Invalid number of threads") if num_threads < 1
+
+      threads = []
+      enum.each_slice((enum.count{true} / num_threads.to_f).ceil) do |slice|
+        threads << 
+          case block.arity
+          when 2
+            Thread.new(slice, threads.length) { |my_slice, thread_idx|
+              my_slice.send(method) { |e| yield e, thread_idx }
+            }
+          when 1
+            Thread.new(slice) { |my_slice|
+              my_slice.send(method) { |e| yield e }
+            }
+          when 0, -1
+            raise ArgumentError.new("Invalid arity: #{block.arity}") if
+              RUBY_VERSION !~ /^1.8\./ && block.arity == -1
+            Thread.new(slice) { |my_slice|
+              my_slice.send(method) { yield }
+            }
+          else
+            raise ArgumentError.new("Invalid arity: #{block.arity}")
+          end
+      end
+
+      exceptions = {}
+      threads.each_with_index do |thr, idx|
+        begin
+          thr.join
+        rescue Exception => e
+          if collect_exceptions
+            exceptions[idx] = e
+            nil
+          else
+            raise e
+          end
+        end
+      end
+
+      unless exceptions.empty?
+        raise ParallelException.new(exceptions)
+      end
+
+      if method == :each
+        threads
+      elsif method == :map
+        threads.map(&:value).inject(:+)
+      end
+    end
+  end
+
 	# Divides the Enumerable objects into pieces and execute with multiple threads
 	# @return [Array] Threads.
 	# @param [Fixnum] num_threads Number of concurrent threads
 	# @param [Boolean] collect_exceptions If true, waits for all threads to complete even in case of exception, and throws ParallelException at the end. If false exception is immediately thrown.
 	def peach num_threads, collect_exceptions = false, &block
-		raise ArgumentError.new("Block not given") unless block_given?
-		raise ArgumentError.new("Invalid number of threads") if num_threads < 1
+    Parallelize.it self, num_threads, :each, collect_exceptions, &block
+  end
 
-		threads = []
-		self.each_slice((self.count{true} / num_threads.to_f).ceil) do |slice|
-			threads << 
-				case block.arity
-				when 2
-					Thread.new(slice, threads.length) { |my_slice, thread_idx|
-						my_slice.each { |e| yield e, thread_idx }
-					}
-				when 1
-					Thread.new(slice) { |my_slice|
-						my_slice.each { |e| yield e }
-					}
-				when 0, -1
-					raise ArgumentError.new("Invalid arity: #{block.arity}") if
-						RUBY_VERSION !~ /^1.8\./ && block.arity == -1
-					Thread.new(slice) { |my_slice|
-						my_slice.each { yield }
-					}
-				else
-					raise ArgumentError.new("Invalid arity: #{block.arity}")
-				end
-		end
-
-		exceptions = {}
-		threads.each_with_index do |thr, idx|
-			begin
-				thr.join
-			rescue Exception => e
-				if collect_exceptions
-					exceptions[idx] = e
-				else
-					raise e
-				end
-			end
-		end
-
-		if exceptions.empty?
-			threads
-		else
-			raise ParallelException.new(exceptions)
-		end
-	end
+  # Parallelized map.
+	# @return [Array] Map function output for each element
+	# @param [Fixnum] num_threads Number of concurrent threads
+	# @param [Boolean] collect_exceptions If true, waits for all threads to complete even in case of exception, and throws ParallelException at the end. If false exception is immediately thrown.
+  def pmap num_threads, collect_exceptions = false, &block
+    Parallelize.it self, num_threads, :map, collect_exceptions, &block
+  end
 end
 

data/test/test_parallelize.rb

@@ -127,4 +127,14 @@ class TestParallelize < Test::Unit::TestCase
 		(0..100).peach(4) do
 		end
 	end
+
+  def test_pmap
+    thr = 8
+    n_per_thr = (101.0 / 8).ceil
+    i = -1
+    assert_equal(
+      (0..100).map { |e, idx| i += 1; "#{e} by #{i / n_per_thr}" },
+      (0..100).pmap(thr) { |e, tidx| "#{e} by #{tidx}" }
+    )
+  end
 end

metadata

@@ -1,114 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: parallelize
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
-  - Junegunn Choi
+authors:
+- Junegunn Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: yard
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.6.0
-    requirement: *id001
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jeweler
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.6.4
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rcov
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
+date: 2012-06-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: Simple multi-threading for Ruby
 email: junegunn.c@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - LICENSE.txt
-  - README.rdoc
-files: 
-  - .document
-  - Gemfile
-  - Gemfile.lock
-  - LICENSE.txt
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - example/example.rb
-  - example/example2.rb
-  - lib/parallelize.rb
-  - lib/parallelize/enumerable_ext.rb
-  - lib/parallelize/parallel_exception.rb
-  - test/helper.rb
-  - test/test_parallelize.rb
+extra_rdoc_files:
+- LICENSE.txt
+- README.markdown
+files:
+- .document
+- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.markdown
+- Rakefile
+- VERSION
+- example/example.rb
+- example/example2.rb
+- lib/parallelize.rb
+- lib/parallelize/enumerable_ext.rb
+- lib/parallelize/parallel_exception.rb
+- test/helper.rb
+- test/test_parallelize.rb
 homepage: http://github.com/junegunn/parallelize
-licenses: 
-  - MIT
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4037532998974082938
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple multi-threading for Ruby
 test_files: []
-

data/README.rdoc

@@ -1,52 +0,0 @@
-= parallelize
-
-Simple multi-threading for Ruby.
-
-== Installation
-  gem install parallelize
-
-== Examples
-  require 'rubygems'
-  require 'parallelize'
-
-  parallelize(4) do
-    puts "I'm a thread"
-
-    # ...
-  end
-
-  # Zero-based thread index
-  parallelize(4) do |thread_idx|
-    puts "I'm thread ##{thread_idx}"
-
-    # ...
-  end
-
-  # Enumerable#peach
-  (0..100).peach(4) do |elem, thread_idx|
-    puts "Thread ##{thread_idx} processing #{elem}"
-  end
-
-=== Collecting exceptions
-  begin
-    parallelize(4, true) do |elem, thread_idx|
-      # Each thread can complete its block even when some other threads throw exceptions
-    end
-  rescue ParallelException => e
-    p e.exceptions
-  end
-
-== Contributing to parallelize
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Junegunn Choi. See LICENSE.txt for
-further details.
-