mpipe 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f0bec53a0a6940093b513532384491708117c9
-  data.tar.gz: 9f15045ca9c5e95c21cb60903d95f3fb16191525
+  metadata.gz: b8e5947b77db645ecc5074b784d86c455cd24b4e
+  data.tar.gz: aaa1e9b33b288b94339c6859eb1febc1b4123c9a
 SHA512:
-  metadata.gz: 50908b6ec00bc10bcef427998eb7f2941bbc1d6d2aadd33cb928e6a1aa37770bdf31663ca027fd8690ba259a4429d6f2336b3fa124e139c123ff4bb4c5ddcdd4
-  data.tar.gz: 3a06ab215c22444df2914fd583aeebb4aab9138ad68affb090c5949119a41063b006c5d76fdd7b82d5f5704fb7ba31236b0f3264cee41feb67ca66384f5c0e07
+  metadata.gz: a94e705f1738c6507f88b2dd5fa0e4a9f8a0e6641e02fdb438e6a269367391392c13f6be5053233f25be0d64868dc95f46e763edb106abe818938e2269265144
+  data.tar.gz: d2a00d00b9f2f77a871a90aa5875d9edd03ddd352c56f5113603523faeda1830b1eaf3dd16ae2515215dd5db5869dbd9e2a21371dbbd41ed43af8fda4fbc94d1

data/README.md

@@ -1,15 +1,15 @@
 # MPipe
 
-Ruby's IO.pipe emulation over MPI
+Ruby's IO.pipe emulation using MPI
 
 [GitHub](https://github.com/masa16/mpipe) | [RubyGems](https://rubygems.org/gems/mpipe)
 
 ## Requirement
 
-Message Passing Interface (MPI) framework such as 
+Message Passing Interface (MPI) framework such as
 [OpenMPI](https://www.open-mpi.org/), [MPICH](https://www.mpich.org/), etc.
 
-Commands:
+Required commands:
 * mpicc - Compiler for MPI programs.
 * mpirun - Command to run MPI program.
 
@@ -43,7 +43,7 @@ puts "size=%d rank=%d pid=%d" % [size,rank,Process.pid]
 if rank == 0
 
   (1..size-1).each do |r|
-    p MPipe.new(r).read
+    p MPipe.new(r).read(12)
   end
 
 else
@@ -79,7 +79,11 @@ mp = MPipe.new(rank) -- returns pipe to MPI process with rank.
 mp.write(str) -- emulate IO#write.
 mp.read(length,outbuf=nil) -- emulate IO#read.
 mp.read_nonblock(maxlen,outbuf=nil,excepton:true) -- emulate IO#read_nonblock.
-MPipe.select(array_of_mpipe) -- emulate IO.select
+
+MPipe.select(rd_ary, [wt_ary, er_ary, timeout]) -- emulate IO.select
+MPipe.min_polling_intercal=(sec) -- initial polling interval in MPipe.select.
+MPipe.max_polling_intercal=(sec) -- final polling interval in MPipe.select.
+ (polling intervals = min, min*2, min*4, min*8, ..., max, max, ...)
 ```
 
 ## Contributing

data/ext/mpipe/mpipe.c

@@ -1,10 +1,9 @@
+//#include <sys/time.h>
 #include "ruby.h"
 #include "ruby/io.h"
 //#include "ruby/encoding.h"
 #include "mpi.h"
 
-#define MPIPE_VERSION "0.2.0"
-
 static int mp_buffer_size = 4098;
 static int mp_initialized = 0;
 static int mp_finalized = 0;
@@ -254,7 +253,16 @@ mp_s_new(VALUE klass, VALUE vrank)
 }
 
 
-#if 0
+/*
+ * Returns +rank+.
+ */
+static VALUE
+mp_rank(VALUE self)
+{
+    struct MPipe *ptr = MPipe(self);
+    return INT2NUM(ptr->rank);
+}
+
 /*
  * Returns +false+.  Just for compatibility to IO.
  */
@@ -264,7 +272,6 @@ mp_false(VALUE self)
     MPipe(self);
     return Qfalse;
 }
-#endif
 
 /*
  * Returns +nil+.  Just for compatibility to IO.
@@ -321,6 +328,8 @@ mp_unimpl(int argc, VALUE *argv, VALUE self)
 #endif
 
 #define mp_close mp_nil
+#define mp_flush mp_nil
+#define mp_closed_p mp_false
 
 static VALUE
 mp_write(VALUE self, VALUE str)
@@ -342,12 +351,12 @@ mp_write(VALUE self, VALUE str)
         istat = MPI_Send(ptr->send_buffer, count, MPI_CHAR, ptr->rank,
                          0, MPI_COMM_WORLD);
         if (istat != MPI_SUCCESS) {
-            rb_raise(rb_eStandardError,"MPI_send failed with status=%d\n",istat);
+            rb_raise(rb_eStandardError,"MPI_Send failed with status=%d\n",istat);
         }
 
         pos += count;
     }
-    return self;
+    return INT2NUM(pos);
 }
 
 
@@ -417,7 +426,7 @@ mp_read(int argc, VALUE *argv, VALUE self)
         istat = MPI_Recv(ptr->recv_buffer, mp_buffer_size, MPI_CHAR, ptr->rank,
                          0, MPI_COMM_WORLD, &status);
         if (istat != MPI_SUCCESS) {
-            rb_raise(rb_eStandardError,"MPI_recv failed with status=%d\n",istat);
+            rb_raise(rb_eStandardError,"MPI_Recv failed with status=%d\n",istat);
         }
         MPI_Get_count(&status, MPI_CHAR, &ptr->recv_count);
 
@@ -533,61 +542,26 @@ mp_read_nonblock(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+ * call-seq:
+ *   mpipe.test_recv    -> true or false
+ *
+ * calls MPI_Test
+ */
 static VALUE
-mp_s_select(int argc, VALUE *argv, VALUE mod)
+mp_test_recv(VALUE self)
 {
-    struct MPipe *ptr;
-    MPI_Request *ary_of_requests;
-    int *ary_of_indices;
-    MPI_Status *ary_of_statuses;
-    int incount, outcount;
-    int i, count, istat;
-    VALUE rd_ary, result_ary, item;
-
-    if (argc==0) {
-        rb_raise(rb_eArgError, "no argument");
-    }
-    incount = RARRAY_LEN(argv[0]);
-
-    result_ary = rb_ary_new();
-    rd_ary = rb_ary_new();
-    rb_ary_push(result_ary, rd_ary);
-    for (i=0; i < incount; i++) {
-        item = RARRAY_AREF(argv[0], i);
-        ptr = MPipe(item);
-        if (ptr->recv_count > 0) {
-            rb_ary_push(rd_ary, item);
-        }
-    }
-    if (RARRAY_LEN(rd_ary) > 0) {
-        return result_ary;
-    }
-
-    ary_of_requests = ALLOCA_N(MPI_Request, incount);
-    ary_of_statuses = ALLOCA_N(MPI_Status, incount);
-    ary_of_indices  = ALLOCA_N(int, incount);
-
-    for (i=0; i < incount; i++) {
-        item = RARRAY_AREF(argv[0], i);
-        ptr = MPipe(item);
-        call_irecv(ptr);
-        ary_of_requests[i] = ptr->recv_request;
-    }
+    struct MPipe *ptr = MPipe(self);
 
-    istat = MPI_Waitsome(incount, ary_of_requests,
-                         &outcount, ary_of_indices, ary_of_statuses);
-    if (istat != MPI_SUCCESS) {
-        rb_raise(rb_eStandardError,"MPI_Waitany failed with status=%d",istat);
+    call_irecv(ptr);
+    if (ptr->recv_count == -1) { // requesting
+        call_test(ptr);
     }
-
-    for (i=0; i < outcount; i++) {
-        item = RARRAY_AREF(argv[0], ary_of_indices[i]);
-        MPI_Get_count(&ary_of_statuses[i], MPI_BYTE, &count);
-        ptr = MPipe(item);
-        ptr->recv_count = count;
-        rb_ary_push(rd_ary, item);
+    if (ptr->recv_count > 0) {
+        return Qtrue;
+    } else {
+        return Qfalse;
     }
-    return result_ary;
 }
 
 
@@ -604,7 +578,6 @@ void Init_mpipe()
     rb_define_module_function(cMPipe, "buffer_size", mp_mpi_buffer_size, 0);
     rb_define_module_function(cMPipe, "buffer_size=", mp_mpi_set_buffer_size, 1);
 
-    rb_define_const(cMPipe, "VERSION", rb_str_new2(MPIPE_VERSION));
     rb_define_const(cMPipe, "MPI_VERSION", INT2NUM(MPI_VERSION));
     rb_define_const(cMPipe, "MPI_SUBVERSION", INT2NUM(MPI_SUBVERSION));
     rb_define_const(cMPipe, "SUCCESS", INT2NUM(MPI_SUCCESS));
@@ -625,9 +598,11 @@ void Init_mpipe()
     rb_define_method(cMPipe, "print", mp_write, 1);
     rb_define_method(cMPipe, "read", mp_read, -1);
     rb_define_method(cMPipe, "read_nonblock", mp_read_nonblock, -1);
-    rb_define_method(cMPipe, "close", mp_close, 1);
-
-    rb_define_singleton_method(cMPipe, "select", mp_s_select, -1);
+    rb_define_method(cMPipe, "flush", mp_flush, 0);
+    rb_define_method(cMPipe, "close", mp_close, 0);
+    rb_define_method(cMPipe, "closed?", mp_closed_p, 0);
+    rb_define_method(cMPipe, "test_recv", mp_test_recv, 0);
+    rb_define_method(cMPipe, "rank", mp_rank, 0);
 
     sym_exception = ID2SYM(rb_intern("exception"));
     id_allocated_mpipe = rb_intern("allocated_mpipe");

data/lib/mpipe.rb

@@ -0,0 +1,129 @@
+require "mpipe.so"
+require "mpipe/version"
+
+class MPipe
+
+  @@min_poll = 0.01
+  @@max_poll = 0.32
+
+  def self.min_polling_interval=(time)
+    @@min_poll = time
+  end
+
+  def self.max_polling_interval=(time)
+    @@max_poll = time
+  end
+
+  # emulate IO.select
+  def self.select(rd_ary, wt_ary=nil, er_ary=nil, timeout=nil)
+    rd_ary = [] if rd_ary.nil?
+    wt_ary = [] if wt_ary.nil?
+    rd_mpi = []
+    rd_io = []
+    wt_io = []
+    rd_ret = Array.new(rd_ary.size)
+    wt_ret = Array.new(wt_ary.size)
+    rd_idx = {}
+    wt_idx = {}
+    found = false
+
+    rd_ary.each_with_index do |rd,i|
+      rd_idx[rd] = i
+      case rd
+      when MPipe
+        rd_mpi << rd
+        if rd.test_recv
+          rd_ret[i] = rd
+          found = true
+        end
+      when IO
+        rd_io << rd
+      else
+        raise ArgumentError, "elements should be IO or MPipe"
+      end
+    end
+
+    wt_ary.each_with_index do |wt,i|
+      wt_idx[wt] = i
+      case wt
+      when MPipe
+        wt_ret[i] = wt
+        found = true
+      when IO
+        wt_io << wt
+      else
+        raise ArgumentError, "elements should be IO or MPipe"
+      end
+    end
+
+    if er_ary
+      er_ary.each do |er|
+        if !er.kind_of?(IO)
+          raise ArgumentError, "er_ary contains non-IO object"
+        end
+      end
+    end
+
+    time_start = Time.now
+
+    # first check
+    rd_res,wt_res,er_res = IO.select(rd_io, wt_io, er_ary, 0)
+    if rd_res
+      rd_res.each{|io| rd_ret[rd_idx[io]] = io}
+      found = true
+    end
+    if wt_res
+      wt_res.each{|io| wt_ret[wt_idx[io]] = io}
+      found = true
+    end
+    if er_res
+      found = true
+    end
+    if found
+      return [rd_ret.compact, wt_ret.compact, er_res]
+    end
+
+    dt = @@min_poll
+    max_dt = @@max_poll
+    loop do
+      if timeout
+        elap = Time.now - time_start
+        if timeout <= elap
+          return nil
+        else
+          dto = timeout - elap
+          dt = (dto < dt) ? dto : dt
+        end
+      end
+
+      # check with timeout
+      rd_res,wt_res,er_res = IO.select(rd_io, wt_io, er_ary, dt)
+
+      if rd_res
+        rd_res.each{|io| rd_ret[rd_idx[io]] = io}
+        found = true
+      end
+      if wt_res
+        wt_res.each{|io| wt_ret[wt_idx[io]] = io}
+        found = true
+      end
+      if er_res
+        found = true
+      end
+      rd_mpi.each do |mp|
+        if mp.test_recv
+          rd_ret[rd_idx[mp]] = mp
+          found = true
+        end
+      end
+      if found
+        return [rd_ret.compact,wt_ret.compact,er_res]
+      end
+      if dt != max_dt
+        dt *= 2 if dt < max_dt
+        dt = max_dt if dt > max_dt
+      end
+    end
+  end
+
+end

data/lib/mpipe/version.rb

@@ -0,0 +1,3 @@
+class MPipe
+  VERSION = "0.3.0"
+end

data/mpipe.gemspec

@@ -1,24 +1,13 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
 # get version
-open("ext/mpipe/mpipe.c") do |f|
-  f.each_line do |l|
-    if /MPIPE_VERSION "([\d.]+)"/ =~ l
-      VERSION = $1
-      break
-    end
-  end
-end
+require_relative "lib/mpipe/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mpipe"
-  spec.version       = VERSION
+  spec.version       = MPipe::VERSION
   spec.authors       = ["Masahiro TANAKA"]
   spec.email         = ["masa16.tanaka@gmail.com"]
-  spec.description   = %q{MPipe - IO.pipe emulation over MPI.}
-  spec.summary       = %q{MPipe - IO.pipe emulation over MPI}
+  spec.description   = %q{MPipe - IO.pipe emulation using MPI.}
+  spec.summary       = %q{MPipe - IO.pipe emulation using MPI}
   spec.homepage      = "https://github.com/masa16/mpipe"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpipe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: MPipe - IO.pipe emulation over MPI.
+description: MPipe - IO.pipe emulation using MPI.
 email:
 - masa16.tanaka@gmail.com
 executables: []
@@ -52,6 +52,8 @@ files:
 - Rakefile
 - ext/mpipe/extconf.rb
 - ext/mpipe/mpipe.c
+- lib/mpipe.rb
+- lib/mpipe/version.rb
 - mpipe.gemspec
 - samples/t1.rb
 - samples/t2.rb
@@ -83,5 +85,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: MPipe - IO.pipe emulation over MPI
+summary: MPipe - IO.pipe emulation using MPI
 test_files: []