numo-narray 0.9.0.3 → 0.9.0.4

data/ext/numo/narray/kwarg.c

@@ -1,12 +1,7 @@
 /*
    kwarg.c : Process keyword arguments for Ruby
 
-   Copyright (c) 2001 Masahiro TANAKA <masa@ir.isas.ac.jp>
-
-   This program is free software.
-   You can distribute/modify this program
-   under the same terms as Ruby itself.
-   NO WARRANTY.
+   Copyright (c) 2001 Masahiro TANAKA
 */
 #include <ruby.h>
 #include "numo/compat.h"

data/ext/numo/narray/math.c

@@ -2,11 +2,6 @@
   math.c
   Numerical Array Extension for Ruby
     (C) Copyright 1999-2016 by Masahiro TANAKA
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
 */
 #include <ruby.h>
 #include "numo/narray.h"
@@ -63,14 +58,14 @@ VALUE nary_mathcast(int argc, VALUE *argv)
 {
     VALUE type, type2;
     int i;
+
     type = na_ary_composition_dtype(argv[0]);
     for (i=1; i<argc; i++) {
         type2 = na_ary_composition_dtype(argv[i]);
-	type = nary_math_cast2(type, type2);
-	if (NIL_P(type)) {
-	    rb_raise(rb_eTypeError,"%s is unknown for Numo::NMath",
-		     rb_class2name(argv[i]));
-	}
+        type = nary_math_cast2(type, type2);
+        if (NIL_P(type)) {
+            rb_raise(rb_eTypeError,"includes unknown DataType for upcast");
+        }
     }
     return type;
 }
@@ -133,11 +128,12 @@ Init_nary_math()
     rb_hash_aset(hCast, numo_cDComplex, numo_mDComplexMath);
     rb_hash_aset(hCast, numo_cSFloat,   numo_mSFloatMath);
     rb_hash_aset(hCast, numo_cSComplex, numo_mSComplexMath);
-#ifdef HAVE_RB_CFIXNUM
+#ifdef RUBY_INTEGER_UNIFICATION
+    rb_hash_aset(hCast, rb_cInteger, rb_mMath);
+#else
     rb_hash_aset(hCast, rb_cFixnum,  rb_mMath);
     rb_hash_aset(hCast, rb_cBignum,  rb_mMath);
 #endif
-    rb_hash_aset(hCast, rb_cInteger, rb_mMath);
     rb_hash_aset(hCast, rb_cFloat,   rb_mMath);
     rb_hash_aset(hCast, rb_cComplex, numo_mDComplexMath);
 

data/ext/numo/narray/narray.c

@@ -2,11 +2,6 @@
   narray.c
   Numerical Array Extension for Ruby
     (C) Copyright 1999-2016 by Masahiro TANAKA
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
 */
 #define NARRAY_C
 #include <ruby.h>
@@ -193,8 +188,8 @@ na_s_allocate(VALUE klass)
 
     na->base.ndim = 0;
     na->base.type = NARRAY_DATA_T;
-    na->base.flag[0] = 0;
-    na->base.flag[1] = 0;
+    na->base.flag[0] = NA_FL0_INIT;
+    na->base.flag[1] = NA_FL1_INIT;
     na->base.size = 0;
     na->base.shape = NULL;
     na->base.reduce = INT2FIX(0);
@@ -210,8 +205,8 @@ na_s_allocate_view(VALUE klass)
 
     na->base.ndim = 0;
     na->base.type = NARRAY_VIEW_T;
-    na->base.flag[0] = 0;
-    na->base.flag[1] = 0;
+    na->base.flag[0] = NA_FL0_INIT;
+    na->base.flag[1] = NA_FL1_INIT;
     na->base.size = 0;
     na->base.shape = NULL;
     na->base.reduce = INT2FIX(0);
@@ -230,14 +225,12 @@ na_array_to_internal_shape(VALUE self, VALUE ary, size_t *shape)
     size_t    i, n, c, s;
     ssize_t   x;
     VALUE     v;
-    narray_t *na;
     int       flag = 0;
 
     n = RARRAY_LEN(ary);
 
     if (RTEST(self)) {
-        GetNArray(self, na);
-        flag = TEST_COLUMN_MAJOR(na);
+        flag = TEST_COLUMN_MAJOR(self);
     }
     if (flag) {
         c = n-1;
@@ -642,9 +635,9 @@ void
 na_release_lock(VALUE self)
 {
     narray_t *na;
-    GetNArray(self,na);
 
-    NA_UNSET_LOCK(na);
+    UNSET_LOCK(self);
+    GetNArray(self,na);
 
     switch(NA_TYPE(na)) {
     case NARRAY_VIEW_T:
@@ -653,51 +646,6 @@ na_release_lock(VALUE self)
     }
 }
 
-// fix name, ex, allow_stride_for_flatten_view
-VALUE
-na_check_ladder(VALUE self, int start_dim)
-{
-    int i;
-    ssize_t st0, st1;
-    narray_t *na1;
-    narray_view_t *na;
-    GetNArray(self,na1);
-
-    //puts("pass ladder");
-
-    if (start_dim < -na1->ndim || start_dim >= na1->ndim) {
-        rb_bug("start_dim (%d) out of range",start_dim);
-    }
-
-    switch(na1->type) {
-    case NARRAY_DATA_T:
-    case NARRAY_FILEMAP_T:
-        return Qtrue;
-    case NARRAY_VIEW_T:
-        GetNArrayView(self,na);
-        // negative dim -> position from last dim
-        if (start_dim < 0) {
-            start_dim += na->base.ndim;
-        }
-        // not ladder if it has index
-        for (i=start_dim; i<na->base.ndim; i++) {
-            if (SDX_IS_INDEX(na->stridx[i]))
-                return Qfalse;
-        }
-        // check stride
-        i = start_dim;
-        st0 = SDX_GET_STRIDE(na->stridx[i]);
-        for (i++; i<na->base.ndim; i++) {
-            st1 = SDX_GET_STRIDE(na->stridx[i]);
-            if (st0 != (ssize_t)(st1*na->base.shape[i])) {
-                return Qfalse;
-            }
-            st0 = st1;
-        }
-        return Qtrue;
-    }
-    return Qtrue;
-}
 
 
 /*
@@ -786,7 +734,7 @@ static VALUE
 
     GetNArray(self,na);
     n = NA_NDIM(na);
-    if (TEST_COLUMN_MAJOR(na)) {
+    if (TEST_COLUMN_MAJOR(self)) {
         c = n-1;
         s = -1;
     } else {
@@ -855,7 +803,7 @@ na_copy_flags(VALUE src, VALUE dst)
     GetNArray(dst,na2);
 
     na2->flag[0] = na1->flag[0];
-    na2->flag[1] = na1->flag[1];
+    //na2->flag[1] = NA_FL1_INIT;
 
     RBASIC(dst)->flags |= (RBASIC(src)->flags) &
         (FL_USER1|FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6|FL_USER7);
@@ -877,6 +825,70 @@ na_original_data(VALUE self)
     return self;
 }
 
+// fix name, ex, allow_stride_for_flatten_view
+VALUE
+na_check_ladder(VALUE self, int start_dim)
+{
+    int i;
+    ssize_t st0, st1;
+    narray_t *na;
+    GetNArray(self,na);
+
+    if (start_dim < -na->ndim || start_dim >= na->ndim) {
+        rb_bug("start_dim (%d) out of range",start_dim);
+    }
+
+    switch(na->type) {
+    case NARRAY_DATA_T:
+    case NARRAY_FILEMAP_T:
+        return Qtrue;
+    case NARRAY_VIEW_T:
+        // negative dim -> position from last dim
+        if (start_dim < 0) {
+            start_dim += NA_NDIM(na);
+        }
+        // not ladder if it has index
+        for (i=start_dim; i<NA_NDIM(na); i++) {
+            if (NA_IS_INDEX_AT(na,i))
+                return Qfalse;
+        }
+        // check stride
+        st0 = NA_STRIDE_AT(na,start_dim);
+        for (i=start_dim+1; i<NA_NDIM(na); i++) {
+            st1 = NA_STRIDE_AT(na,i);
+            if (st0 != (ssize_t)(st1 * NA_SHAPE(na)[i])) {
+                return Qfalse;
+            }
+            st0 = st1;
+        }
+    }
+    return Qtrue;
+}
+
+VALUE
+na_check_contiguous(VALUE self)
+{
+    ssize_t elmsz;
+    narray_t *na;
+    GetNArray(self,na);
+
+    switch(na->type) {
+    case NARRAY_DATA_T:
+    case NARRAY_FILEMAP_T:
+        return Qtrue;
+    case NARRAY_VIEW_T:
+        if (NA_VIEW_STRIDX(na)==0) {
+            return Qtrue;
+        }
+        if (na_check_ladder(self,0)==Qtrue) {
+            elmsz = na_get_elmsz(self);
+            if (elmsz == NA_STRIDE_AT(na,NA_NDIM(na)-1)) {
+                return Qtrue;
+            }
+        }
+    }
+    return Qfalse;
+}
 
 //----------------------------------------------------------------------
 
@@ -1168,13 +1180,13 @@ nary_s_byte_size(VALUE type)
 
 /*
   Returns a new 1-D array initialized from binary raw data in a string.
-  @overload from_string(string,[shape])
+  @overload from_binary(string,[shape])
   @param [String] string  Binary raw data.
   @param [Array] shape  array of integers representing array shape.
   @return [Numo::NArray] NArray containing binary data.
  */
 static VALUE
-nary_s_from_string(int argc, VALUE *argv, VALUE type)
+nary_s_from_binary(int argc, VALUE *argv, VALUE type)
 {
     size_t len, str_len, byte_size;
     size_t *shape;
@@ -1184,6 +1196,7 @@ nary_s_from_string(int argc, VALUE *argv, VALUE type)
     VALUE velmsz;
 
     narg = rb_scan_args(argc,argv,"11",&vstr,&vshape);
+    Check_Type(vstr,T_STRING);
     str_len = RSTRING_LEN(vstr);
     velmsz = rb_const_get(type, rb_intern(ELEMENT_BYTE_SIZE));
     if (narg==2) {
@@ -1239,30 +1252,164 @@ nary_s_from_string(int argc, VALUE *argv, VALUE type)
     return vna;
 }
 
+/*
+  Returns a new 1-D array initialized from binary raw data in a string.
+  @overload store_binary(string,[offset])
+  @param [String] string  Binary raw data.
+  @param [Integer] (optional) offset  Byte offset in string.
+  @return [Integer] stored length.
+ */
+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;
+    narray_t *na;
+
+    narg = rb_scan_args(argc,argv,"11",&vstr,&voffset);
+    str_len = RSTRING_LEN(vstr);
+    if (narg==2) {
+        offset = NUM2SIZET(voffset);
+        if (str_len < offset) {
+            rb_raise(rb_eArgError, "offset is larger than string length");
+        }
+        str_len -= offset;
+    } else {
+        offset = 0;
+    }
+
+    GetNArray(self,na);
+    size = NA_SIZE(na);
+    velmsz = rb_const_get(CLASS_OF(self), rb_intern(ELEMENT_BYTE_SIZE));
+    if (FIXNUM_P(velmsz)) {
+        byte_size = size * NUM2SIZET(velmsz);
+    } else {
+        byte_size = ceil(size * NUM2DBL(velmsz));
+    }
+    if (byte_size > str_len) {
+        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);
+
+    return SIZET2NUM(byte_size);
+}
+
 /*
   Returns string containing the raw data bytes in NArray.
-  @overload to_string()
+  @overload to_binary()
   @return [String] String object containing binary raw data.
  */
 static VALUE
-nary_to_string(VALUE self)
+nary_to_binary(VALUE self)
 {
-    size_t len;
+    size_t len, offset=0;
     char *ptr;
     VALUE str;
     narray_t *na;
 
     GetNArray(self,na);
     if (na->type == NARRAY_VIEW_T) {
-        self = rb_funcall(self,rb_intern("copy"),0);
+        if (na_check_contiguous(self)==Qtrue) {
+            offset = NA_VIEW_OFFSET(na);
+        } else {
+            self = rb_funcall(self,rb_intern("copy"),0);
+        }
     }
     len = NUM2SIZET(nary_byte_size(self));
     ptr = na_get_pointer_for_read(self);
-    str = rb_usascii_str_new(ptr,len);
+    str = rb_usascii_str_new(ptr+offset,len);
     RB_GC_GUARD(self);
     return str;
 }
 
+/*
+  Dump marshal data.
+  @overload marshal_dump()
+  @return [Array] Array containing marshal data.
+ */
+static VALUE
+nary_marshal_dump(VALUE self)
+{
+    VALUE a;
+
+    a = rb_ary_new();
+    rb_ary_push(a, INT2FIX(1));     // version
+    rb_ary_push(a, na_shape(self));
+    rb_ary_push(a, INT2FIX(NA_FLAG0(self)));
+    if (CLASS_OF(self) == numo_cRObject) {
+        narray_t *na;
+        VALUE *ptr;
+        size_t offset=0;
+        GetNArray(self,na);
+        if (na->type == NARRAY_VIEW_T) {
+            if (na_check_contiguous(self)==Qtrue) {
+                offset = NA_VIEW_OFFSET(na);
+            } else {
+                self = rb_funcall(self,rb_intern("copy"),0);
+            }
+        }
+        ptr = (VALUE*)na_get_pointer_for_read(self);
+        rb_ary_push(a, rb_ary_new4(NA_SIZE(na), ptr+offset));
+    } else {
+        rb_ary_push(a, nary_to_binary(self));
+    }
+    RB_GC_GUARD(self);
+    return a;
+}
+
+VALUE na_inplace( VALUE self );
+/*
+  Load marshal data.
+  @overload marshal_load(data)
+  @params [Array] Array containing marshal data.
+  @return [nil]
+ */
+static VALUE
+nary_marshal_load(VALUE self, VALUE a)
+{
+    VALUE v;
+
+    if (TYPE(a) != T_ARRAY) {
+        rb_raise(rb_eArgError,"marshal argument should be array");
+    }
+    if (RARRAY_LEN(a) != 4) {
+        rb_raise(rb_eArgError,"marshal array size should be 4");
+    }
+    if (RARRAY_AREF(a,0) != INT2FIX(1)) {
+        rb_raise(rb_eArgError,"NArray marshal version %d is not supported "
+                 "(only version 1)", NUM2INT(RARRAY_AREF(a,0)));
+    }
+    na_initialize(self,RARRAY_AREF(a,1));
+    NA_FL0_SET(self,FIX2INT(RARRAY_AREF(a,2)));
+    v = RARRAY_AREF(a,3);
+    if (CLASS_OF(self) == numo_cRObject) {
+        narray_t *na;
+        char *ptr;
+        if (TYPE(v) != T_ARRAY) {
+            rb_raise(rb_eArgError,"RObject content should be array");
+        }
+        GetNArray(self,na);
+        if (RARRAY_LEN(v) != (long)NA_SIZE(na)) {
+            rb_raise(rb_eArgError,"RObject content size mismatch");
+        }
+        ptr = na_get_pointer_for_write(self);
+        memcpy(ptr, RARRAY_PTR(v), NA_SIZE(na)*sizeof(VALUE));
+    } else {
+        nary_store_binary(1,&v,self);
+        if (TEST_BYTE_SWAPPED(self)) {
+            rb_funcall(na_inplace(self),rb_intern("to_host"),0);
+            REVERSE_ENDIAN(self); // correct behavior??
+        }
+    }
+    RB_GC_GUARD(a);
+    return self;
+}
+
 
 /*
   Cast self to another NArray datatype.
@@ -1314,6 +1461,9 @@ na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
         rb_raise(rb_eRuntimeError,"must be positive: naryc=%d", naryc);
     }
     GetNArray(naryv[0],na);
+    if (na->size==0) {
+        rb_raise(nary_eShapeError,"cannot reduce empty NArray");
+    }
     reduce = na->reduce;
     if (argc==0) {
         //printf("pass argc=0 reduce=%d\n",NUM2INT(reduce));
@@ -1323,6 +1473,9 @@ na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
     row_major = TEST_COLUMN_MAJOR(naryv[0]);
     for (i=1; i<naryc; i++) {
         GetNArray(naryv[i],na);
+        if (na->size==0) {
+            rb_raise(nary_eShapeError,"cannot reduce empty NArray");
+        }
         if (TEST_COLUMN_MAJOR(naryv[i]) != row_major) {
             rb_raise(nary_eDimensionError,"dimension order is different");
         }
@@ -1462,7 +1615,7 @@ VALUE na_host_order_p( VALUE self )
 VALUE na_inplace( VALUE self )
 {
     VALUE view = self;
-    //view = na_clone(self);
+    view = na_make_view(self);
     SET_INPLACE(view);
     return view;
 }
@@ -1675,6 +1828,8 @@ Init_narray()
 
     rb_define_method(cNArray, "debug_info", rb_narray_debug_info, 0);
 
+    rb_define_method(cNArray, "contiguous?", na_check_contiguous, 0);
+
     rb_define_method(cNArray, "view", na_make_view, 0);
     rb_define_method(cNArray, "expand_dims", na_expand_dims, 1);
     rb_define_method(cNArray, "reverse", nary_reverse, -1);
@@ -1682,8 +1837,13 @@ Init_narray()
     rb_define_singleton_method(cNArray, "upcast", numo_na_upcast, 1);
     rb_define_singleton_method(cNArray, "byte_size", nary_s_byte_size, 0);
 
-    rb_define_singleton_method(cNArray, "from_string", nary_s_from_string, -1);
-    rb_define_method(cNArray, "to_string",  nary_to_string, 0);
+    rb_define_singleton_method(cNArray, "from_binary", nary_s_from_binary, -1);
+    rb_define_alias (rb_singleton_class(cNArray), "from_string", "from_binary");
+    rb_define_method(cNArray, "store_binary",  nary_store_binary, -1);
+    rb_define_method(cNArray, "to_binary",  nary_to_binary, 0);
+    rb_define_alias (cNArray, "to_string", "to_binary");
+    rb_define_method(cNArray, "marshal_dump",  nary_marshal_dump, 0);
+    rb_define_method(cNArray, "marshal_load",  nary_marshal_load, 1);
 
     rb_define_method(cNArray, "byte_size",  nary_byte_size, 0);