parallel 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4335cc7d93938d3aafdb07fee7a4aa32e7b586c7
-  data.tar.gz: 718327edc760a05b8d8502ed1afdb334a1fb1ef1
+  metadata.gz: f6ea4deb03b39b10b4efc968f86c86d8fba2c42f
+  data.tar.gz: b32876b86f9acc449bb45d28b154708f9af0dee1
 SHA512:
-  metadata.gz: 1d4c4d72297c1e8e0da33d05e111d7eb32e58c0f7d759329abd1c5f9a90c17711bf23202f75ad647414194284747b8d493073a11cc024e4351633a743526f6aa
-  data.tar.gz: 2dc97cc4d85eb122faa0cdade2de92d5889a14eed7fe08527c4cc3562d5fc8c2ae7571842a3c44bfc69fdb726aab5e19a90102a164a7884de93ac0291558df46
+  metadata.gz: 92021663b44c16d0ce0f9dfa0c616f3852f9e2a6f7c85521c06283f2fd5daad75f7dbf95703241c926b71eb98a44619eefdcc62d3039e4311d8ba4389fb06649
+  data.tar.gz: c48fdaebf240f24722a41868688e0373349f78eb1de8e9329cdd0e458cdaf0458e1cbc6cbbfd4f3b5707c5363706e4755ed66c543332c03b39b2be909ccd0132

data.tar.gz.sig

@@ -1,2 +1 @@
-]��� a��FmS%�Mϓh���u���M
�m���BE��#��&.X��S�ၓ3�8aa�J~�>�巣
�����=���n�D;{�EhMzsp�R��;���:�C�^Gώ����Y��&2��H4�
~����"e�݈���O��1�ɖPtR
-�!��$d�-�B��<�L�"�ȗ�Z{�c���ԃ�~�F/�'t"�brM�h��.9�k-5"o��	�a�|�kt\#9�xt�4�_е�����*�qI/�F
+��
��jVz�W—��~~u7
�)�&W�K�e
������NO��4T(M�G������㕥�Y̔3�U)���̺�F�Sjh�5s�iϑb0��E�ݏ�6�ٙϝr8n~�Ԕ�2�ɰM��V�yy��2LT�ހH5�`�;b��D3���g*&��;m����/����?\�.����8Oڕ��<��FB@r�>Lߞ�Ϧ�f�`5?ӺJ-`|át&�7M�X�k�����&F���)u�

data/lib/parallel.rb

@@ -1,8 +1,11 @@
 require 'thread' # to get Thread.exclusive
 require 'rbconfig'
 require 'parallel/version'
+require 'parallel/processor_count'
 
 module Parallel
+  extend Parallel::ProcessorCount
+
   class DeadWorker < StandardError
   end
 
@@ -84,7 +87,7 @@ module Parallel
     end
 
     def each(array, options={}, &block)
-      map(array, options.merge(:preserve_results => !!options[:finish]), &block)
+      map(array, options.merge(:preserve_results => false), &block)
       array
     end
 
@@ -113,6 +116,7 @@ module Parallel
       end
       size = [array.size, size].min
 
+      options[:return_results] = (options[:preserve_results] != false || !!options[:finish])
       add_progress_bar!(array, options)
 
       if size == 0
@@ -144,88 +148,6 @@ module Parallel
       map(array, options.merge(:with_index => true), &block)
     end
 
-    # Number of processors seen by the OS and used for process scheduling.
-    #
-    # * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
-    # * BSD: /sbin/sysctl
-    # * Cygwin: /proc/cpuinfo
-    # * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
-    # * HP-UX: /usr/sbin/ioscan
-    # * IRIX: /usr/sbin/sysconf
-    # * Linux: /proc/cpuinfo
-    # * Minix 3+: /proc/cpuinfo
-    # * Solaris: /usr/sbin/psrinfo
-    # * Tru64 UNIX: /usr/sbin/psrinfo
-    # * UnixWare: /usr/sbin/psrinfo
-    #
-    def processor_count
-      @processor_count ||= begin
-        os_name = RbConfig::CONFIG["target_os"]
-        if os_name =~ /mingw|mswin/
-          require 'win32ole'
-          result = WIN32OLE.connect("winmgmts://").ExecQuery(
-              "select NumberOfLogicalProcessors from Win32_Processor")
-          result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
-        elsif File.readable?("/proc/cpuinfo")
-          IO.read("/proc/cpuinfo").scan(/^processor/).size
-        elsif File.executable?("/usr/bin/hwprefs")
-          IO.popen("/usr/bin/hwprefs thread_count").read.to_i
-        elsif File.executable?("/usr/sbin/psrinfo")
-          IO.popen("/usr/sbin/psrinfo").read.scan(/^.*on-*line/).size
-        elsif File.executable?("/usr/sbin/ioscan")
-          IO.popen("/usr/sbin/ioscan -kC processor") do |out|
-            out.read.scan(/^.*processor/).size
-          end
-        elsif File.executable?("/usr/sbin/pmcycles")
-          IO.popen("/usr/sbin/pmcycles -m").read.count("\n")
-        elsif File.executable?("/usr/sbin/lsdev")
-          IO.popen("/usr/sbin/lsdev -Cc processor -S 1").read.count("\n")
-        elsif File.executable?("/usr/sbin/sysconf") and os_name =~ /irix/i
-          IO.popen("/usr/sbin/sysconf NPROC_ONLN").read.to_i
-        elsif File.executable?("/usr/sbin/sysctl")
-          IO.popen("/usr/sbin/sysctl -n hw.ncpu").read.to_i
-        elsif File.executable?("/sbin/sysctl")
-          IO.popen("/sbin/sysctl -n hw.ncpu").read.to_i
-        else
-          $stderr.puts "Unknown platform: " + RbConfig::CONFIG["target_os"]
-          $stderr.puts "Assuming 1 processor."
-          1
-        end
-      end
-    end
-
-    # Number of physical processor cores on the current system.
-    #
-    def physical_processor_count
-      @physical_processor_count ||= begin
-        ppc = case RbConfig::CONFIG["target_os"]
-        when /darwin1/
-          IO.popen("/usr/sbin/sysctl -n hw.physicalcpu").read.to_i
-        when /linux/
-          cores = {}  # unique physical ID / core ID combinations
-          phy = 0
-          IO.read("/proc/cpuinfo").scan(/^physical id.*|^core id.*/) do |ln|
-            if ln.start_with?("physical")
-              phy = ln[/\d+/]
-            elsif ln.start_with?("core")
-              cid = phy + ":" + ln[/\d+/]
-              cores[cid] = true if not cores[cid]
-            end
-          end
-          cores.count
-        when /mswin|mingw/
-          require 'win32ole'
-          result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
-              "select NumberOfCores from Win32_Processor")
-          result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
-        else
-          processor_count
-        end
-        # fall back to logical count if physical info is invalid
-        ppc > 0 ? ppc : processor_count
-      end
-    end
-
     private
 
     def work_direct(array, options)
@@ -249,13 +171,13 @@ module Parallel
           index = Thread.exclusive { current += 1 }
           break if index >= items.size
 
-          with_instrumentation items[index], index, options do
-            begin
-              results[index] = call_with_index(items, index, options, &block)
-            rescue StandardError => e
-              exception = e
-              break
+          begin
+            results[index] = with_instrumentation items[index], index, options do
+              call_with_index(items, index, options, &block)
             end
+          rescue StandardError => e
+            exception = e
+            break
           end
         end
       end
@@ -436,11 +358,11 @@ module Parallel
     def call_with_index(array, index, options, &block)
       args = [array[index]]
       args << index if options[:with_index]
-      if options[:preserve_results] == false
+      if options[:return_results]
         block.call(*args)
-        nil # avoid GC overhead of passing large results around
       else
         block.call(*args)
+        nil # avoid GC overhead of passing large results around
       end
     end
 
@@ -449,6 +371,7 @@ module Parallel
       on_finish = options[:finish]
       options[:mutex].synchronize { on_start.call(item, index) } if on_start
       result = yield
+      result unless options[:preserve_results] == false
     ensure
       options[:mutex].synchronize { on_finish.call(item, index, result) } if on_finish
     end

data/lib/parallel/processor_count.rb

@@ -0,0 +1,85 @@
+module Parallel
+  module ProcessorCount
+    # Number of processors seen by the OS and used for process scheduling.
+    #
+    # * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
+    # * BSD: /sbin/sysctl
+    # * Cygwin: /proc/cpuinfo
+    # * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
+    # * HP-UX: /usr/sbin/ioscan
+    # * IRIX: /usr/sbin/sysconf
+    # * Linux: /proc/cpuinfo
+    # * Minix 3+: /proc/cpuinfo
+    # * Solaris: /usr/sbin/psrinfo
+    # * Tru64 UNIX: /usr/sbin/psrinfo
+    # * UnixWare: /usr/sbin/psrinfo
+    #
+    def processor_count
+      @processor_count ||= begin
+        os_name = RbConfig::CONFIG["target_os"]
+        if os_name =~ /mingw|mswin/
+          require 'win32ole'
+          result = WIN32OLE.connect("winmgmts://").ExecQuery(
+            "select NumberOfLogicalProcessors from Win32_Processor")
+          result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
+        elsif File.readable?("/proc/cpuinfo")
+          IO.read("/proc/cpuinfo").scan(/^processor/).size
+        elsif File.executable?("/usr/bin/hwprefs")
+          IO.popen("/usr/bin/hwprefs thread_count").read.to_i
+        elsif File.executable?("/usr/sbin/psrinfo")
+          IO.popen("/usr/sbin/psrinfo").read.scan(/^.*on-*line/).size
+        elsif File.executable?("/usr/sbin/ioscan")
+          IO.popen("/usr/sbin/ioscan -kC processor") do |out|
+            out.read.scan(/^.*processor/).size
+          end
+        elsif File.executable?("/usr/sbin/pmcycles")
+          IO.popen("/usr/sbin/pmcycles -m").read.count("\n")
+        elsif File.executable?("/usr/sbin/lsdev")
+          IO.popen("/usr/sbin/lsdev -Cc processor -S 1").read.count("\n")
+        elsif File.executable?("/usr/sbin/sysconf") and os_name =~ /irix/i
+          IO.popen("/usr/sbin/sysconf NPROC_ONLN").read.to_i
+        elsif File.executable?("/usr/sbin/sysctl")
+          IO.popen("/usr/sbin/sysctl -n hw.ncpu").read.to_i
+        elsif File.executable?("/sbin/sysctl")
+          IO.popen("/sbin/sysctl -n hw.ncpu").read.to_i
+        else
+          $stderr.puts "Unknown platform: " + RbConfig::CONFIG["target_os"]
+          $stderr.puts "Assuming 1 processor."
+          1
+        end
+      end
+    end
+
+    # Number of physical processor cores on the current system.
+    #
+    def physical_processor_count
+      @physical_processor_count ||= begin
+        ppc = case RbConfig::CONFIG["target_os"]
+        when /darwin1/
+          IO.popen("/usr/sbin/sysctl -n hw.physicalcpu").read.to_i
+        when /linux/
+          cores = {}  # unique physical ID / core ID combinations
+          phy = 0
+          IO.read("/proc/cpuinfo").scan(/^physical id.*|^core id.*/) do |ln|
+            if ln.start_with?("physical")
+              phy = ln[/\d+/]
+            elsif ln.start_with?("core")
+              cid = phy + ":" + ln[/\d+/]
+              cores[cid] = true if not cores[cid]
+            end
+          end
+          cores.count
+        when /mswin|mingw/
+          require 'win32ole'
+          result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
+            "select NumberOfCores from Win32_Processor")
+          result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
+        else
+          processor_count
+        end
+        # fall back to logical count if physical info is invalid
+        ppc > 0 ? ppc : processor_count
+      end
+    end
+  end
+end

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.2.3'
+  VERSION = Version = '1.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Michael Grosser
@@ -40,6 +40,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE.txt
 - lib/parallel.rb
+- lib/parallel/processor_count.rb
 - lib/parallel/version.rb
 homepage: https://github.com/grosser/parallel
 licenses: