numo-narray 0.9.0.3 → 0.9.0.4

data/ext/numo/narray/ndloop.c

@@ -2,11 +2,6 @@
   ndloop.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>
@@ -514,7 +509,7 @@ ndloop_check_shape(na_md_loop_t *lp, int nf_dim, narray_t *na)
                 lp->n[i] = n;
             } else if (lp->n[i] != n) {
                 // inconsistent array shape
-                rb_raise(rb_eTypeError,"shape1[%d](=%"SZF"u) != shape2[%d](=%"SZF"u)",
+                rb_raise(nary_eShapeError,"shape1[%d](=%"SZF"u) != shape2[%d](=%"SZF"u)",
                          i, lp->n[i], k, n);
             }
         }
@@ -1616,7 +1611,7 @@ loop_inspect(ndfunc_t *nf, na_md_loop_t *lp)
             }
         }
     }
-    loop_end:
+ loop_end:
     ;
 }
 
@@ -1657,7 +1652,63 @@ na_ndloop_inspect(VALUE nary, na_text_func_t func, VALUE opt)
 //----------------------------------------------------------------------
 
 static void
-loop_rarray_to_narray(ndfunc_t *nf, na_md_loop_t *lp)
+loop_store_subnarray(ndfunc_t *nf, na_md_loop_t *lp, int i0, size_t *c, VALUE a)
+{
+    int nd = lp->ndim;
+    int i, j;
+    narray_t *na;
+    int *dim_map;
+    VALUE a_type;
+
+    a_type = CLASS_OF(LARG(lp,0).value);
+    if (CLASS_OF(a) != a_type) {
+        a = rb_funcall(a_type, rb_intern("cast"), 1, a);
+    }
+    GetNArray(a,na);
+    if (na->ndim != nd-i0+1) {
+        rb_raise(nary_eShapeError, "mismatched dimension of sub-narray: "
+                 "nd_src=%d, nd_dst=%d", na->ndim, nd-i0+1);
+    }
+    dim_map = ALLOCA_N(int, na->ndim);
+    for (i=0; i<na->ndim; i++) {
+        dim_map[i] = lp->trans_map[i+i0];
+        //printf("dim_map[i=%d] = %d, i0=%d\n", i, dim_map[i], i0);
+    }
+    ndloop_set_stepidx(lp, 1, a, dim_map, NDL_READ);
+    LARG(lp,1).shape = &(na->shape[na->ndim-1]);
+
+    // loop body
+    for (i=i0;;) {
+        LARG(lp,1).value = Qtrue;
+        for (; i<nd; i++) {
+            for (j=0; j<2; j++) {
+                if (LITER(lp,i,j).idx) {
+                    LITER(lp,i+1,j).pos = LITER(lp,i,j).pos + LITER(lp,i,j).idx[c[i]];
+                } else {
+                    LITER(lp,i+1,j).pos = LITER(lp,i,j).pos + LITER(lp,i,j).step*c[i];
+                }
+            }
+            if (c[i] >= na->shape[i-i0]) {
+                LARG(lp,1).value = Qfalse;
+            }
+        }
+
+        (*(nf->func))(&(lp->user));
+
+        for (;;) {
+            if (i<=i0) goto loop_end;
+            i--; c[i]++;
+            if (c[i] < lp->n[i]) break;
+            c[i] = 0;
+        }
+    }
+ loop_end:
+    LARG(lp,1).ptr = NULL;
+}
+
+
+static void
+loop_store_rarray(ndfunc_t *nf, na_md_loop_t *lp)
 {
     size_t *c;
     int     i;
@@ -1670,38 +1721,47 @@ loop_rarray_to_narray(ndfunc_t *nf, na_md_loop_t *lp)
 
     // array at each dimension
     a = ALLOCA_N(VALUE, nd+1);
-    a[0] = LARG(lp,0).value;
+    a[0] = LARG(lp,1).value;
+
+    //print_ndloop(lp);
 
     // loop body
     for (i=0;;) {
         for (; i<nd; i++) {
-            if (LITER(lp,i,1).idx) {
-                LITER(lp,i+1,1).pos = LITER(lp,i,1).pos + LITER(lp,i,1).idx[c[i]];
+            if (LITER(lp,i,0).idx) {
+                LITER(lp,i+1,0).pos = LITER(lp,i,0).pos + LITER(lp,i,0).idx[c[i]];
             } else {
-                LITER(lp,i+1,1).pos = LITER(lp,i,1).pos + LITER(lp,i,1).step*c[i];
+                LITER(lp,i+1,0).pos = LITER(lp,i,0).pos + LITER(lp,i,0).step*c[i];
             }
-            //LITER(lp,i+1,0).pos = LITER(lp,i,0).pos + c[i];
             if (TYPE(a[i])==T_ARRAY) {
                 if (c[i] < (size_t)RARRAY_LEN(a[i])) {
                     a[i+1] = RARRAY_AREF(a[i],c[i]);
                 } else {
                     a[i+1] = Qnil;
                 }
-            } else { // not Array -- what about narray?
+            } else if (IsNArray(a[i])) {
+                //printf("a[i=%d]=0x%lx\n",i,a[i]);
+                loop_store_subnarray(nf,lp,i,c,a[i]);
+                goto loop_next;
+            } else {
                 if (c[i]==0) {
                     a[i+1] = a[i];
                 } else {
                     a[i+1] = Qnil;
                 }
             }
-            //printf("c[i]=%d, i=%d\n",c[i],i);
+            //printf("c[%d]=%lu\n",i,c[i]);
         }
 
-        //printf("a[i]=0x%x, i=%d\n",a[i],i);
-        LARG(lp,0).value = a[i];
-
-        (*(nf->func))(&(lp->user));
+        //printf("a[i=%d]=0x%lx\n",i,a[i]);
+        if (IsNArray(a[i])) {
+            loop_store_subnarray(nf,lp,i,c,a[i]);
+        } else {
+            LARG(lp,1).value = a[i];
+            (*(nf->func))(&(lp->user));
+        }
 
+    loop_next:
         for (;;) {
             if (i<=0) goto loop_end;
             i--; c[i]++;
@@ -1709,12 +1769,12 @@ loop_rarray_to_narray(ndfunc_t *nf, na_md_loop_t *lp)
             c[i] = 0;
         }
     }
-    loop_end:
+ loop_end:
     ;
 }
 
 VALUE
-na_ndloop_cast_rarray_to_narray(ndfunc_t *nf, VALUE rary, VALUE nary)
+na_ndloop_store_rarray(ndfunc_t *nf, VALUE nary, VALUE rary)
 {
     na_md_loop_t lp;
     VALUE args;
@@ -1722,20 +1782,20 @@ na_ndloop_cast_rarray_to_narray(ndfunc_t *nf, VALUE rary, VALUE nary)
     //rb_p(args);
     if (na_debug_flag) print_ndfunc(nf);
 
-    args = rb_assoc_new(rary,nary);
+    args = rb_assoc_new(nary,rary);
 
     // cast arguments to NArray
     //ndloop_cast_args(nf, args);
 
     // allocate ndloop struct
-    ndloop_alloc(&lp, nf, args, NULL, 0, loop_rarray_to_narray);
+    ndloop_alloc(&lp, nf, args, NULL, 0, loop_store_rarray);
 
     return rb_ensure(ndloop_run, (VALUE)&lp, ndloop_release, (VALUE)&lp);
 }
 
 
 VALUE
-na_ndloop_cast_rarray_to_narray2(ndfunc_t *nf, VALUE rary, VALUE nary, VALUE opt)
+na_ndloop_store_rarray2(ndfunc_t *nf, VALUE nary, VALUE rary, VALUE opt)
 {
     na_md_loop_t lp;
     VALUE args;
@@ -1744,13 +1804,13 @@ na_ndloop_cast_rarray_to_narray2(ndfunc_t *nf, VALUE rary, VALUE nary, VALUE opt
     if (na_debug_flag) print_ndfunc(nf);
 
     //args = rb_assoc_new(rary,nary);
-    args = rb_ary_new3(3,rary,nary,opt);
+    args = rb_ary_new3(3,nary,rary,opt);
 
     // cast arguments to NArray
     //ndloop_cast_args(nf, args);
 
     // allocate ndloop struct
-    ndloop_alloc(&lp, nf, args, NULL, 0, loop_rarray_to_narray);
+    ndloop_alloc(&lp, nf, args, NULL, 0, loop_store_rarray);
 
     return rb_ensure(ndloop_run, (VALUE)&lp, ndloop_release, (VALUE)&lp);
 }

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

@@ -2,11 +2,6 @@
   intern.h
   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.
 */
 #ifndef INTERN_H
 #define INTERN_H
@@ -24,6 +19,7 @@ VALUE na_expand_dims(VALUE self, VALUE vdim);
 VALUE na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv);
 
 VALUE na_check_ladder(VALUE self, int start_dim);
+VALUE na_check_contiguous(VALUE self);
 void na_setup_shape(narray_t *na, int ndim, size_t *shape);
 
 VALUE na_transpose_map(VALUE self, int *map);
@@ -70,8 +66,8 @@ VALUE na_ndloop3(ndfunc_t *nf, void *ptr, int argc, ...);
 VALUE na_ndloop4(ndfunc_t *nf, void *ptr, VALUE args);
 
 VALUE na_ndloop_cast_narray_to_rarray(ndfunc_t *nf, VALUE nary, VALUE fmt);
-VALUE na_ndloop_cast_rarray_to_narray(ndfunc_t *nf, VALUE rary, VALUE nary);
-VALUE na_ndloop_cast_rarray_to_narray2(ndfunc_t *nf, VALUE rary, VALUE nary, VALUE opt);
+VALUE na_ndloop_store_rarray(ndfunc_t *nf, VALUE nary, VALUE rary);
+VALUE na_ndloop_store_rarray2(ndfunc_t *nf, VALUE nary, VALUE rary, VALUE opt);
 
 VALUE na_ndloop_inspect(VALUE nary, na_text_func_t func, VALUE opt);
 
@@ -103,10 +99,10 @@ VALUE nary_init_accum_aref0(VALUE self, VALUE reduce);
 VALUE nary_mathcast(int argc, VALUE *argv);
 
 
-ssize_t
-na_get_scalar_position(VALUE self, int argc, VALUE *argv, ssize_t stride);
+int
+na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_t *pos_idx);
 VALUE
-na_aref_main(int nidx, VALUE *idx, VALUE self, int keep_dim);
+na_aref_main(int nidx, VALUE *idx, VALUE self, int keep_dim, int nd);
 
 
 #endif /* ifndef INTERN_H */

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

@@ -2,17 +2,12 @@
   narray.h
   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.
 */
 #ifndef NARRAY_H
 #define NARRAY_H
 
-#define NARRAY_VERSION "0.9.0.3"
-#define NARRAY_VERSION_CODE 903
+#define NARRAY_VERSION "0.9.0.4"
+#define NARRAY_VERSION_CODE 904
 
 #include <math.h>
 #include "numo/compat.h"
@@ -94,7 +89,7 @@
 # endif
 #elif SIZEOF_INT==4
 # define NUM2INT32(x) NUM2INT(x)
-# define INT322NUM(x) UINT2NUM(x)
+# define INT322NUM(x) INT2NUM(x)
 # define NUM2UINT32(x) NUM2UINT(x)
 # define UINT322NUM(x) UINT2NUM(x)
 # ifndef PRId32
@@ -201,6 +196,7 @@ typedef struct RNArrayView {
 } narray_view_t;
 
 
+// filemap is unimplemented
 typedef struct RNArrayFileMap {
     narray_t base;
     char    *ptr;
@@ -239,7 +235,7 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
     Check_Type(obj, T_DATA);
     na = (narray_t*)DATA_PTR(obj);
     if (na->type != na_type) {
-	rb_bug("unknown type 0x%x (0x%x given)", na_type, na->type);
+        rb_bug("unknown type 0x%x (0x%x given)", na_type, na->type);
     }
     return na;
 }
@@ -260,38 +256,46 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 #define SDX_SET_STRIDE(x,s) ((x).stride=((s)<<1)|0x1)
 #define SDX_SET_INDEX(x,idx) ((x).index=idx)
 
-#define RNARRAY(val)		((narray_t*)DATA_PTR(val))
-#define RNARRAY_DATA(val)	((narray_data_t*)DATA_PTR(val))
-#define RNARRAY_VIEW(val)	((narray_view_t*)DATA_PTR(val))
-#define RNARRAY_FILEMAP(val)	((narray_filemap_t*)DATA_PTR(val))
+#define RNARRAY(val)            ((narray_t*)DATA_PTR(val))
+#define RNARRAY_DATA(val)       ((narray_data_t*)DATA_PTR(val))
+#define RNARRAY_VIEW(val)       ((narray_view_t*)DATA_PTR(val))
+#define RNARRAY_FILEMAP(val)    ((narray_filemap_t*)DATA_PTR(val))
 
-#define RNARRAY_NDIM(val)	(RNARRAY(val)->ndim)
-#define RNARRAY_TYPE(val)	(RNARRAY(val)->type)
-#define RNARRAY_FLAG(val)	(RNARRAY(val)->flag)
-#define RNARRAY_SIZE(val)	(RNARRAY(val)->size)
-#define RNARRAY_SHAPE(val)	(RNARRAY(val)->shape)
-#define RNARRAY_REDUCE(val)	(RNARRAY(val)->reduce)
+#define RNARRAY_NDIM(val)       (RNARRAY(val)->ndim)
+#define RNARRAY_TYPE(val)       (RNARRAY(val)->type)
+#define RNARRAY_FLAG(val)       (RNARRAY(val)->flag)
+#define RNARRAY_SIZE(val)       (RNARRAY(val)->size)
+#define RNARRAY_SHAPE(val)      (RNARRAY(val)->shape)
+#define RNARRAY_REDUCE(val)     (RNARRAY(val)->reduce)
 
-#define RNARRAY_DATA_PTR(val)	 (RNARRAY_DATA(val)->ptr)
-#define RNARRAY_VIEW_DATA(val)	 (RNARRAY_VIEW(val)->data)
+#define RNARRAY_DATA_PTR(val)    (RNARRAY_DATA(val)->ptr)
+#define RNARRAY_VIEW_DATA(val)   (RNARRAY_VIEW(val)->data)
 #define RNARRAY_VIEW_OFFSET(val) (RNARRAY_VIEW(val)->offset)
 #define RNARRAY_VIEW_STRIDX(val) (RNARRAY_VIEW(val)->stridx)
 
-#define NA_NDIM(na)	(((narray_t*)na)->ndim)
-#define NA_TYPE(na)	(((narray_t*)na)->type)
-#define NA_FLAG(na)	(((narray_t*)na)->flag)
-#define NA_FLAG0(na)	(((narray_t*)na)->flag[0])
-#define NA_FLAG1(na)	(((narray_t*)na)->flag[1])
-#define NA_SIZE(na)	(((narray_t*)na)->size)
-#define NA_SHAPE(na)	(((narray_t*)na)->shape)
-#define NA_REDUCE(na)	(((narray_t*)na)->reduce)
+#define NA_NDIM(na)     (((narray_t*)na)->ndim)
+#define NA_TYPE(na)     (((narray_t*)na)->type)
+#define NA_SIZE(na)     (((narray_t*)na)->size)
+#define NA_SHAPE(na)    (((narray_t*)na)->shape)
+#define NA_REDUCE(na)   (((narray_t*)na)->reduce)
+
+#define NA_FLAG(obj)    (na_get_narray_t(obj)->flag)
+#define NA_FLAG0(obj)   (NA_FLAG(obj)[0])
+#define NA_FLAG1(obj)   (NA_FLAG(obj)[1])
+
+#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_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)
 
-#define NA_DATA_PTR(na)         (((narray_data_t*)na)->ptr)
-#define NA_VIEW_DATA(na)	(((narray_view_t*)na)->data)
-#define NA_VIEW_OFFSET(na)	(((narray_view_t*)na)->offset)
-#define NA_VIEW_STRIDX(na)	(((narray_view_t*)na)->stridx)
+#define NA_IS_INDEX_AT(na,i)    (SDX_IS_INDEX(NA_VIEW_STRIDX(na)[i]))
+#define NA_IS_STRIDE_AT(na,i)   (SDX_IS_STRIDE(NA_VIEW_STRIDX(na)[i]))
+#define NA_INDEX_AT(na,i)       (SDX_GET_INDEX(NA_VIEW_STRIDX(na)[i]))
+#define NA_STRIDE_AT(na,i)      (SDX_GET_STRIDE(NA_VIEW_STRIDX(na)[i]))
 
-#define NA_FILEMAP_PTR(na)	(((narray_filemap_t*)na)->ptr)
+#define NA_FILEMAP_PTR(na)      (((narray_filemap_t*)na)->ptr)
 
 
 #define NA_FL0_TEST(x,f) (NA_FLAG0(x)&(f))
@@ -306,10 +310,6 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 #define NA_FL0_REVERSE(x,f) do {NA_FLAG0(x) ^= (f);} while(0)
 #define NA_FL1_REVERSE(x,f) do {NA_FLAG1(x) ^= (f);} while(0)
 
-#define NA_TEST_LOCK(x)  NA_FL0_TEST(x,NA_FL_LOCK)
-#define NA_SET_LOCK(x)   NA_FL0_SET(x,NA_FL_LOCK)
-#define NA_UNSET_LOCK(x) NA_FL0_UNSET(x,NA_FL_LOCK)
-
 
 /* FLAGS
    - row-major / column-major
@@ -319,31 +319,60 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
    - matrix or not
 */
 
-#define NA_FL_LOCK         (0x1<<0)
-#define NA_FL_COLUMN_MAJOR (0x1<<1)
-#define NA_FL_BYTE_SWAPPED (0x1<<2)
-#define NA_FL_INPLACE      (0x1<<3)
+#define NA_FL0_BIG_ENDIAN     (0x1<<0)
+#define NA_FL0_COLUMN_MAJOR   (0x1<<1)
+#define NA_FL1_LOCK           (0x1<<0)
+#define NA_FL1_INPLACE        (0x1<<1)
+
+#define TEST_COLUMN_MAJOR(x)   NA_FL0_TEST(x,NA_FL0_COLUMN_MAJOR)
+#define SET_COLUMN_MAJOR(x)    NA_FL0_SET(x,NA_FL0_COLUMN_MAJOR)
+#define UNSET_COLUMN_MAJOR(x)  NA_FL0_UNSET(x,NA_FL0_COLUMN_MAJOR)
 
-#define TEST_COLUMN_MAJOR(x)   NA_FL0_TEST(x,NA_FL_COLUMN_MAJOR)
-#define TEST_ROW_MAJOR(x)    (!NA_FL0_TEST(x,NA_FL_COLUMN_MAJOR))
-#define TEST_BYTE_SWAPPED(x)   NA_FL0_TEST(x,NA_FL_BYTE_SWAPPED)
-#define TEST_HOST_ORDER(x)   (!TEST_BYTE_SWAPPED(x))
+#define TEST_ROW_MAJOR(x)      (!TEST_COLUMN_MAJOR(x))
+#define SET_ROW_MAJOR(x)       UNSET_COLUMN_MAJOR(x)
+#define UNSET_ROW_MAJOR(x)     SET_COLUMN_MAJOR(x)
 
-#define TEST_INPLACE(x)        NA_FL0_TEST(x,NA_FL_INPLACE)
-#define SET_INPLACE(x)         NA_FL0_SET(x,NA_FL_INPLACE)
-#define UNSET_INPLACE(x)       NA_FL0_UNSET(x,NA_FL_INPLACE)
+#define TEST_BIG_ENDIAN(x)     NA_FL0_TEST(x,NA_FL0_BIG_ENDIAN)
+#define SET_BIG_ENDIAN(x)      NA_FL0_SET(x,NA_FL0_BIG_ENDIAN)
+#define UNSET_BIG_ENDIAN(x)    NA_FL0_UNSET(x,NA_FL0_BIG_ENDIAN)
 
-#define REVERSE_BYTE_SWAPPED(x)	NA_FL0_REVERSE((x),NA_FL_BYTE_SWAPPED)
+#define TEST_LITTLE_ENDIAN(x)  (!TEST_BIG_ENDIAN(x))
+#define SET_LITTLE_ENDIAN(x)   UNSET_BIG_ENDIAN(x)
+#define UNSET_LITTLE_ENDIAN(x) SET_BIG_ENDIAN(x)
+
+#define REVERSE_ENDIAN(x)      NA_FL0_REVERSE((x),NA_FL0_BIG_ENDIAN)
+
+#define TEST_LOCK(x)           NA_FL1_TEST(x,NA_FL1_LOCK)
+#define SET_LOCK(x)            NA_FL1_SET(x,NA_FL1_LOCK)
+#define UNSET_LOCK(x)          NA_FL1_UNSET(x,NA_FL1_LOCK)
+
+#define TEST_INPLACE(x)        NA_FL1_TEST(x,NA_FL1_INPLACE)
+#define SET_INPLACE(x)         NA_FL1_SET(x,NA_FL1_INPLACE)
+#define UNSET_INPLACE(x)       NA_FL1_UNSET(x,NA_FL1_INPLACE)
 
 #ifdef DYNAMIC_ENDIAN
+// not supported
 #else
 #ifdef WORDS_BIGENDIAN
-#else // LITTLE_ENDIAN
-
-#define TEST_NETWORK_ORDER(x) TEST_BYTE_SWAPPED(x)
-#define TEST_VACS_ORDER(x)    TEST_HOST_ORDER(x)
+#define TEST_HOST_ORDER(x)     TEST_BIG_ENDIAN(x)
+#define SET_HOST_ORDER(x)      SET_BIG_ENDIAN(x)
+#define UNSET_HOST_ORDER(x)    UNSET_BIG_ENDIAN(x)
+#define TEST_BYTE_SWAPPED(x)   TEST_LITTLE_ENDIAN(x)
+#define SET_BYTE_SWAPPED(x)    SET_LITTLE_ENDIAN(x)
+#define UNSET_BYTE_SWAPPED(x)  UNSET_LITTLE_ENDIAN(x)
+#define NA_FL0_INIT            NA_FL0_BIG_ENDIAN
+#else // LITTLE ENDIAN
+#define TEST_HOST_ORDER(x)     TEST_LITTLE_ENDIAN(x)
+#define SET_HOST_ORDER(x)      SET_LITTLE_ENDIAN(x)
+#define UNSET_HOST_ORDER(x)    UNSET_LITTLE_ENDIAN(x)
+#define TEST_BYTE_SWAPPED(x)   TEST_BIG_ENDIAN(x)
+#define SET_BYTE_SWAPPED(x)    SET_BIG_ENDIAN(x)
+#define UNSET_BYTE_SWAPPED(x)  UNSET_BIG_ENDIAN(x)
+#define NA_FL0_INIT            0
 #endif
 #endif
+#define NA_FL1_INIT            0
+
 
 #define IsNArray(obj) (rb_obj_is_kind_of(obj,cNArray)==Qtrue)