numo-narray 0.9.1.4 → 0.9.1.9

data/ext/numo/narray/math.c

@@ -1,7 +1,7 @@
 /*
   math.c
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    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
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    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;
 
@@ -42,17 +43,21 @@ VALUE sym_option;
 VALUE sym_loop_opt;
 VALUE sym_init;
 
-VALUE na_cStep;
 #ifndef HAVE_RB_CCOMPLEX
 VALUE rb_cComplex;
 #endif
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+VALUE rb_cArithSeq;
+#endif
 
 int numo_na_inspect_rows=20;
 int numo_na_inspect_cols=80;
 
 void Init_nary_data();
 void Init_nary_ndloop();
+#ifndef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
 void Init_nary_step();
+#endif
 void Init_nary_index();
 void Init_numo_bit();
 void Init_numo_int8();
@@ -348,19 +353,19 @@ na_setup(VALUE self, int ndim, size_t *shape)
 
   @example
     i = Numo::Int64.new([2,4,3])
-    #=> Numo::Int64#shape=[2,4,3](empty)
+    # => Numo::Int64#shape=[2,4,3](empty)
 
     f = Numo::DFloat.new(3,4)
-    #=> Numo::DFloat#shape=[3,4](empty)
+    # => Numo::DFloat#shape=[3,4](empty)
 
     f.fill(2)
-    #=> Numo::DFloat#shape=[3,4]
+    # => Numo::DFloat#shape=[3,4]
     # [[2, 2, 2, 2],
     #  [2, 2, 2, 2],
     #  [2, 2, 2, 2]]
 
     x = Numo::NArray.new(5)
-    #=> in `new': allocator undefined for Numo::NArray (TypeError)
+    # => in `new': allocator undefined for Numo::NArray (TypeError)
     #   	from t.rb:9:in `<main>'
 
 */
@@ -444,10 +449,10 @@ na_initialize_copy(VALUE self, VALUE orig)
  *  but for typed NArray subclasses, e.g., DFloat, Int64.
  *  @example
  *    a = Numo::DFloat.zeros(3,5)
- *    => Numo::DFloat#shape=[3,5]
- *    [[0, 0, 0, 0, 0],
- *     [0, 0, 0, 0, 0],
- *     [0, 0, 0, 0, 0]]
+ *    # => Numo::DFloat#shape=[3,5]
+ *    # [[0, 0, 0, 0, 0],
+ *    #  [0, 0, 0, 0, 0],
+ *    #  [0, 0, 0, 0, 0]]
  */
 static VALUE
 na_s_zeros(int argc, VALUE *argv, VALUE klass)
@@ -468,10 +473,10 @@ na_s_zeros(int argc, VALUE *argv, VALUE klass)
  *  but for typed NArray subclasses, e.g., DFloat, Int64.
  *  @example
  *    a = Numo::DFloat.ones(3,5)
- *    => Numo::DFloat#shape=[3,5]
- *    [[1, 1, 1, 1, 1],
- *     [1, 1, 1, 1, 1],
- *     [1, 1, 1, 1, 1]]
+ *    # => Numo::DFloat#shape=[3,5]
+ *    # [[1, 1, 1, 1, 1],
+ *    #  [1, 1, 1, 1, 1],
+ *    #  [1, 1, 1, 1, 1]]
  */
 static VALUE
 na_s_ones(int argc, VALUE *argv, VALUE klass)
@@ -495,8 +500,8 @@ na_s_ones(int argc, VALUE *argv, VALUE klass)
 
   @example
     a = Numo::DFloat.linspace(-5,5,7)
-    => Numo::DFloat#shape=[7]
-    [-5, -3.33333, -1.66667, 0, 1.66667, 3.33333, 5]
+    # => Numo::DFloat#shape=[7]
+    # [-5, -3.33333, -1.66667, 0, 1.66667, 3.33333, 5]
  */
 static VALUE
 na_s_linspace(int argc, VALUE *argv, VALUE klass)
@@ -534,11 +539,12 @@ na_s_linspace(int argc, VALUE *argv, VALUE klass)
 
   @example
     Numo::DFloat.logspace(4,0,5,2)
-    => Numo::DFloat#shape=[5]
-       [16, 8, 4, 2, 1]
+    # => Numo::DFloat#shape=[5]
+    # [16, 8, 4, 2, 1]
+
     Numo::DComplex.logspace(0,1i*Math::PI,5,Math::E)
-    => Numo::DComplex#shape=[5]
-       [1+4.44659e-323i, 0.707107+0.707107i, 6.12323e-17+1i, -0.707107+0.707107i, ...]
+    # => Numo::DComplex#shape=[5]
+    # [1+4.44659e-323i, 0.707107+0.707107i, 6.12323e-17+1i, -0.707107+0.707107i, ...]
  */
 static VALUE
 na_s_logspace(int argc, VALUE *argv, VALUE klass)
@@ -572,10 +578,10 @@ na_s_logspace(int argc, VALUE *argv, VALUE klass)
   @return [Numo::NArray]  created NArray.
   @example
     a = Numo::DFloat.eye(3)
-    => Numo::DFloat#shape=[3,3]
-    [[1, 0, 0],
-     [0, 1, 0],
-     [0, 0, 1]]
+    # => Numo::DFloat#shape=[3,3]
+    # [[1, 0, 0],
+    #  [0, 1, 0],
+    #  [0, 0, 1]]
 */
 static VALUE
 na_s_eye(int argc, VALUE *argv, VALUE klass)
@@ -600,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)
 {
@@ -615,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) {
@@ -631,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:
@@ -1255,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;
@@ -1273,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;
@@ -1310,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;
 }
@@ -1328,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;
@@ -1358,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);
 }
@@ -1465,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);
@@ -1583,8 +1684,13 @@ na_get_reduce_flag_from_axes(VALUE na_obj, VALUE axes)
             len = 1;
             step = 0;
             //printf("beg=%d step=%d len=%d\n",beg,step,len);
-        } else if (rb_obj_is_kind_of(v,rb_cRange) ||
-                   rb_obj_is_kind_of(v,na_cStep)) {
+        } else if (rb_obj_is_kind_of(v,rb_cRange)
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+                   || rb_obj_is_kind_of(v,rb_cArithSeq)
+#else
+                   || rb_obj_is_kind_of(v,rb_cEnumerator)
+#endif
+                   ) {
             nary_step_array_index( v, ndim, &len, &beg, &step );
         } else {
             rb_raise(nary_eDimensionError, "invalid dimension argument %s",
@@ -1870,6 +1976,9 @@ na_equal(VALUE self, volatile VALUE other)
             return Qfalse;
         }
     }
+    if (na1->size == 0) {
+      return Qtrue;
+    }
     vbool = rb_funcall(self, id_eq, 1, other);
     return (rb_funcall(vbool, id_count_false, 0)==INT2FIX(0)) ? Qtrue : Qfalse;
 }
@@ -1896,6 +2005,9 @@ Init_narray()
     rb_require("complex");
     rb_cComplex = rb_const_get(rb_cObject, rb_intern("Complex"));
 #endif
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+    rb_cArithSeq = rb_path2class("Enumerator::ArithmeticSequence");
+#endif
 
     rb_define_const(cNArray, "VERSION", rb_str_new2(NARRAY_VERSION));
 
@@ -1993,13 +2105,16 @@ 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"));
     sym_loop_opt = ID2SYM(rb_intern("loop_opt"));
     sym_init     = ID2SYM(rb_intern("init"));
 
+#ifndef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
     Init_nary_step();
+#endif
     Init_nary_index();
 
     Init_nary_data();

data/ext/numo/narray/ndloop.c

@@ -1,7 +1,7 @@
 /*
   ndloop.c
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    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
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef INTERN_H
 #define INTERN_H
@@ -99,6 +99,7 @@ bool nary_test_reduce(VALUE reduce, int dim);
 
 void nary_step_array_index(VALUE self, size_t ary_size, size_t *plen, ssize_t *pbeg, ssize_t *pstep);
 void nary_step_sequence(VALUE self, size_t *plen, double *pbeg, double *pstep);
+void na_parse_enumerator_step(VALUE enum_obj, VALUE *pstep );
 
 // used in aref, aset
 #define na_get_result_dimension nary_get_result_dimension

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

@@ -1,7 +1,7 @@
 /*
   narray.h
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    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.4"
-#define NARRAY_VERSION_CODE 914
+#define NARRAY_VERSION "0.9.1.9"
+#define NARRAY_VERSION_CODE 919
 
 #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
@@ -165,10 +167,12 @@ extern VALUE numo_cUInt32;
 extern VALUE numo_cUInt16;
 extern VALUE numo_cUInt8;
 extern VALUE numo_cRObject;
-extern VALUE na_cStep;
 #ifndef HAVE_RB_CCOMPLEX
 extern VALUE rb_cComplex;
 #endif
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+extern VALUE rb_cArithSeq;
+#endif
 
 extern VALUE sym_reduce;
 extern VALUE sym_option;
@@ -193,6 +197,7 @@ typedef struct RNArray {
 typedef struct RNArrayData {
     narray_t base;
     char    *ptr;
+    bool     owned;
 } narray_data_t;
 
 
@@ -234,6 +239,23 @@ typedef struct {
     unsigned int element_stride;
 } narray_type_info_t;
 
+// from ruby/enumerator.c
+struct enumerator {
+    VALUE obj;
+    ID    meth;
+    VALUE args;
+    // use only above in this source
+    VALUE fib;
+    VALUE dst;
+    VALUE lookahead;
+    VALUE feedvalue;
+    VALUE stop_exc;
+    VALUE size;
+    // incompatible below depending on ruby version
+    //VALUE procs;                      // ruby 2.4
+    //rb_enumerator_size_func *size_fn; // ruby 2.1-2.4
+    //VALUE (*size_fn)(ANYARGS);        // ruby 2.0
+};
 
 static inline narray_t *
 na_get_narray_t(VALUE obj)
@@ -304,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)