numo-narray 0.9.1.5 → 0.9.2.0

data/ext/numo/narray/gen/tmpl/accum_binary.c

@@ -94,7 +94,11 @@ static VALUE
         return <%=c_func%>_self(argc, argv, self);
     } else {
         v = rb_funcall(klass, id_cast, 1, self);
+        //<% if Gem::Version.create(RUBY_VERSION) < Gem::Version.create('2.7.0') %>
         return rb_funcall2(v, rb_intern("<%=name%>"), argc, argv);
+        //<% else %>
+        return rb_funcallv_kw(v, rb_intern("<%=name%>"), argc, argv, RB_PASS_CALLED_KEYWORDS);
+        //<% end %>
     }
     //<% end %>
 }

data/ext/numo/narray/gen/tmpl/alloc_func.c

@@ -29,7 +29,9 @@ static void
     assert(na->base.type == NARRAY_DATA_T);
 
     if (na->ptr != NULL) {
-        xfree(na->ptr);
+        if (na->owned) {
+            xfree(na->ptr);
+        }
         na->ptr = NULL;
     }
     if (na->base.size > 0) {
@@ -103,5 +105,6 @@ static VALUE
     na->base.shape = NULL;
     na->base.reduce = INT2FIX(0);
     na->ptr = NULL;
+    na->owned = FALSE;
     return TypedData_Wrap_Struct(klass, &<%=type_name%>_data_type, (void*)na);
 }

data/ext/numo/narray/gen/tmpl/allocate.c

@@ -20,6 +20,7 @@ static VALUE
             }
             <% end %>
             NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case NARRAY_VIEW_T:

data/ext/numo/narray/gen/tmpl/cast.c

@@ -35,6 +35,13 @@ static VALUE
         }
         return v;
     }
+    if (rb_respond_to(obj,id_to_a)) {
+        obj = rb_funcall(obj,id_to_a,0);
+        if (TYPE(obj)!=T_ARRAY) {
+            rb_raise(rb_eTypeError, "`to_a' did not return Array");
+        }
+        return <%=find_tmpl("cast_array").c_func%>(obj);
+    }
     <% if is_object %>
     return robject_new_dim0(obj);
     <% else %>

data/ext/numo/narray/gen/tmpl/lib.c

@@ -3,7 +3,7 @@
   Ruby/Numo::NArray - Numerical Array class for Ruby
 
   created on: 2017-03-11
-  Copyright (C) 2017-2019 Masahiro Tanaka
+  Copyright (C) 2017-2020 Masahiro Tanaka
 */
 
 #include <ruby.h>

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

@@ -12,6 +12,7 @@ static VALUE
         if (na->size > 0 && ptr == NULL) {
             ptr = xmalloc(((na->size-1)/8/sizeof(BIT_DIGIT)+1)*sizeof(BIT_DIGIT));
             NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case NARRAY_VIEW_T:

data/ext/numo/narray/gen/tmpl_bit/binary.c

@@ -21,6 +21,12 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a2 += p2/NB;
+        p2 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         o2 =  p2-p3;
         l1 =  NB+o1;

data/ext/numo/narray/gen/tmpl_bit/store_bit.c

@@ -2,7 +2,7 @@ static void
 <%=c_iter%>(na_loop_t *const lp)
 {
     size_t  n;
-    size_t  p1, p3;
+    ssize_t p1, p3;
     ssize_t s1, s3;
     size_t *idx1, *idx3;
     int     o1, l1, r1, len;
@@ -18,6 +18,10 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;
@@ -26,7 +30,7 @@ static void
             if ((int)n<len) len=n;
             if (o1>=0) x = *a1>>o1;
             else       x = *a1<<-o1;
-            if (p1+len>NB)  x |= *(a1+1)<<r1;
+            if (p1+len>(ssize_t)NB)  x |= *(a1+1)<<r1;
             a1++;
             *a3 = (x & (SLB(len)<<p3)) | (*a3 & ~(SLB(len)<<p3));
             a3++;

data/ext/numo/narray/gen/tmpl_bit/unary.c

@@ -20,6 +20,10 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, y);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;

data/ext/numo/narray/index.c

@@ -1,7 +1,7 @@
 /*
   index.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 //#define NARRAY_C
 
@@ -1050,11 +1050,8 @@ static VALUE na_slice(int argc, VALUE *argv, VALUE self)
       #  [10, 11, 99, 13, 14],
       #  [15, 16, 99, 18, 19]]
  */
-static VALUE na_aref(int argc, VALUE *argv, VALUE self)
-{
-    // implemented in subclasses
-    return rb_f_notimplement(argc,argv,self);
-}
+// implemented in subclasses
+#define na_aref rb_f_notimplement
 
 /*
   Multi-dimensional element assignment.
@@ -1094,11 +1091,8 @@ static VALUE na_aref(int argc, VALUE *argv, VALUE self)
       #  [8, 9, 10, 11]]
 
 */
-static VALUE na_aset(int argc, VALUE *argv, VALUE self)
-{
-    // implemented in subclasses
-    return rb_f_notimplement(argc,argv,self);
-}
+// implemented in subclasses
+#define na_aset rb_f_notimplement
 
 /*
   Multi-dimensional array indexing.

data/ext/numo/narray/math.c

@@ -1,7 +1,7 @@
 /*
   math.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #include <ruby.h>
 #include "numo/narray.h"

data/ext/numo/narray/narray.c

@@ -1,7 +1,7 @@
 /*
   narray.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #define NARRAY_C
 #include <ruby.h>
@@ -34,6 +34,7 @@ static ID id_count_false;
 static ID id_axis;
 static ID id_nan;
 static ID id_keepdims;
+static ID id_source;
 
 VALUE cPointer;
 
@@ -605,6 +606,87 @@ na_s_eye(int argc, VALUE *argv, VALUE klass)
 #define READ 1
 #define WRITE 2
 
+static void
+na_set_pointer(VALUE self, char *ptr, size_t byte_size)
+{
+    VALUE obj;
+    narray_t *na;
+
+    if (OBJ_FROZEN(self)) {
+        rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+    }
+
+    GetNArray(self,na);
+
+    switch(NA_TYPE(na)) {
+    case NARRAY_DATA_T:
+        if (NA_SIZE(na) > 0) {
+            if (NA_DATA_PTR(na) != NULL && NA_DATA_OWNED(na)) {
+                xfree(NA_DATA_PTR(na));
+            }
+            NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = FALSE;
+        }
+        return;
+    case NARRAY_VIEW_T:
+        obj = NA_VIEW_DATA(na);
+        if (OBJ_FROZEN(obj)) {
+            rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+        }
+        GetNArray(obj,na);
+        switch(NA_TYPE(na)) {
+        case NARRAY_DATA_T:
+            if (NA_SIZE(na) > 0) {
+                if (NA_DATA_PTR(na) != NULL && NA_DATA_OWNED(na)) {
+                    xfree(NA_DATA_PTR(na));
+                }
+                NA_DATA_PTR(na) = ptr;
+                NA_DATA_OWNED(na) = FALSE;
+            }
+            return;
+        default:
+            rb_raise(rb_eRuntimeError,"invalid NA_TYPE of view: %d",NA_TYPE(na));
+        }
+    default:
+        rb_raise(rb_eRuntimeError,"invalid NA_TYPE: %d",NA_TYPE(na));
+    }
+}
+
+static void
+na_pointer_copy_on_write(VALUE self)
+{
+    narray_t *na;
+    void *ptr;
+    VALUE velmsz;
+    size_t byte_size;
+
+    GetNArray(self,na);
+    if (NA_TYPE(na) == NARRAY_VIEW_T) {
+        self = NA_VIEW_DATA(na);
+        GetNArray(self,na);
+    }
+
+    ptr = NA_DATA_PTR(na);
+    if (ptr == NULL) {
+        return;
+    }
+
+    if (NA_DATA_OWNED(na)) {
+        return;
+    }
+
+    velmsz = rb_const_get(rb_obj_class(self), id_element_byte_size);
+    if (FIXNUM_P(velmsz)) {
+        byte_size = NA_SIZE(na) * NUM2SIZET(velmsz);
+    } else {
+        byte_size = ceil(NA_SIZE(na) * NUM2DBL(velmsz));
+    }
+    NA_DATA_PTR(na) = NULL;
+    rb_funcall(self, id_allocate, 0);
+    memcpy(NA_DATA_PTR(na), ptr, byte_size);
+    rb_ivar_set(self, id_source, Qnil);
+}
+
 static char *
 na_get_pointer_for_rw(VALUE self, int flag)
 {
@@ -620,6 +702,9 @@ na_get_pointer_for_rw(VALUE self, int flag)
 
     switch(NA_TYPE(na)) {
     case NARRAY_DATA_T:
+        if (flag & WRITE) {
+            na_pointer_copy_on_write(self);
+        }
         ptr = NA_DATA_PTR(na);
         if (NA_SIZE(na) > 0 && ptr == NULL) {
             if (flag & READ) {
@@ -636,6 +721,9 @@ 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) {
+            na_pointer_copy_on_write(self);
+        }
         GetNArray(obj,na);
         switch(NA_TYPE(na)) {
         case NARRAY_DATA_T:
@@ -1260,7 +1348,6 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
 {
     size_t len, str_len, byte_size;
     size_t *shape;
-    char *ptr;
     int   i, nd, narg;
     VALUE vstr, vshape, vna;
     VALUE velmsz;
@@ -1278,8 +1365,8 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
             break;
         case T_ARRAY:
             nd = RARRAY_LEN(vshape);
-            if (nd == 0 || nd > NA_MAX_DIMENSION) {
-                rb_raise(nary_eDimensionError,"too long or empty shape (%d)", nd);
+            if (nd > NA_MAX_DIMENSION) {
+              rb_raise(nary_eDimensionError,"shape exceeds max dimension");
             }
             shape = ALLOCA_N(size_t,nd);
             len = 1;
@@ -1315,9 +1402,13 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
     }
 
     vna = nary_new(type, nd, shape);
-    ptr = na_get_pointer_for_write(vna);
-
-    memcpy(ptr, RSTRING_PTR(vstr), byte_size);
+    if (OBJ_FROZEN(vstr)) {
+        na_set_pointer(vna, RSTRING_PTR(vstr), byte_size);
+        rb_ivar_set(vna, id_source, vstr);
+    } else {
+        void *ptr = na_get_pointer_for_write(vna);
+        memcpy(ptr, RSTRING_PTR(vstr), byte_size);
+    }
 
     return vna;
 }
@@ -1333,7 +1424,6 @@ static VALUE
 nary_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;
@@ -1363,8 +1453,13 @@ nary_store_binary(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "string is too short to store");
     }
 
-    ptr = na_get_pointer_for_write(self);
-    memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    if (OBJ_FROZEN(vstr)) {
+        na_set_pointer(self, RSTRING_PTR(vstr)+offset, byte_size);
+        rb_ivar_set(self, id_source, vstr);
+    } else {
+        void *ptr = na_get_pointer_for_write(self);
+        memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    }
 
     return SIZET2NUM(byte_size);
 }
@@ -1436,7 +1531,7 @@ static VALUE na_inplace( VALUE self );
 /*
   Load marshal data.
   @overload marshal_load(data)
-  @params [Array] Array containing marshal data.
+  @param [Array] Array containing marshal data.
   @return [nil]
  */
 static VALUE
@@ -1470,6 +1565,7 @@ nary_marshal_load(VALUE self, VALUE a)
         ptr = na_get_pointer_for_write(self);
         memcpy(ptr, RARRAY_PTR(v), NA_SIZE(na)*sizeof(VALUE));
     } else {
+        rb_str_freeze(v);
         nary_store_binary(1,&v,self);
         if (TEST_BYTE_SWAPPED(self)) {
             rb_funcall(na_inplace(self),id_to_host,0);
@@ -2009,6 +2105,7 @@ Init_narray()
     id_axis        = rb_intern("axis");
     id_nan         = rb_intern("nan");
     id_keepdims    = rb_intern("keepdims");
+    id_source      = rb_intern("source");
 
     sym_reduce   = ID2SYM(rb_intern("reduce"));
     sym_option   = ID2SYM(rb_intern("option"));

data/ext/numo/narray/ndloop.c

@@ -1,7 +1,7 @@
 /*
   ndloop.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 
 #include <ruby.h>
@@ -164,7 +164,7 @@ print_ndloop(na_md_loop_t *lp) {
             for (i=0; i<lp->user.ndim; i++) {
                 printf(" &user.args[%d].iter[%d] = 0x%"SZF"x\n", j,i, (size_t)&lp->user.args[j].iter[i]);
                 printf("  user.args[%d].iter[%d].pos = %"SZF"u\n", j,i, lp->user.args[j].iter[i].pos);
-                printf("  user.args[%d].iter[%d].step = %"SZF"u\n", j,i, lp->user.args[j].iter[i].step);
+                printf("  user.args[%d].iter[%d].step = %"SZF"d\n", j,i, lp->user.args[j].iter[i].step);
                 printf("  user.args[%d].iter[%d].idx = 0x%"SZF"x\n", j,i, (size_t)lp->user.args[j].iter[i].idx);
             }
         }
@@ -174,7 +174,7 @@ print_ndloop(na_md_loop_t *lp) {
         for (i=0; i<=nd; i++) {
             printf(" &xargs[%d].iter[%d] = 0x%"SZF"x\n", j,i, (size_t)&LITER(lp,i,j));
             printf("  xargs[%d].iter[%d].pos = %"SZF"u\n", j,i, LITER(lp,i,j).pos);
-            printf("  xargs[%d].iter[%d].step = %"SZF"u\n", j,i, LITER(lp,i,j).step);
+            printf("  xargs[%d].iter[%d].step = %"SZF"d\n", j,i, LITER(lp,i,j).step);
             printf("  xargs[%d].iter[%d].idx = 0x%"SZF"x\n", j,i, (size_t)LITER(lp,i,j).idx);
         }
         printf("  xargs[%d].bufcp = 0x%"SZF"x\n", j, (size_t)lp->xargs[j].bufcp);

data/ext/numo/narray/numo/intern.h

@@ -1,7 +1,7 @@
 /*
   intern.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef INTERN_H
 #define INTERN_H

data/ext/numo/narray/numo/narray.h

@@ -1,7 +1,7 @@
 /*
   narray.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef NARRAY_H
 #define NARRAY_H
@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.5"
-#define NARRAY_VERSION_CODE 915
+#define NARRAY_VERSION "0.9.2.0"
+#define NARRAY_VERSION_CODE 920
 
 #include <math.h>
 #include "numo/compat.h"
@@ -81,6 +81,8 @@ extern "C" {
 # ifndef PRIu64
 #  define PRIu64 "llu"
 # endif
+#else
+# error ---->> numo/narray requires 8-byte integer. <<----
 #endif
 
 #if   SIZEOF_LONG==4
@@ -96,22 +98,22 @@ extern "C" {
 # endif
 #elif SIZEOF_INT==4
 # define NUM2INT32(x) NUM2INT(x)
-# define INT322NUM(x) INT2NUM(x)
 # define NUM2UINT32(x) NUM2UINT(x)
-# define UINT322NUM(x) UINT2NUM(x)
+# if SIZEOF_LONG > 4
+#  define INT322NUM(x) INT2FIX(x)
+#  define UINT322NUM(x) INT2FIX(x)
+# else
+#  define INT322NUM(x) INT2NUM(x)
+#  define UINT322NUM(x) UINT2NUM(x)
+# endif
 # ifndef PRId32
 #  define PRId32 "d"
 # endif
 # ifndef PRIu32
 #  define PRIu32 "u"
 # endif
-#endif
-
-#if SIZEOF_VALUE > 4
-# undef INT322NUM
-# undef UINT322NUM
-# define INT322NUM(x) INT2FIX(x)
-# define UINT322NUM(x) INT2FIX(x)
+#else
+# error ---->> numo/narray requires 4-byte integer. <<----
 #endif
 
 #ifndef HAVE_TYPE_BOOL
@@ -195,6 +197,7 @@ typedef struct RNArray {
 typedef struct RNArrayData {
     narray_t base;
     char    *ptr;
+    bool     owned;
 } narray_data_t;
 
 
@@ -323,6 +326,7 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 #define NA_DATA(na)             ((narray_data_t*)(na))
 #define NA_VIEW(na)             ((narray_view_t*)(na))
 #define NA_DATA_PTR(na)         (NA_DATA(na)->ptr)
+#define NA_DATA_OWNED(na)       (NA_DATA(na)->owned)
 #define NA_VIEW_DATA(na)        (NA_VIEW(na)->data)
 #define NA_VIEW_OFFSET(na)      (NA_VIEW(na)->offset)
 #define NA_VIEW_STRIDX(na)      (NA_VIEW(na)->stridx)