cumo 0.5.0 → 0.5.2

data/ext/cumo/narray/gen/tmpl/poly.c

@@ -18,10 +18,10 @@ static void
 }
 
 /*
-  Polynomial.: a0 + a1*x + a2*x**2 + a3*x**3 + ... + an*x**n
-  @overload <%=name%> a0, a1, ...
-  @param [Cumo::NArray,Numeric] a0
-  @param [Cumo::NArray,Numeric] a1 , ...
+  Calculate polynomial.
+    `x.poly(a0,a1,a2,...,an) = a0 + a1*x + a2*x**2 + ... + an*x**n`
+  @overload <%=name%> a0, a1, ..., an
+  @param [Cumo::NArray,Numeric] a0,a1,...,an
   @return [Cumo::<%=class_name%>]
 */
 static VALUE

data/ext/cumo/narray/gen/tmpl/rand.c

@@ -115,14 +115,16 @@ static void
   @return [Cumo::<%=class_name%>] self.
   @example
     Cumo::DFloat.new(6).rand
-    => Cumo::DFloat#shape=[6]
-       [0.0617545, 0.373067, 0.794815, 0.201042, 0.116041, 0.344032]
+    # => Cumo::DFloat#shape=[6]
+    #    [0.0617545, 0.373067, 0.794815, 0.201042, 0.116041, 0.344032]
+
     Cumo::DComplex.new(6).rand(5+5i)
-    => Cumo::DComplex#shape=[6]
-       [2.69974+3.68908i, 0.825443+0.254414i, 0.540323+0.34354i, 4.52061+2.39322i, ...]
+    # => Cumo::DComplex#shape=[6]
+    #    [2.69974+3.68908i, 0.825443+0.254414i, 0.540323+0.34354i, 4.52061+2.39322i, ...]
+
     Cumo::Int32.new(6).rand(2,5)
-    => Cumo::Int32#shape=[6]
-       [4, 3, 3, 2, 4, 2]
+    # => Cumo::Int32#shape=[6]
+    #    [4, 3, 3, 2, 4, 2]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *args, VALUE self)

data/ext/cumo/narray/gen/tmpl/rand_norm.c

@@ -77,24 +77,26 @@ static void
   @return [Cumo::<%=class_name%>] self.
   @example
     Cumo::DFloat.new(5,5).rand_norm
-    => Cumo::DFloat#shape=[5,5]
-       [[-0.581255, -0.168354, 0.586895, -0.595142, -0.802802],
-        [-0.326106, 0.282922, 1.68427, 0.918499, -0.0485384],
-        [-0.464453, -0.992194, 0.413794, -0.60717, -0.699695],
-        [-1.64168, 0.48676, -0.875871, -1.43275, 0.812172],
-        [-0.209975, -0.103612, -0.878617, -1.42495, 1.0968]]
+    # => Cumo::DFloat#shape=[5,5]
+    #    [[-0.581255, -0.168354, 0.586895, -0.595142, -0.802802],
+    #     [-0.326106, 0.282922, 1.68427, 0.918499, -0.0485384],
+    #     [-0.464453, -0.992194, 0.413794, -0.60717, -0.699695],
+    #     [-1.64168, 0.48676, -0.875871, -1.43275, 0.812172],
+    #     [-0.209975, -0.103612, -0.878617, -1.42495, 1.0968]]
+
     Cumo::DFloat.new(5,5).rand_norm(10,0.1)
-    => Cumo::DFloat#shape=[5,5]
-       [[9.9019, 9.90339, 10.0826, 9.98384, 9.72861],
-        [9.81507, 10.0272, 9.91445, 10.0568, 9.88923],
-        [10.0234, 9.97874, 9.96011, 9.9006, 9.99964],
-        [10.0186, 9.94598, 9.92236, 9.99811, 9.97003],
-        [9.79266, 9.95044, 9.95212, 9.93692, 10.2027]]
+    # => Cumo::DFloat#shape=[5,5]
+    #    [[9.9019, 9.90339, 10.0826, 9.98384, 9.72861],
+    #     [9.81507, 10.0272, 9.91445, 10.0568, 9.88923],
+    #     [10.0234, 9.97874, 9.96011, 9.9006, 9.99964],
+    #     [10.0186, 9.94598, 9.92236, 9.99811, 9.97003],
+    #     [9.79266, 9.95044, 9.95212, 9.93692, 10.2027]]
+
     Cumo::DComplex.new(3,3).rand_norm(5+5i)
-    => Cumo::DComplex#shape=[3,3]
-       [[5.84303+4.40052i, 4.00984+6.08982i, 5.10979+5.13215i],
-        [4.26477+3.99655i, 4.90052+5.00763i, 4.46607+2.3444i],
-        [4.5528+7.11003i, 5.62117+6.69094i, 5.05443+5.35133i]]
+    # => Cumo::DComplex#shape=[3,3]
+    #    [[5.84303+4.40052i, 4.00984+6.08982i, 5.10979+5.13215i],
+    #     [4.26477+3.99655i, 4.90052+5.00763i, 4.46607+2.3444i],
+    #     [4.5528+7.11003i, 5.62117+6.69094i, 5.05443+5.35133i]]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *args, VALUE self)

data/ext/cumo/narray/gen/tmpl/seq.c

@@ -80,11 +80,12 @@ static void
   @return [Cumo::<%=class_name%>] self.
   @example
     Cumo::DFloat.new(6).seq(1,-0.2)
-    => Cumo::DFloat#shape=[6]
-       [1, 0.8, 0.6, 0.4, 0.2, 0]
+    # => Cumo::DFloat#shape=[6]
+    #    [1, 0.8, 0.6, 0.4, 0.2, 0]
+
     Cumo::DComplex.new(6).seq(1,-0.2+0.2i)
-    => Cumo::DComplex#shape=[6]
-       [1+0i, 0.8+0.2i, 0.6+0.4i, 0.4+0.6i, 0.2+0.8i, 0+1i]
+    # => Cumo::DComplex#shape=[6]
+    #    [1+0i, 0.8+0.2i, 0.6+0.4i, 0.4+0.6i, 0.2+0.8i, 0+1i]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *args, VALUE self)

data/ext/cumo/narray/gen/tmpl/sort.c

@@ -22,10 +22,10 @@ static void
 <% else %>
   @overload <%=name%>(axis:nil)
 <% end %>
-  @param [Numeric,Array,Range] axis  Affected dimensions.
+  @param [Numeric,Array,Range] axis  Performs <%=name%> along the axis.
   @return [Cumo::<%=class_name%>] returns result of <%=name%>.
   @example
-      Cumo::DFloat[3,4,1,2].sort => Cumo::DFloat[1,2,3,4]
+      Cumo::DFloat[3,4,1,2].sort # => Cumo::DFloat[1,2,3,4]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

data/ext/cumo/narray/gen/tmpl/sort_index.c

@@ -52,10 +52,10 @@ static void
 <% else %>
   @overload <%=name%>(axis:nil)
 <% end %>
-  @param [Numeric,Array,Range] axis  Affected dimensions.
+  @param [Numeric,Array,Range] axis  Performs <%=name%> along the axis.
   @return [Integer,Cumo::Int] returns result index of <%=name%>.
   @example
-      Cumo::NArray[3,4,1,2].sort_index => Cumo::Int32[2,3,0,1]
+      Cumo::NArray[3,4,1,2].sort_index # => Cumo::Int32[2,3,0,1]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

data/ext/cumo/narray/gen/tmpl_bit/allocate.c

@@ -12,6 +12,7 @@ static VALUE
         if (na->size > 0 && ptr == NULL) {
             ptr = cumo_cuda_runtime_malloc(((na->size-1)/8/sizeof(CUMO_BIT_DIGIT)+1)*sizeof(CUMO_BIT_DIGIT));
             CUMO_NA_DATA_PTR(na) = ptr;
+            CUMO_NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case CUMO_NARRAY_VIEW_T:

data/ext/cumo/narray/gen/tmpl_bit/aref.c

@@ -2,42 +2,36 @@ static VALUE
 <%=c_func(-1)%>_cpu(int argc, VALUE *argv, VALUE self);
 
 /*
-  Array element referenece or slice view.
+  Array indexing.
   @overload [](dim0,...,dimL)
-  @param [Numeric,Range,etc] dim0,...,dimL  Multi-dimensional Index.
-  @return [Numeric,NArray::<%=class_name%>] Element object or NArray view.
+  @param [Numeric,Range,Array,Cumo::Bit,Cumo::Int32,Cumo::Int64] dim0,...,dimL  Multi-dimensional Index.
+  @return [Cumo::Bit,Numeric] Element value or NArray view.
 
-  --- Returns the element at +dim0+, +dim1+, ... are Numeric indices
-  for each dimension, or returns a NArray View as a sliced subarray if
-  +dim0+, +dim1+, ... includes other than Numeric index, e.g., Range
-  or Array or true.
+  --- Returns an element at `dim0`, `dim1`, ... are Numeric indices for each dimension, or returns a NArray View as a sliced array if `dim0`, `dim1`, ... includes other than Numeric index, e.g., Range or Array or true.
+
+  @see #[]=
 
   @example
-      a = Cumo::DFloat.new(4,5).seq
-      => Cumo::DFloat#shape=[4,5]
-      [[0, 1, 2, 3, 4],
-       [5, 6, 7, 8, 9],
-       [10, 11, 12, 13, 14],
-       [15, 16, 17, 18, 19]]
-
-      a[1,1]
-      => 6.0
-
-      a[1..3,1]
-      => Cumo::DFloat#shape=[3]
-      [6, 11, 16]
-
-      a[1,[1,3,4]]
-      => Cumo::DFloat#shape=[3]
-      [6, 8, 9]
-
-      a[true,2].fill(99)
-      a
-      => Cumo::DFloat#shape=[4,5]
-      [[0, 1, 99, 3, 4],
-       [5, 6, 99, 8, 9],
-       [10, 11, 99, 13, 14],
-       [15, 16, 99, 18, 19]]
+      a = Cumo::Int32.new(3,4).seq
+      # => Cumo::Int32#shape=[3,4]
+      # [[0, 1, 2, 3],
+      #  [4, 5, 6, 7],
+      #  [8, 9, 10, 11]]
+
+      b = (a%2).eq(0)
+      # => Cumo::Bit#shape=[3,4]
+      # [[1, 0, 1, 0],
+      #  [1, 0, 1, 0],
+      #  [1, 0, 1, 0]]
+
+      b[true,(0..-1)%2]
+      # => Cumo::Bit(view)#shape=[3,2]
+      # [[1, 1],
+      #  [1, 1],
+      #  [1, 1]]
+
+      b[1,1]
+      # => 0
  */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

data/ext/cumo/narray/gen/tmpl_bit/aset.c

@@ -1,41 +1,29 @@
 /*
-  Array element(s) set.
+  Array element(s) assignment.
   @overload []=(dim0,..,dimL,val)
-  @param [Numeric,Range,etc] dim0,..,dimL  Multi-dimensional Index.
+  @param [Numeric,Range,Array,Cumo::Bit,Cumo::Int32,Cumo::Int64] dim0,..,dimL  Multi-dimensional Index.
   @param [Numeric,Cumo::NArray,etc] val  Value(s) to be set to self.
-  @return [Numeric] returns val (last argument).
+  @return [Numeric] returns `val` (last argument).
 
-  --- Replace element(s) at +dim0+, +dim1+, ... (index/range/array/true
-  for each dimention). Broadcasting mechanism is applied.
+  Replaces element(s) at `dim0`, `dim1`, ... . Broadcasting mechanism is applied.
 
-  @example
-      a = Cumo::DFloat.new(3,4).seq
-      => Cumo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [4, 5, 6, 7],
-       [8, 9, 10, 11]]
-
-      a[1,2]=99
-      a
-      => Cumo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [4, 5, 99, 7],
-       [8, 9, 10, 11]]
+  @see #[]
 
-      a[1,[0,2]] = [101,102]
-      a
-      => Cumo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [101, 5, 102, 7],
-       [8, 9, 10, 11]]
+  @example
+      a = Cumo::Bit.new(4,5).fill(0)
+      # => Cumo::Bit#shape=[4,5]
+      # [[0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0]]
 
-      a[1,true]=99
+      a[(0..-1)%2,(1..-1)%2] = 1
       a
-      => Cumo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [99, 99, 99, 99],
-       [8, 9, 10, 11]]
-
+      # => Cumo::Bit#shape=[4,5]
+      # [[0, 1, 0, 1, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 1, 0, 1, 0],
+      #  [0, 0, 0, 0, 0]]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

data/ext/cumo/narray/index.c

@@ -799,7 +799,7 @@ VALUE cumo_na_aref_md_protected(VALUE data_value)
     int keep_dim = data->keep_dim;
     int at_mode = data->at_mode;
 
-    int ndim_new;
+    size_t ndim_new;
     VALUE view;
     cumo_narray_view_t *na2;
     ssize_t elmsz;

data/ext/cumo/narray/narray.c

@@ -34,6 +34,7 @@ static ID cumo_id_count_false_cpu;
 static ID cumo_id_axis;
 static ID cumo_id_nan;
 static ID cumo_id_keepdims;
+static ID cumo_id_source;
 
 VALUE cumo_sym_reduce;
 VALUE cumo_sym_option;
@@ -324,19 +325,19 @@ cumo_na_setup(VALUE self, int ndim, size_t *shape)
 
   @example
     i = Cumo::Int64.new([2,4,3])
-    #=> Cumo::Int64#shape=[2,4,3](empty)
+    # => Cumo::Int64#shape=[2,4,3](empty)
 
     f = Cumo::DFloat.new(3,4)
-    #=> Cumo::DFloat#shape=[3,4](empty)
+    # => Cumo::DFloat#shape=[3,4](empty)
 
     f.fill(2)
-    #=> Cumo::DFloat#shape=[3,4]
+    # => Cumo::DFloat#shape=[3,4]
     # [[2, 2, 2, 2],
     #  [2, 2, 2, 2],
     #  [2, 2, 2, 2]]
 
     x = Cumo::NArray.new(5)
-    #=> in `new': allocator undefined for Cumo::NArray (TypeError)
+    # => in `new': allocator undefined for Cumo::NArray (TypeError)
     #   	from t.rb:9:in `<main>'
 
 */
@@ -420,10 +421,10 @@ cumo_na_initialize_copy(VALUE self, VALUE orig)
  *  but for typed NArray subclasses, e.g., DFloat, Int64.
  *  @example
  *    a = Cumo::DFloat.zeros(3,5)
- *    => Cumo::DFloat#shape=[3,5]
- *    [[0, 0, 0, 0, 0],
- *     [0, 0, 0, 0, 0],
- *     [0, 0, 0, 0, 0]]
+ *    # => Cumo::DFloat#shape=[3,5]
+ *    # [[0, 0, 0, 0, 0],
+ *    #  [0, 0, 0, 0, 0],
+ *    #  [0, 0, 0, 0, 0]]
  */
 static VALUE
 cumo_na_s_zeros(int argc, VALUE *argv, VALUE klass)
@@ -471,8 +472,8 @@ cumo_na_s_ones(int argc, VALUE *argv, VALUE klass)
 
   @example
     a = Cumo::DFloat.linspace(-5,5,7)
-    => Cumo::DFloat#shape=[7]
-    [-5, -3.33333, -1.66667, 0, 1.66667, 3.33333, 5]
+    # => Cumo::DFloat#shape=[7]
+    # [-5, -3.33333, -1.66667, 0, 1.66667, 3.33333, 5]
  */
 static VALUE
 cumo_na_s_linspace(int argc, VALUE *argv, VALUE klass)
@@ -510,11 +511,12 @@ cumo_na_s_linspace(int argc, VALUE *argv, VALUE klass)
 
   @example
     Cumo::DFloat.logspace(4,0,5,2)
-    => Cumo::DFloat#shape=[5]
-       [16, 8, 4, 2, 1]
+    # => Cumo::DFloat#shape=[5]
+    #    [16, 8, 4, 2, 1]
+
     Cumo::DComplex.logspace(0,1i*Math::PI,5,Math::E)
-    => Cumo::DComplex#shape=[5]
-       [1+4.44659e-323i, 0.707107+0.707107i, 6.12323e-17+1i, -0.707107+0.707107i, ...]
+    # => Cumo::DComplex#shape=[5]
+    #    [1+4.44659e-323i, 0.707107+0.707107i, 6.12323e-17+1i, -0.707107+0.707107i, ...]
  */
 static VALUE
 cumo_na_s_logspace(int argc, VALUE *argv, VALUE klass)
@@ -548,10 +550,10 @@ cumo_na_s_logspace(int argc, VALUE *argv, VALUE klass)
   @return [Cumo::NArray]  created NArray.
   @example
     a = Cumo::DFloat.eye(3)
-    => Cumo::DFloat#shape=[3,3]
-    [[1, 0, 0],
-     [0, 1, 0],
-     [0, 0, 1]]
+    # => Cumo::DFloat#shape=[3,3]
+    # [[1, 0, 0],
+    #  [0, 1, 0],
+    #  [0, 0, 1]]
 */
 static VALUE
 cumo_na_s_eye(int argc, VALUE *argv, VALUE klass)
@@ -576,6 +578,87 @@ cumo_na_s_eye(int argc, VALUE *argv, VALUE klass)
 #define READ 1
 #define WRITE 2
 
+static void
+cumo_na_set_pointer(VALUE self, char *ptr, size_t byte_size)
+{
+    VALUE obj;
+    cumo_narray_t *na;
+
+    if (OBJ_FROZEN(self)) {
+        rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+    }
+
+    CumoGetNArray(self,na);
+
+    switch(CUMO_NA_TYPE(na)) {
+    case CUMO_NARRAY_DATA_T:
+        if (CUMO_NA_SIZE(na) > 0) {
+            if (CUMO_NA_DATA_PTR(na) != NULL && CUMO_NA_DATA_OWNED(na)) {
+                xfree(CUMO_NA_DATA_PTR(na));
+            }
+            CUMO_NA_DATA_PTR(na) = ptr;
+            CUMO_NA_DATA_OWNED(na) = FALSE;
+        }
+        return;
+    case CUMO_NARRAY_VIEW_T:
+        obj = CUMO_NA_VIEW_DATA(na);
+        if (OBJ_FROZEN(obj)) {
+            rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+        }
+        CumoGetNArray(obj,na);
+        switch(CUMO_NA_TYPE(na)) {
+        case CUMO_NARRAY_DATA_T:
+            if (CUMO_NA_SIZE(na) > 0) {
+                if (CUMO_NA_DATA_PTR(na) != NULL && CUMO_NA_DATA_OWNED(na)) {
+                    xfree(CUMO_NA_DATA_PTR(na));
+                }
+                CUMO_NA_DATA_PTR(na) = ptr;
+                CUMO_NA_DATA_OWNED(na) = FALSE;
+            }
+            return;
+        default:
+            rb_raise(rb_eRuntimeError,"invalid NA_TYPE of view: %d",CUMO_NA_TYPE(na));
+        }
+    default:
+        rb_raise(rb_eRuntimeError,"invalid NA_TYPE: %d",CUMO_NA_TYPE(na));
+    }
+}
+
+static void
+cumo_na_pointer_copy_on_write(VALUE self)
+{
+    cumo_narray_t *na;
+    void *ptr;
+    VALUE velmsz;
+    size_t byte_size;
+
+    CumoGetNArray(self,na);
+    if (CUMO_NA_TYPE(na) == CUMO_NARRAY_VIEW_T) {
+        self = CUMO_NA_VIEW_DATA(na);
+        CumoGetNArray(self,na);
+    }
+
+    ptr = CUMO_NA_DATA_PTR(na);
+    if (ptr == NULL) {
+        return;
+    }
+
+    if (CUMO_NA_DATA_OWNED(na)) {
+        return;
+    }
+
+    velmsz = rb_const_get(rb_obj_class(self), cumo_id_element_byte_size);
+    if (FIXNUM_P(velmsz)) {
+        byte_size = CUMO_NA_SIZE(na) * NUM2SIZET(velmsz);
+    } else {
+        byte_size = ceil(CUMO_NA_SIZE(na) * NUM2DBL(velmsz));
+    }
+    CUMO_NA_DATA_PTR(na) = NULL;
+    rb_funcall(self, cumo_id_allocate, 0);
+    memcpy(CUMO_NA_DATA_PTR(na), ptr, byte_size);
+    rb_ivar_set(self, cumo_id_source, Qnil);
+}
+
 static char *
 cumo_na_get_pointer_for_rw(VALUE self, int flag)
 {
@@ -591,6 +674,9 @@ cumo_na_get_pointer_for_rw(VALUE self, int flag)
 
     switch(CUMO_NA_TYPE(na)) {
     case CUMO_NARRAY_DATA_T:
+        if (flag & WRITE) {
+            cumo_na_pointer_copy_on_write(self);
+        }
         ptr = CUMO_NA_DATA_PTR(na);
         if (CUMO_NA_SIZE(na) > 0 && ptr == NULL) {
             if (flag & READ) {
@@ -607,6 +693,9 @@ cumo_na_get_pointer_for_rw(VALUE self, int flag)
         if ((flag & WRITE) && OBJ_FROZEN(obj)) {
             rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
         }
+        if (flag & WRITE) {
+            cumo_na_pointer_copy_on_write(self);
+        }
         CumoGetNArray(obj,na);
         switch(CUMO_NA_TYPE(na)) {
         case CUMO_NARRAY_DATA_T:
@@ -1312,7 +1401,6 @@ static VALUE
 cumo_na_store_binary(int argc, VALUE *argv, VALUE self)
 {
     size_t size, str_len, byte_size, offset;
-    char *ptr;
     int   narg;
     VALUE vstr, voffset;
     VALUE velmsz;
@@ -1342,8 +1430,13 @@ cumo_na_store_binary(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "string is too short to store");
     }
 
-    ptr = cumo_na_get_pointer_for_write(self);
-    memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    if (OBJ_FROZEN(vstr)) {
+        cumo_na_set_pointer(self, RSTRING_PTR(vstr)+offset, byte_size);
+        rb_ivar_set(self, cumo_id_source, vstr);
+    } else {
+        void *ptr = cumo_na_get_pointer_for_write(self);
+        memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    }
 
     return SIZET2NUM(byte_size);
 }
@@ -1455,6 +1548,7 @@ cumo_na_marshal_load(VALUE self, VALUE a)
         ptr = cumo_na_get_pointer_for_write(self);
         memcpy(ptr, RARRAY_PTR(v), CUMO_NA_SIZE(na)*sizeof(VALUE));
     } else {
+        rb_str_freeze(v);
         cumo_na_store_binary(1,&v,self);
         if (CUMO_TEST_BYTE_SWAPPED(self)) {
             rb_funcall(cumo_na_inplace(self),cumo_id_to_host,0);
@@ -2022,6 +2116,7 @@ Init_cumo_narray()
     cumo_id_axis            = rb_intern("axis");
     cumo_id_nan             = rb_intern("nan");
     cumo_id_keepdims        = rb_intern("keepdims");
+    cumo_id_source          = rb_intern("source");
 
     cumo_sym_reduce   = ID2SYM(rb_intern("reduce"));
     cumo_sym_option   = ID2SYM(rb_intern("option"));