mpipe 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638f1385e64bf50aedff83fbdec7cf8de6f2e63b
-  data.tar.gz: e16b54cc652d0f6503cd4776bf716903fcaf2703
+  metadata.gz: e4f0bec53a0a6940093b513532384491708117c9
+  data.tar.gz: 9f15045ca9c5e95c21cb60903d95f3fb16191525
 SHA512:
-  metadata.gz: df234ecdd079cb9b24f7afb9c8c1f8ce585cd247f6286a4c49e8484b5b7296ec2445ffb3cf603d5a2ef69be8dd567b6c8a03905f6c0d3a96b793869c76e2839f
-  data.tar.gz: 5872d1e9ab4b7536d50d55a9cb778a9d43cc140b81e6bdaed70388b19af051956039e03554338ee11399a8f56af39c40c10a9130f0e2bdca67deb0acc9172d7a
+  metadata.gz: 50908b6ec00bc10bcef427998eb7f2941bbc1d6d2aadd33cb928e6a1aa37770bdf31663ca027fd8690ba259a4429d6f2336b3fa124e139c123ff4bb4c5ddcdd4
+  data.tar.gz: 3a06ab215c22444df2914fd583aeebb4aab9138ad68affb090c5949119a41063b006c5d76fdd7b82d5f5704fb7ba31236b0f3264cee41feb67ca66384f5c0e07

data/.gitignore

@@ -47,3 +47,4 @@ TAGS
 t.rb
 *.bak[0-9]
 bak
+ext/mpipe/Makefile

data/README.md

@@ -2,6 +2,17 @@
 
 Ruby's IO.pipe emulation over MPI
 
+[GitHub](https://github.com/masa16/mpipe) | [RubyGems](https://rubygems.org/gems/mpipe)
+
+## Requirement
+
+Message Passing Interface (MPI) framework such as 
+[OpenMPI](https://www.open-mpi.org/), [MPICH](https://www.mpich.org/), etc.
+
+Commands:
+* mpicc - Compiler for MPI programs.
+* mpirun - Command to run MPI program.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -66,11 +77,11 @@ MPipe::Comm.size -- calls MPI_Comm_size(), return the size of this environment.
 
 mp = MPipe.new(rank) -- returns pipe to MPI process with rank.
 mp.write(str) -- emulate IO#write.
-mp.read(maxlen,outbuf) -- emulate IO#read.
-mp.read_nonblock(maxlen,outbuf) -- emulate IO#read_nonblock.
+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
 ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/Masahiro TANAKA/mpipe.
+Bug reports and pull requests are welcome on GitHub at https://github.com/masa16/mpipe.

data/ext/mpipe/mpipe.c

@@ -3,7 +3,7 @@
 //#include "ruby/encoding.h"
 #include "mpi.h"
 
-#define MPIPE_VERSION "0.1.0"
+#define MPIPE_VERSION "0.2.0"
 
 static int mp_buffer_size = 4098;
 static int mp_initialized = 0;
@@ -207,7 +207,13 @@ mp_s_allocate(VALUE klass)
 static VALUE
 mp_init(struct MPipe *ptr, VALUE self, VALUE rank)
 {
+    int size;
+
+    MPI_Comm_size(MPI_COMM_WORLD, &size);
     ptr->rank = NUM2INT(rank);
+    if (ptr->rank < 0 || ptr->rank >= size) {
+        rb_raise(rb_eArgError,"Invalid rank has value %d but must be nonnegative and less than %d\n",ptr->rank,size);
+    }
     ptr->send_buffer = malloc(mp_buffer_size);
     ptr->recv_buffer = malloc(mp_buffer_size);
     return self;
@@ -345,79 +351,104 @@ mp_write(VALUE self, VALUE str)
 }
 
 
-
-static VALUE
-mp_outbuf(char *buf, int len, VALUE outbuf)
+static int
+copy_substr(struct MPipe *ptr, int max_len, VALUE outbuf, int outbuf_pos)
 {
-    if (NIL_P(outbuf)) {
-        return rb_str_new(buf, len);
-    } else {
-	rb_str_resize(outbuf, len);
-	MEMCPY(RSTRING_PTR(outbuf), buf, char, len);
-        return outbuf;
-    }
-}
-
-static VALUE
-mp_substr(struct MPipe *ptr, VALUE maxlen, VALUE outbuf)
-{
-    int max_len;
-    int count = ptr->recv_count;
+    int len;
     char *recv_buf = ptr->recv_buffer + ptr->recv_begin;
 
-    if (!NIL_P(maxlen)) {
-        max_len = NUM2INT(maxlen);
-        if (max_len < 0) {
-            rb_raise(rb_eArgError, "negative length %d given", max_len);
-        }
-        if (max_len < count) {
-            ptr->recv_begin += max_len;
-            ptr->recv_count -= max_len;
-            return mp_outbuf(recv_buf, max_len, outbuf);
-        }
+    len = max_len - outbuf_pos;
+    if (len < ptr->recv_count) {
+        ptr->recv_begin += len;
+        ptr->recv_count -= len;
+    } else {
+        len = ptr->recv_count;
+        ptr->recv_begin = 0;
+        ptr->recv_count = 0;
     }
-    ptr->recv_begin = 0;
-    ptr->recv_count = 0;
-    return mp_outbuf(recv_buf, count, outbuf);
+    MEMCPY(RSTRING_PTR(outbuf)+outbuf_pos, recv_buf, char, len);
+    return len;
 }
 
-
+/*
+ *  call-seq:
+ *     ios.read(length [, outbuf])    -> string, outbuf, or nil
+ *
+ *  Reads <i>length</i> bytes from the I/O stream.
+ *
+ *  <i>length</i> must be a non-negative integer.
+ */
 static VALUE
 mp_read(int argc, VALUE *argv, VALUE self)
 {
     struct MPipe *ptr = MPipe(self);
     MPI_Status status;
     int istat;
-    int count;
+    int outbuf_pos = 0;
+    int max_len;
     VALUE maxlen = Qnil;
     VALUE outbuf = Qnil;
 
-    rb_scan_args(argc, argv, "02", &maxlen, &outbuf);
+    rb_scan_args(argc, argv, "11", &maxlen, &outbuf);
+
+    max_len = NUM2INT(maxlen);
+    if (max_len < 0) {
+        rb_raise(rb_eArgError, "negative length %d given", max_len);
+    }
+
+    if (NIL_P(outbuf)) {
+        outbuf = rb_str_new(0, 0);
+    }
+    rb_str_resize(outbuf, max_len);
+
+    if (ptr->recv_count == -1) { // requesting
+        istat = MPI_Wait(&ptr->recv_request, &status);
+        if (istat != MPI_SUCCESS) {
+            rb_raise(rb_eStandardError,"MPI_Wait failed with status=%d",istat);
+        }
+        MPI_Get_count(&status, MPI_CHAR, &ptr->recv_count);
+    }
 
     if (ptr->recv_count > 0) {
-        return mp_substr(ptr, maxlen, outbuf);
+        outbuf_pos += copy_substr(ptr, max_len, outbuf, outbuf_pos);
     }
-    if (ptr->recv_count == 0) {
+
+    while (outbuf_pos < max_len) {
         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);
         }
-    } else { // requesting
-        istat = MPI_Wait(&ptr->recv_request, &status);
-        if (istat != MPI_SUCCESS) {
-            rb_raise(rb_eStandardError,"MPI_Wait failed with status=%d",istat);
-        }
+        MPI_Get_count(&status, MPI_CHAR, &ptr->recv_count);
+
+        outbuf_pos += copy_substr(ptr, max_len, outbuf, outbuf_pos);
     }
-    MPI_Get_count(&status, MPI_CHAR, &count);
-    ptr->recv_count = count;
-    return mp_substr(ptr, maxlen, outbuf);
+
+    return outbuf;
 }
 
 
+static int
+call_test(struct MPipe *ptr)
+{
+    MPI_Status status;
+    int complete = 0;
+    int istat;
+
+    // if (ptr->recv_count == -1)
+    istat = MPI_Test(&ptr->recv_request, &complete, &status);
+    if (istat != MPI_SUCCESS) {
+        rb_raise(rb_eStandardError,"MPI_Test failed with status=%d",istat);
+    }
+    if (complete) {
+        MPI_Get_count(&status, MPI_CHAR, &ptr->recv_count);
+        return ptr->recv_count;
+    }
+    return 0;
+}
 
 static void
-request_irecv(struct MPipe *ptr)
+call_irecv(struct MPipe *ptr)
 {
     int istat;
 
@@ -439,7 +470,7 @@ buffered: recv_count=n
 
 /*
  * call-seq:
- *   mpipe.read_nonblock(integer[, outbuf [, opts]])    -> string
+ *   mpipe.read_nonblock(maxlen[, outbuf [, opts]])    -> string
  *
  * Similar to #read, but raises +EOFError+ at end of string unless the
  * +exception: false+ option is passed in.
@@ -448,40 +479,60 @@ static VALUE
 mp_read_nonblock(int argc, VALUE *argv, VALUE self)
 {
     struct MPipe *ptr = MPipe(self);
-    MPI_Status status;
-    int istat;
-    int count;
-    int complete = 0;
+    int outbuf_pos = 0;
+    int max_len;
     VALUE maxlen = Qnil;
     VALUE outbuf = Qnil;
     VALUE opts = Qnil;
-    VALUE val;
 
-    rb_scan_args(argc, argv, "02:", &maxlen, &outbuf, &opts);
+    rb_scan_args(argc, argv, "11:", &maxlen, &outbuf, &opts);
 
-    if (ptr->recv_count > 0) {
-        return mp_substr(ptr, maxlen, outbuf);
+    max_len = NUM2INT(maxlen);
+    if (max_len < 0) {
+        rb_raise(rb_eArgError, "negative length %d given", max_len);
     }
-    request_irecv(ptr);
-    istat = MPI_Test(&ptr->recv_request, &complete, &status);
-    if (istat != MPI_SUCCESS) {
-        rb_raise(rb_eStandardError,"MPI_Test failed with status=%d",istat);
+
+    if (NIL_P(outbuf)) {
+        outbuf = rb_str_new(0, 0);
     }
-    if (complete) {
-        MPI_Get_count(&status, MPI_CHAR, &count);
-        ptr->recv_count = count;
-        val = mp_substr(ptr, maxlen, outbuf);
-    } else {
-	if (!NIL_P(opts) &&
-            rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse) {
-	    return Qnil;
-        } else {
-            rb_raise(eEAGAINWaitReadable,"MPI_Irecv would block");
+    rb_str_resize(outbuf, max_len);
+
+    if (maxlen == 0) {
+        return outbuf;
+    }
+
+    if (ptr->recv_count == -1) { // requesting
+        if (call_test(ptr) == 0) {
+            if (!NIL_P(opts) && rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse) {
+                return Qnil;
+            } else {
+                rb_raise(eEAGAINWaitReadable,"MPI_Irecv would block");
+            }
+        }
+    }
+    if (ptr->recv_count > 0) {
+        outbuf_pos += copy_substr(ptr, max_len, outbuf, outbuf_pos);
+    }
+
+    while (outbuf_pos < max_len) {
+        call_irecv(ptr);
+        if (call_test(ptr) == 0) {
+            if (outbuf_pos > 0) {
+                rb_str_resize(outbuf, outbuf_pos);
+                return outbuf;
+            } else
+            if (!NIL_P(opts) && rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse) {
+                return Qnil;
+            } else {
+                rb_raise(eEAGAINWaitReadable,"MPI_Irecv would block");
+            }
         }
+        outbuf_pos += copy_substr(ptr, max_len, outbuf, outbuf_pos);
     }
-    return val;
+    return outbuf;
 }
 
+
 static VALUE
 mp_s_select(int argc, VALUE *argv, VALUE mod)
 {
@@ -519,7 +570,7 @@ mp_s_select(int argc, VALUE *argv, VALUE mod)
     for (i=0; i < incount; i++) {
         item = RARRAY_AREF(argv[0], i);
         ptr = MPipe(item);
-        request_irecv(ptr);
+        call_irecv(ptr);
         ary_of_requests[i] = ptr->recv_request;
     }
 

data/samples/t1.rb

@@ -1,21 +1,21 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
-puts "buffer_size = %d" % MPipe.buffer_size
 MPipe.buffer_size = 2**10
-puts "buffer_size = %d" % MPipe.buffer_size
 
 MPipe.init
 rank = MPipe::Comm.rank
 size = MPipe::Comm.size
 puts "size=%d rank=%d pid=%d" % [size, rank, Process.pid]
 
-# MPipe.buffer_size = 2**13
 p MPipe.new(0).object_id == MPipe.new(0).object_id
 
 if rank == 0
 
+  puts "buffer_size = %d" % MPipe.buffer_size
+
+  len = "Hello from 0".size
   (1..size-1).each do |i|
-    p MPipe.new(i).read
+    p MPipe.new(i).read(len)
   end
 
 else

data/samples/t2.rb

@@ -1,4 +1,4 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
 MPipe.init
 
@@ -14,7 +14,7 @@ if rank == 0
   while !pipes.empty?
     rsel, = MPipe.select(pipes)
     rsel.each do |r|
-      p s=r.read_nonblock
+      p s=r.read_nonblock(12, exception:false)
       if /end/ =~ s
         pipes.delete(r)
       end
@@ -23,9 +23,11 @@ if rank == 0
 
 else
 
+  mp = MPipe.new(0)
   sleep size-rank
-  message = "Hello from #{rank}"
-  MPipe.new(0).write(message)
-  MPipe.new(0).write("end")
+  mp.write("Hello from #{rank}")
+  mp.write("end")
 
 end
+
+MPipe.finalize

data/samples/t3.rb

@@ -1,4 +1,4 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
 puts "buffer_size = %d" % MPipe.buffer_size
 MPipe.buffer_size = 2**13

data/samples/t4.rb

@@ -1,12 +1,12 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
 MPipe.init
 rank = MPipe::Comm.rank
 size = MPipe::Comm.size
 puts "size=%d rank=%d pid=%d" % [size,rank,Process.pid]
 
-def _read(io)
-  io.read_nonblock
+def _read(io,n)
+  io.read_nonblock(n)
 rescue IO::WaitReadable
   MPipe.select([io])
   retry
@@ -17,9 +17,8 @@ if rank == 0
   pipes = (1..size-1).map{|rank| MPipe.new(rank)}
 
   pipes.each do |x|
-    while !(s = _read(x))
+    while !(s = _read(x,12))
       puts "waiting"
-      $stdout.flush
     end
     p s
   end

data/samples/t5.rb

@@ -1,4 +1,4 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
 MPipe.init
 rank = MPipe::Comm.rank
@@ -14,7 +14,7 @@ if rank == 0
     rsel, = MPipe.select(pipes)
     rsel.each do |r|
       #p r.read_nonblock(6,"")
-      p s = r.read_nonblock()
+      p s = r.read_nonblock(74,exception:false)
       pipes.delete(r) if /end/ =~ s
     end
   end
@@ -22,7 +22,7 @@ if rank == 0
 else
 
   sleep size-rank
-  message = "Hello from #{rank} - "*500+"end"
-  MPipe.new(0).write_nonblock(message)
+  message = "Hello from #{rank} - "*500+"hello end"
+  MPipe.new(0).write(message)
 
 end

data/samples/t6.rb

@@ -1,4 +1,4 @@
-require_relative "../ext/mpipe"
+require "mpipe"
 
 MPipe.init
 rank = MPipe::Comm.rank
@@ -11,7 +11,7 @@ if rank == 0
 
   pipes.each do |r|
     p r.read(6,"")
-    p r.read
+    p r.read(6)
   end
 
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpipe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler