numo-narray 0.9.0.4 → 0.9.0.5

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

@@ -8,7 +8,7 @@ typedef struct {
 #define STORE_INT(ptr, esz, x) memcpy(ptr,&(x),esz)
 
 static void
-iter_bit_where(na_loop_t *const lp)
+<%=c_iter%>(na_loop_t *const lp)
 {
     size_t  i;
     BIT_DIGIT *a;
@@ -58,24 +58,24 @@ iter_bit_where(na_loop_t *const lp)
   @return [Numo::Int32,Numo::Int64]
 */
 static VALUE
- numo_bit_where(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     volatile VALUE idx_1;
     size_t size, n_1;
     where_opt_t *g;
 
     ndfunc_arg_in_t ain[1] = {{cT,0}};
-    ndfunc_t ndf = { iter_bit_where, FULL_LOOP, 1, 0, ain, 0 };
+    ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP, 1, 0, ain, 0 };
 
     size = RNARRAY_SIZE(self);
-    n_1 = NUM2SIZET(numo_bit_count_true(0, NULL, self));
+    n_1 = NUM2SIZET(<%=find_tmpl("count_true").c_func%>(0, NULL, self));
     g = ALLOCA_N(where_opt_t,1);
     g->count = 0;
     if (size>4294967295ul) {
-        idx_1 = rb_narray_new(numo_cInt64, 1, &n_1);
+        idx_1 = nary_new(numo_cInt64, 1, &n_1);
         g->elmsz = 8;
     } else {
-        idx_1 = rb_narray_new(numo_cInt32, 1, &n_1);
+        idx_1 = nary_new(numo_cInt32, 1, &n_1);
         g->elmsz = 4;
     }
     g->idx1 = na_get_pointer_for_write(idx_1);

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

@@ -1,5 +1,5 @@
 static void
-iter_bit_where2(na_loop_t *const lp)
+<%=c_iter%>(na_loop_t *const lp)
 {
     size_t  i;
     BIT_DIGIT *a;
@@ -59,27 +59,27 @@ iter_bit_where2(na_loop_t *const lp)
   @return [Numo::Int32,Numo::Int64]*2
 */
 static VALUE
-numo_bit_where2(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     VALUE idx_1, idx_0;
     size_t size, n_1, n_0;
     where_opt_t *g;
 
     ndfunc_arg_in_t ain[1] = {{cT,0}};
-    ndfunc_t ndf = { iter_bit_where2, FULL_LOOP, 1, 0, ain, 0 };
+    ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP, 1, 0, ain, 0 };
 
     size = RNARRAY_SIZE(self);
-    n_1 = NUM2SIZET(numo_bit_count_true(0, NULL, self));
+    n_1 = NUM2SIZET(<%=find_tmpl("count_true").c_func%>(0, NULL, self));
     n_0 = size - n_1;
     g = ALLOCA_N(where_opt_t,1);
     g->count = 0;
     if (size>4294967295ul) {
-        idx_1 = rb_narray_new(numo_cInt64, 1, &n_1);
-        idx_0 = rb_narray_new(numo_cInt64, 1, &n_0);
+        idx_1 = nary_new(numo_cInt64, 1, &n_1);
+        idx_0 = nary_new(numo_cInt64, 1, &n_0);
         g->elmsz = 8;
     } else {
-        idx_1 = rb_narray_new(numo_cInt32, 1, &n_1);
-        idx_0 = rb_narray_new(numo_cInt32, 1, &n_0);
+        idx_1 = nary_new(numo_cInt32, 1, &n_1);
+        idx_0 = nary_new(numo_cInt32, 1, &n_0);
         g->elmsz = 4;
     }
     g->idx1 = na_get_pointer_for_write(idx_1);

data/ext/numo/narray/index.c

@@ -1,7 +1,7 @@
 /*
   index.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2016 by Masahiro TANAKA
+    (C) Copyright 1999-2017 by Masahiro TANAKA
 */
 //#define NARRAY_C
 
@@ -74,7 +74,12 @@ static VALUE sym_rest;
 static ID id_beg;
 static ID id_end;
 static ID id_exclude_end;
-static ID id_each, id_step;
+static ID id_each;
+static ID id_step;
+static ID id_dup;
+static ID id_bracket;
+static ID id_shift_left;
+static ID id_mask;
 
 
 void
@@ -148,7 +153,7 @@ na_parse_narray_index(VALUE a, int orig_dim, ssize_t size, na_index_arg_t *q)
         rb_raise(rb_eIndexError, "should be 1-d NArray");
     }
     n = NA_SIZE(na);
-    idx = rb_narray_new(cIndex,1,&n);
+    idx = nary_new(cIndex,1,&n);
     na_store(idx,a);
 
     GetNArrayData(idx,nidx);
@@ -382,8 +387,8 @@ na_index_aref_nadata(narray_data_t *na1, narray_view_t *na2,
         na2->base.shape[j] = size = q[i].n;
 
         if (q[i].reduce != 0) {
-            m = rb_funcall(INT2FIX(1),rb_intern("<<"),1,INT2FIX(j));
-            na2->base.reduce = rb_funcall(m,rb_intern("|"),1,na2->base.reduce);
+            m = rb_funcall(INT2FIX(1),id_shift_left,1,INT2FIX(j));
+            na2->base.reduce = rb_funcall(m,'|',1,na2->base.reduce);
         }
 
         // array index
@@ -409,7 +414,7 @@ na_index_aref_nadata(narray_data_t *na1, narray_view_t *na2,
 
 static void
 na_index_aref_naview(narray_view_t *na1, narray_view_t *na2,
-                   na_index_arg_t *q, int ndim, int keep_dim)
+                     na_index_arg_t *q, ssize_t elmsz, int ndim, int keep_dim)
 {
     int i, j;
     ssize_t total=1;
@@ -431,11 +436,15 @@ na_index_aref_naview(narray_view_t *na1, narray_view_t *na2,
         na2->base.shape[j] = size = q[i].n;
 
         if (q[i].reduce != 0) {
-            VALUE m = rb_funcall(INT2FIX(1),rb_intern("<<"),1,INT2FIX(j));
-            na2->base.reduce = rb_funcall(m,rb_intern("|"),1,na2->base.reduce);
+            VALUE m = rb_funcall(INT2FIX(1),id_shift_left,1,INT2FIX(j));
+            na2->base.reduce = rb_funcall(m,'|',1,na2->base.reduce);
         }
 
-        if (q[i].idx != NULL && SDX_IS_INDEX(sdx1)) {
+        if (q[i].orig_dim >= na1->base.ndim) {
+            // new dimension
+            SDX_SET_STRIDE(na2->stridx[j], elmsz);
+        }
+        else if (q[i].idx != NULL && SDX_IS_INDEX(sdx1)) {
             // index <- index
             int k;
             size_t *index = q[i].idx;
@@ -546,6 +555,7 @@ VALUE na_aref_md_protected(VALUE data_value)
     int ndim_new;
     VALUE view;
     narray_view_t *na2;
+    ssize_t elmsz;
 
     na_index_parse_args(args, na1, q, ndim);
 
@@ -565,16 +575,18 @@ VALUE na_aref_md_protected(VALUE data_value)
 
     na2->stridx = ALLOC_N(stridx_t,ndim_new);
 
+    elmsz = nary_element_stride(self);
+
     switch(na1->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
-        na_index_aref_nadata((narray_data_t *)na1,na2,q,na_get_elmsz(self),ndim,keep_dim);
+        na_index_aref_nadata((narray_data_t *)na1,na2,q,elmsz,ndim,keep_dim);
         na2->data = self;
         break;
     case NARRAY_VIEW_T:
         na2->offset = ((narray_view_t *)na1)->offset;
         na2->data = ((narray_view_t *)na1)->data;
-        na_index_aref_naview((narray_view_t *)na1,na2,q,ndim,keep_dim);
+        na_index_aref_naview((narray_view_t *)na1,na2,q,elmsz,ndim,keep_dim);
         break;
     }
     if (store) {
@@ -614,12 +626,12 @@ na_aref_md(int argc, VALUE *argv, VALUE self, int keep_dim, int result_nd)
     if (argc == 1 && result_nd == 1) {
         idx = argv[0];
         if (rb_obj_is_kind_of(idx, rb_cArray)) {
-            idx = rb_apply(numo_cNArray,rb_intern("[]"),idx);
+            idx = rb_apply(numo_cNArray,id_bracket,idx);
         }
         if (rb_obj_is_kind_of(idx, numo_cNArray)) {
             GetNArray(idx,nidx);
             if (NA_NDIM(nidx)>1) {
-                store = rb_narray_new(CLASS_OF(self),NA_NDIM(nidx),NA_SHAPE(nidx));
+                store = nary_new(CLASS_OF(self),NA_NDIM(nidx),NA_SHAPE(nidx));
                 idx = na_flatten(idx);
                 RARRAY_ASET(args,0,idx);
             }
@@ -650,11 +662,11 @@ na_aref_main(int nidx, VALUE *idx, VALUE self, int keep_dim, int nd)
     na_index_arg_to_internal_order(nidx, idx, self);
 
     if (nidx==0) {
-        return rb_funcall(self,rb_intern("copy"),0);
+        return rb_funcall(self,id_dup,0);
     }
     if (nidx==1) {
         if (CLASS_OF(*idx)==numo_cBit) {
-            return rb_funcall(*idx,rb_intern("mask"),1,self);
+            return rb_funcall(*idx,id_mask,1,self);
         }
     }
     return na_aref_md(nidx, idx, self, keep_dim, nd);
@@ -781,7 +793,7 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
         break;
     default:
         if (!stride) {
-            stride = na_get_elmsz(self);
+            stride = nary_element_stride(self);
         }
         if (argc==1 && j==1) {
             x = na_range_check(idx[0], na->size, 0);
@@ -808,19 +820,23 @@ Init_nary_index()
 {
     rb_define_method(cNArray, "slice", na_slice, -1);
 
-    sym_ast = ID2SYM(rb_intern("*"));
-    sym_all = ID2SYM(rb_intern("all"));
-    sym_minus = ID2SYM(rb_intern("-"));
-    sym_new = ID2SYM(rb_intern("new"));
-    sym_reverse = ID2SYM(rb_intern("reverse"));
-    sym_plus = ID2SYM(rb_intern("+"));
-    //sym_reduce = ID2SYM(rb_intern("reduce"));
-    sym_sum = ID2SYM(rb_intern("sum"));
-    sym_tilde = ID2SYM(rb_intern("~"));
-    sym_rest = ID2SYM(rb_intern("rest"));
-    id_beg = rb_intern("begin");
-    id_end = rb_intern("end");
+    sym_ast        = ID2SYM(rb_intern("*"));
+    sym_all        = ID2SYM(rb_intern("all"));
+    sym_minus      = ID2SYM(rb_intern("-"));
+    sym_new        = ID2SYM(rb_intern("new"));
+    sym_reverse    = ID2SYM(rb_intern("reverse"));
+    sym_plus       = ID2SYM(rb_intern("+"));
+    //sym_reduce   = ID2SYM(rb_intern("reduce"));
+    sym_sum        = ID2SYM(rb_intern("sum"));
+    sym_tilde      = ID2SYM(rb_intern("~"));
+    sym_rest       = ID2SYM(rb_intern("rest"));
+    id_beg         = rb_intern("begin");
+    id_end         = rb_intern("end");
     id_exclude_end = rb_intern("exclude_end?");
-    id_each = rb_intern("each");
-    id_step = rb_intern("step");
+    id_each        = rb_intern("each");
+    id_step        = rb_intern("step");
+    id_dup         = rb_intern("dup");
+    id_bracket     = rb_intern("[]");
+    id_shift_left  = rb_intern("<<");
+    id_mask        = rb_intern("mask");
 }

data/ext/numo/narray/math.c

@@ -1,7 +1,7 @@
 /*
   math.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2016 by Masahiro TANAKA
+    (C) Copyright 1999-2017 by Masahiro TANAKA
 */
 #include <ruby.h>
 #include "numo/narray.h"
@@ -10,6 +10,9 @@ VALUE numo_mNMath;
 EXTERN VALUE numo_mDFloatMath, numo_mDComplexMath;
 EXTERN VALUE numo_mSFloatMath, numo_mSComplexMath;
 static ID id_send;
+static ID id_UPCAST;
+static ID id_DISPATCH;
+static ID id_extract;
 
 VALUE
 nary_type_s_upcast(VALUE type1, VALUE type2)
@@ -18,12 +21,12 @@ nary_type_s_upcast(VALUE type1, VALUE type2)
     VALUE result_type;
 
     if (type1==type2) return type1;
-    upcast_hash = rb_const_get(type1, rb_intern("UPCAST"));
+    upcast_hash = rb_const_get(type1, id_UPCAST);
     result_type = rb_hash_aref(upcast_hash, type2);
     if (NIL_P(result_type)) {
         if (TYPE(type2)==T_CLASS) {
             if ( RTEST(rb_class_inherited_p(type2,cNArray)) ) {
-                upcast_hash = rb_const_get(type2, rb_intern("UPCAST"));
+                upcast_hash = rb_const_get(type2, id_UPCAST);
                 result_type = rb_hash_aref(upcast_hash, type1);
             }
         }
@@ -85,7 +88,7 @@ VALUE nary_math_method_missing(int argc, VALUE *argv, VALUE mod)
     if (argc>1) {
 	type = nary_mathcast(argc-1,argv+1);
 
-	hash = rb_const_get(mod, rb_intern("DISPATCH"));
+	hash = rb_const_get(mod, id_DISPATCH);
 	typemod = rb_hash_aref( hash, type );
 	if (NIL_P(typemod)) {
 	    rb_raise(rb_eTypeError,"%s is unknown for Numo::NMath",
@@ -96,7 +99,7 @@ VALUE nary_math_method_missing(int argc, VALUE *argv, VALUE mod)
 
 	if (!RTEST(rb_class_inherited_p(type,cNArray)) &&
 	    IsNArray(ans) ) {
-	    ans = rb_funcall(ans,rb_intern("extract"),0);
+	    ans = rb_funcall(ans,id_extract,0);
 	}
 	return ans;
     }
@@ -137,5 +140,8 @@ Init_nary_math()
     rb_hash_aset(hCast, rb_cFloat,   rb_mMath);
     rb_hash_aset(hCast, rb_cComplex, numo_mDComplexMath);
 
-    id_send = rb_intern("send");
+    id_send     = rb_intern("send");
+    id_UPCAST   = rb_intern("UPCAST");
+    id_DISPATCH = rb_intern("DISPATCH");
+    id_extract  = rb_intern("extract");
 }

data/ext/numo/narray/narray.c

@@ -1,11 +1,10 @@
 /*
   narray.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2016 by Masahiro TANAKA
+    (C) Copyright 1999-2017 by Masahiro TANAKA
 */
 #define NARRAY_C
 #include <ruby.h>
-#include "numo/narray.h"
 #include <assert.h>
 
 /* global variables within this module */
@@ -17,13 +16,25 @@ VALUE nary_eOperationError;
 VALUE nary_eDimensionError;
 
 static ID id_contiguous_stride;
-//static ID id_element_bit_size;
-//static ID id_element_byte_size;
+static ID id_allocate;
+static ID id_element_byte_size;
+static ID id_fill;
+static ID id_seq;
+static ID id_logseq;
+static ID id_eye;
+static ID id_UPCAST;
+static ID id_cast;
+static ID id_dup;
+static ID id_to_host;
+static ID id_bracket;
+static ID id_shift_left;
+static ID id_eq;
+static ID id_count_false;
+static ID id_axis;
+static ID id_nan;
 
 VALUE cPointer;
 
-static ID id_allocate;
-
 VALUE sym_reduce;
 VALUE sym_option;
 VALUE sym_loop_opt;
@@ -38,30 +49,37 @@ int numo_na_inspect_rows=20;
 int numo_na_inspect_cols=80;
 
 void Init_nary_data();
+void Init_nary_ndloop();
 void Init_nary_step();
 void Init_nary_index();
-void Init_nary_bit();
-void Init_nary_int8();
-void Init_nary_int16();
-void Init_nary_int32();
-void Init_nary_int64();
-void Init_nary_uint8();
-void Init_nary_uint16();
-void Init_nary_uint32();
-void Init_nary_uint64();
-void Init_nary_sfloat();
-void Init_nary_scomplex();
-void Init_nary_dfloat();
-void Init_nary_dcomplex();
+void Init_numo_bit();
+void Init_numo_int8();
+void Init_numo_int16();
+void Init_numo_int32();
+void Init_numo_int64();
+void Init_numo_uint8();
+void Init_numo_uint16();
+void Init_numo_uint32();
+void Init_numo_uint64();
+void Init_numo_sfloat();
+void Init_numo_scomplex();
+void Init_numo_dfloat();
+void Init_numo_dcomplex();
+void Init_numo_robject();
 void Init_nary_math();
 void Init_nary_rand();
 void Init_nary_array();
 void Init_nary_struct();
-void Init_nary_robject();
+
+const rb_data_type_t na_data_type = {
+    "Numo::NArray",
+    {0, 0, 0,}, 0, 0, 0,
+};
+#include "numo/narray.h"
 
 
 static void
-rb_narray_debug_info_nadata(VALUE self)
+nary_debug_info_nadata(VALUE self)
 {
     narray_data_t *na;
     GetNArrayData(self,na);
@@ -71,7 +89,7 @@ rb_narray_debug_info_nadata(VALUE self)
 
 
 static VALUE
-rb_narray_debug_info_naview(VALUE self)
+nary_debug_info_naview(VALUE self)
 {
     int i;
     narray_view_t *na;
@@ -106,7 +124,7 @@ rb_narray_debug_info_naview(VALUE self)
 
 
 VALUE
-rb_narray_debug_info(VALUE self)
+nary_debug_info(VALUE self)
 {
     int i;
     narray_t *na;
@@ -129,40 +147,55 @@ rb_narray_debug_info(VALUE self)
     switch(na->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
-        rb_narray_debug_info_nadata(self);
+        nary_debug_info_nadata(self);
         break;
     case NARRAY_VIEW_T:
-        rb_narray_debug_info_naview(self);
+        nary_debug_info_naview(self);
         break;
     }
     return Qnil;
 }
 
 
-void
-na_free(narray_data_t* na)
+static size_t
+na_view_memsize(const void* ptr)
 {
-    assert(na->base.type==NARRAY_DATA_T);
+    int i;
+    size_t size = sizeof(narray_view_t);
+    const narray_view_t *na = ptr;
 
-    if (na->ptr != NULL) {
-        xfree(na->ptr);
-        na->ptr = NULL;
+    assert(na->base.type == NARRAY_VIEW_T);
+
+    if (na->stridx != NULL) {
+        for (i=0; i<na->base.ndim; i++) {
+            if (SDX_IS_INDEX(na->stridx[i])) {
+                size += sizeof(size_t) * na->base.shape[i];
+            }
+        }
+        size += sizeof(stridx_t) * na->base.ndim;
     }
     if (na->base.size > 0) {
         if (na->base.shape != NULL && na->base.shape != &(na->base.size)) {
-            xfree(na->base.shape);
-            na->base.shape = NULL;
+            size += sizeof(size_t) * na->base.ndim;
         }
     }
-    xfree(na);
+    return size;
 }
 
 static void
-na_free_view(narray_view_t* na)
+na_view_free(void* ptr)
 {
-    assert(na->base.type==NARRAY_VIEW_T);
+    int i;
+    narray_view_t *na = (narray_view_t*)ptr;
+
+    assert(na->base.type == NARRAY_VIEW_T);
 
     if (na->stridx != NULL) {
+        for (i=0; i<na->base.ndim; i++) {
+            if (SDX_IS_INDEX(na->stridx[i])) {
+                xfree(SDX_GET_INDEX(na->stridx[i]));
+            }
+        }
         xfree(na->stridx);
         na->stridx = NULL;
     }
@@ -176,27 +209,18 @@ na_free_view(narray_view_t* na)
 }
 
 static void
-na_gc_mark_view(narray_view_t* na)
-{
-    rb_gc_mark(na->data);
-}
-
-VALUE
-na_s_allocate(VALUE klass)
+na_view_gc_mark(void* na)
 {
-    narray_data_t *na = ALLOC(narray_data_t);
-
-    na->base.ndim = 0;
-    na->base.type = NARRAY_DATA_T;
-    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);
-    na->ptr = NULL;
-    return Data_Wrap_Struct(klass, 0, na_free, na);
+    if (((narray_t*)na)->type == NARRAY_VIEW_T) {
+        rb_gc_mark(((narray_view_t*)na)->data);
+    }
 }
 
+const rb_data_type_t na_data_type_view = {
+    "Numo::NArrayView",
+    {na_view_gc_mark, na_view_free, na_view_memsize,},
+    &na_data_type, 0, 0,
+};
 
 VALUE
 na_s_allocate_view(VALUE klass)
@@ -213,7 +237,7 @@ na_s_allocate_view(VALUE klass)
     na->data = Qnil;
     na->offset = 0;
     na->stridx = NULL;
-    return Data_Wrap_Struct(klass, na_gc_mark_view, na_free_view, na);
+    return TypedData_Wrap_Struct(klass, &na_data_type_view, (void*)na);
 }
 
 
@@ -257,18 +281,18 @@ na_alloc_shape(narray_t *na, int ndim)
 {
     na->ndim = ndim;
     na->size = 0;
-    if (ndim == 0) {
-        na->shape = NULL;
-    }
-    else if (ndim == 1) {
+    switch(ndim) {
+    case 0:
+    case 1:
         na->shape = &(na->size);
-    }
-    else if (ndim < 0) {
-        rb_raise(nary_eDimensionError,"ndim=%d is negative", ndim);
-    }
-    else if (ndim > NA_MAX_DIMENSION) {
-        rb_raise(nary_eDimensionError,"ndim=%d is too many", ndim);
-    } else {
+        break;
+    default:
+        if (ndim < 0) {
+            rb_raise(nary_eDimensionError,"ndim=%d is negative", ndim);
+        }
+        if (ndim > NA_MAX_DIMENSION) {
+            rb_raise(nary_eDimensionError,"ndim=%d is too many", ndim);
+        }
         na->shape = ALLOC_N(size_t, ndim);
     }
 }
@@ -296,7 +320,7 @@ na_setup_shape(narray_t *na, int ndim, size_t *shape)
     }
 }
 
-void
+static void
 na_setup(VALUE self, int ndim, size_t *shape)
 {
     narray_t *na;
@@ -306,13 +330,38 @@ na_setup(VALUE self, int ndim, size_t *shape)
 
 
 /*
- *  call-seq:
- *     Numo::DataType.new(shape)             => narray
- *     Numo::DataType.new(size1, size2, ...) => narray
- *
- *  Constructs a narray using the given <i>DataType</i> and <i>shape</i> or
- *  <i>sizes</i>.
- */
+  @overload initialize(shape)
+  @overload initialize(size0, size1, ...)
+  @param [Array] shape (array of sizes along each dimension)
+  @param [Integer] sizeN (size along Nth-dimension)
+  @return [Numo::NArray] unallocated narray.
+
+  Constructs an instance of NArray class using the given
+  and <i>shape</i> or <i>sizes</i>.
+  Note that NArray itself is an abstract super class and
+  not suitable to create instances.
+  Use Typed Subclasses of NArray (DFloat, Int32, etc) to create instances.
+  This method does not allocate memory for array data.
+  Memory is allocated on write method such as #fill, #store, #seq, etc.
+
+  @example
+    i = Numo::Int64.new([2,4,3])
+    #=> Numo::Int64#shape=[2,4,3](empty)
+
+    f = Numo::DFloat.new(3,4)
+    #=> Numo::DFloat#shape=[3,4](empty)
+
+    f.fill(2)
+    #=> 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)
+    #   	from t.rb:9:in `<main>'
+
+*/
 static VALUE
 na_initialize(VALUE self, VALUE args)
 {
@@ -342,7 +391,7 @@ na_initialize(VALUE self, VALUE args)
 
 
 VALUE
-rb_narray_new(VALUE klass, int ndim, size_t *shape)
+nary_new(VALUE klass, int ndim, size_t *shape)
 {
     volatile VALUE obj;
 
@@ -353,7 +402,7 @@ rb_narray_new(VALUE klass, int ndim, size_t *shape)
 
 
 VALUE
-rb_narray_view_new(VALUE klass, int ndim, size_t *shape)
+nary_view_new(VALUE klass, int ndim, size_t *shape)
 {
     volatile VALUE obj;
 
@@ -403,7 +452,7 @@ na_s_zeros(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj;
     obj = rb_class_new_instance(argc, argv, klass);
-    return rb_funcall(obj, rb_intern("fill"), 1, INT2FIX(0));
+    return rb_funcall(obj, id_fill, 1, INT2FIX(0));
 }
 
 
@@ -427,7 +476,7 @@ na_s_ones(int argc, VALUE *argv, VALUE klass)
 {
     VALUE obj;
     obj = rb_class_new_instance(argc, argv, klass);
-    return rb_funcall(obj, rb_intern("fill"), 1, INT2FIX(1));
+    return rb_funcall(obj, id_fill, 1, INT2FIX(1));
 }
 
 
@@ -466,7 +515,7 @@ na_s_linspace(int argc, VALUE *argv, VALUE klass)
     vstep = rb_funcall(obj, '/', 1, DBL2NUM(n-1));
 
     obj = rb_class_new_instance(1, &vsize, klass);
-    return rb_funcall(obj, rb_intern("seq"), 2, vx1, vstep);
+    return rb_funcall(obj, id_seq, 2, vx1, vstep);
 }
 
 /*
@@ -510,7 +559,7 @@ na_s_logspace(int argc, VALUE *argv, VALUE klass)
     vstep = rb_funcall(obj, '/', 1, DBL2NUM(n-1));
 
     obj = rb_class_new_instance(1, &vsize, klass);
-    return rb_funcall(obj, rb_intern("logseq"), 3, vx1, vstep, vbase);
+    return rb_funcall(obj, id_logseq, 3, vx1, vstep, vbase);
 }
 
 
@@ -541,7 +590,7 @@ na_s_eye(int argc, VALUE *argv, VALUE klass)
         argc = 2;
     }
     obj = rb_class_new_instance(argc, argv, klass);
-    return rb_funcall(obj, rb_intern("eye"), 0);
+    return rb_funcall(obj, id_eye, 0);
 }
 
 
@@ -647,47 +696,6 @@ na_release_lock(VALUE self)
 }
 
 
-
-/*
-stridx_t *
-na_get_stride(VALUE v)
-{
-    int i;
-    size_t st;
-    stridx_t *stridx=NULL;
-    narray_t *na;
-    GetNArray(v,na);
-
-    switch(NA_TYPE(na)) {
-    case NARRAY_DATA_T:
-        if (NA_DATA_PTR(na)==NULL) {
-            rb_raise(rb_eRuntimeError,"cannot read no-data NArray");
-        }
-        break;
-    case NARRAY_FILEMAP_T:
-        break;
-    case NARRAY_VIEW_T:
-        stridx = NA_STRIDX(na);
-        break;
-    default:
-        rb_raise(rb_eRuntimeError,"invalid narray internal type");
-    }
-
-    if (!stridx) {
-        stridx = ALLOC_N(stridx_t, na->ndim);
-        st = NUM2SIZET(rb_const_get(CLASS_OF(v), id_contiguous_stride));
-        //printf("step_unit=%ld, CLASS_OF(v)=%lx\n",st, CLASS_OF(v));
-        for (i=na->ndim; i>0;) {
-            SDX_SET_STRIDE(stridx[--i],st);
-            st *= na->shape[i];
-        }
-    }
-
-    return stridx;
-}
-*/
-
-
 /* method: size() -- returns the total number of typeents */
 static VALUE
 na_size(VALUE self)
@@ -750,10 +758,21 @@ static VALUE
 }
 
 
-size_t
-na_get_elmsz(VALUE vna)
+unsigned int
+nary_element_stride(VALUE v)
 {
-    return NUM2SIZET(rb_const_get(CLASS_OF(vna), id_contiguous_stride));
+    narray_type_info_t *info;
+    narray_t *na;
+
+    GetNArray(v,na);
+    if (na->type == NARRAY_VIEW_T) {
+        v = NA_VIEW_DATA(na);
+        GetNArray(v,na);
+    }
+    assert(na->type == NARRAY_DATA_T);
+
+    info = (narray_type_info_t *)(RTYPEDDATA_TYPE(v)->data);
+    return info->element_stride;
 }
 
 size_t
@@ -810,21 +829,6 @@ na_copy_flags(VALUE src, VALUE dst)
 }
 
 
-VALUE
-na_original_data(VALUE self)
-{
-    narray_t *na;
-    narray_view_t *nv;
-
-    GetNArray(self,na);
-    switch(na->type) {
-    case NARRAY_VIEW_T:
-        GetNArrayView(self, nv);
-        return nv->data;
-    }
-    return self;
-}
-
 // fix name, ex, allow_stride_for_flatten_view
 VALUE
 na_check_ladder(VALUE self, int start_dim)
@@ -881,7 +885,7 @@ na_check_contiguous(VALUE self)
             return Qtrue;
         }
         if (na_check_ladder(self,0)==Qtrue) {
-            elmsz = na_get_elmsz(self);
+            elmsz = nary_element_stride(self);
             if (elmsz == NA_STRIDE_AT(na,NA_NDIM(na)-1)) {
                 return Qtrue;
             }
@@ -923,7 +927,7 @@ na_make_view(VALUE self)
     switch(na->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
-        stride = na_get_elmsz(self);
+        stride = nary_element_stride(self);
         for (i=nd; i--;) {
             SDX_SET_STRIDE(na2->stridx[i],stride);
             stride *= na->shape[i];
@@ -1038,7 +1042,7 @@ nary_reverse(int argc, VALUE *argv, VALUE self)
     VALUE view;
     VALUE reduce;
 
-    reduce = na_reduce_dimension(argc, argv, 1, &self);
+    reduce = na_reduce_dimension(argc, argv, 1, &self, 0);
 
     GetNArray(self,na);
     nd = na->ndim;
@@ -1054,7 +1058,7 @@ nary_reverse(int argc, VALUE *argv, VALUE self)
     switch(na->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
-        stride = na_get_elmsz(self);
+        stride = nary_element_stride(self);
         offset = 0;
         for (i=nd; i--;) {
             if (na_test_reduce(reduce,i)) {
@@ -1116,12 +1120,12 @@ numo_na_upcast(VALUE type1, VALUE type2)
     if (type1==type2) {
         return type1;
     }
-    upcast_hash = rb_const_get(type1, rb_intern("UPCAST"));
+    upcast_hash = rb_const_get(type1, id_UPCAST);
     result_type = rb_hash_aref(upcast_hash, type2);
     if (NIL_P(result_type)) {
         if (TYPE(type2)==T_CLASS) {
             if (RTEST(rb_class_inherited_p(type2,cNArray))) {
-                upcast_hash = rb_const_get(type2, rb_intern("UPCAST"));
+                upcast_hash = rb_const_get(type2, id_UPCAST);
                 result_type = rb_hash_aref(upcast_hash, type1);
             }
         }
@@ -1144,7 +1148,7 @@ nary_coerce(VALUE x, VALUE y)
     VALUE type;
 
     type = numo_na_upcast(CLASS_OF(x), CLASS_OF(y));
-    y = rb_funcall(type,rb_intern("cast"),1,y);
+    y = rb_funcall(type,id_cast,1,y);
     return rb_assoc_new(y , x);
 }
 
@@ -1160,7 +1164,7 @@ nary_byte_size(VALUE self)
     narray_t *na;
 
     GetNArray(self,na);
-    velmsz = rb_const_get(CLASS_OF(self), rb_intern(ELEMENT_BYTE_SIZE));
+    velmsz = rb_const_get(CLASS_OF(self), id_element_byte_size);
     if (FIXNUM_P(velmsz)) {
         return SIZET2NUM(NUM2SIZET(velmsz) * na->size);
     }
@@ -1174,7 +1178,7 @@ nary_byte_size(VALUE self)
 static VALUE
 nary_s_byte_size(VALUE type)
 {
-    return rb_const_get(type, rb_intern(ELEMENT_BYTE_SIZE));
+    return rb_const_get(type, id_element_byte_size);
 }
 
 
@@ -1198,7 +1202,7 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
     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));
+    velmsz = rb_const_get(type, id_element_byte_size);
     if (narg==2) {
         switch(TYPE(vshape)) {
         case T_FIXNUM:
@@ -1244,7 +1248,7 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
         shape[0] = len;
     }
 
-    vna = rb_narray_new(type, nd, shape);
+    vna = nary_new(type, nd, shape);
     ptr = na_get_pointer_for_write(vna);
 
     memcpy(ptr, RSTRING_PTR(vstr), byte_size);
@@ -1283,7 +1287,7 @@ nary_store_binary(int argc, VALUE *argv, VALUE self)
 
     GetNArray(self,na);
     size = NA_SIZE(na);
-    velmsz = rb_const_get(CLASS_OF(self), rb_intern(ELEMENT_BYTE_SIZE));
+    velmsz = rb_const_get(CLASS_OF(self), id_element_byte_size);
     if (FIXNUM_P(velmsz)) {
         byte_size = size * NUM2SIZET(velmsz);
     } else {
@@ -1317,7 +1321,7 @@ nary_to_binary(VALUE self)
         if (na_check_contiguous(self)==Qtrue) {
             offset = NA_VIEW_OFFSET(na);
         } else {
-            self = rb_funcall(self,rb_intern("copy"),0);
+            self = rb_funcall(self,id_dup,0);
         }
     }
     len = NUM2SIZET(nary_byte_size(self));
@@ -1350,7 +1354,7 @@ nary_marshal_dump(VALUE self)
             if (na_check_contiguous(self)==Qtrue) {
                 offset = NA_VIEW_OFFSET(na);
             } else {
-                self = rb_funcall(self,rb_intern("copy"),0);
+                self = rb_funcall(self,id_dup,0);
             }
         }
         ptr = (VALUE*)na_get_pointer_for_read(self);
@@ -1402,7 +1406,7 @@ nary_marshal_load(VALUE self, VALUE a)
     } else {
         nary_store_binary(1,&v,self);
         if (TEST_BYTE_SWAPPED(self)) {
-            rb_funcall(na_inplace(self),rb_intern("to_host"),0);
+            rb_funcall(na_inplace(self),id_to_host,0);
             REVERSE_ENDIAN(self); // correct behavior??
         }
     }
@@ -1420,7 +1424,7 @@ nary_marshal_load(VALUE self, VALUE a)
 static VALUE
 nary_cast_to(VALUE obj, VALUE type)
 {
-    return rb_funcall(type, rb_intern("cast"), 1, obj);
+    return rb_funcall(type, id_cast, 1, obj);
 }
 
 
@@ -1437,18 +1441,19 @@ na_test_reduce(VALUE reduce, int dim)
         if (m==0) return 1;
         return (m & (1u<<dim)) ? 1 : 0;
     } else {
-        return (rb_funcall(reduce,rb_intern("[]"),1,INT2FIX(dim))==INT2FIX(1)) ?
+        return (rb_funcall(reduce,id_bracket,1,INT2FIX(dim))==INT2FIX(1)) ?
             1 : 0 ;
     }
 }
 
 
 VALUE
-na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
+na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv, int *propagate_nan)
 {
     int ndim, ndim0;
     int row_major;
     int i, r;
+    long narg;
     size_t j;
     size_t len;
     ssize_t beg, step;
@@ -1456,6 +1461,29 @@ na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
     narray_t *na;
     size_t m;
     VALUE reduce;
+    VALUE kw_hash = Qnil;
+    ID kw_table[2] = {id_axis,id_nan};
+    VALUE opts[2] = {Qundef,Qundef};
+    VALUE axes;
+
+    narg = rb_scan_args(argc, argv, "*:", &axes, &kw_hash);
+    rb_get_kwargs(kw_hash, kw_table, 0, 2, opts);
+
+    // option: axis
+    if (opts[0] != Qundef && RTEST(opts[0])) {
+        if (narg > 0) {
+            rb_raise(rb_eArgError,"both axis-arguments and axis-keyword are given");
+        }
+        if (TYPE(opts[0]) == T_ARRAY) {
+            axes = opts[0];
+        } else {
+            axes = rb_ary_new3(1,opts[0]);
+        }
+    }
+    // option: ignore_none
+    if (propagate_nan) {
+        *propagate_nan = (opts[1] != Qundef && RTEST(opts[1])) ? 1 : 0;
+    }
 
     if (naryc<1) {
         rb_raise(rb_eRuntimeError,"must be positive: naryc=%d", naryc);
@@ -1494,8 +1522,9 @@ na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
 
     m = 0;
     reduce = Qnil;
-    for (i=0; i<argc; i++) {
-        v = argv[i];
+    narg = RARRAY_LEN(axes);
+    for (i=0; i<narg; i++) {
+        v = RARRAY_AREF(axes,i);
         //printf("argv[%d]=",i);rb_p(v);
         if (TYPE(v)==T_FIXNUM) {
             beg = FIX2INT(v);
@@ -1525,44 +1554,15 @@ na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv)
                     reduce = SIZET2NUM(m);
                 }
             }
-            v = rb_funcall( INT2FIX(1), rb_intern("<<"), 1, INT2FIX(r) );
-            reduce = rb_funcall( reduce, rb_intern("|"), 1, v );
+            v = rb_funcall( INT2FIX(1), id_shift_left, 1, INT2FIX(r) );
+            reduce = rb_funcall( reduce, '|', 1, v );
         }
     }
+    RB_GC_GUARD(axes);
     if (reduce==Qnil) reduce = SIZET2NUM(m);
     return reduce;
 }
 
-//--------------------------------------
-
-/*
-void
-na_index_arg_to_internal_order( int argc, VALUE *argv, VALUE self )
-{
-    int i,j;
-    VALUE tmp;
-
-    if (TEST_COLUMN_MAJOR(self)) {
-	for (i=0,j=argc-1; i<argc/2; i++,j--) {
-	    tmp = argv[i];
-	    argv[i] = argv[j];
-	    argv[j] = tmp;
-	}
-    }
-}
-
-VALUE
-na_index_array_to_internal_order( VALUE args, VALUE self )
-{
-    int i,j;
-
-    if (TEST_COLUMN_MAJOR(self)) {
-	return rb_funcall( args, rb_intern("reverse"), 0 );
-    }
-    return args;
-}
-*/
-
 
 /*
   Return true if column major.
@@ -1661,20 +1661,20 @@ VALUE na_out_of_place_bang( VALUE self )
 
 int na_debug_flag=0;
 
-VALUE na_debug_set(VALUE mod, VALUE flag)
+static VALUE na_debug_set(VALUE mod, VALUE flag)
 {
     na_debug_flag = RTEST(flag);
     return Qnil;
 }
 
-double na_profile_value=0;
+static double na_profile_value=0;
 
-VALUE na_profile(VALUE mod)
+static VALUE na_profile(VALUE mod)
 {
     return rb_float_new(na_profile_value);
 }
 
-VALUE na_profile_set(VALUE mod, VALUE val)
+static VALUE na_profile_set(VALUE mod, VALUE val)
 {
     na_profile_value = NUM2DBL(val);
     return val;
@@ -1759,7 +1759,7 @@ na_equal(VALUE self, volatile VALUE other)
     GetNArray(self,na1);
 
     if (!rb_obj_is_kind_of(other,cNArray)) {
-        other = rb_funcall(CLASS_OF(self), rb_intern("cast"), 1, other);
+        other = rb_funcall(CLASS_OF(self), id_cast, 1, other);
     }
 
     GetNArray(other,na2);
@@ -1771,8 +1771,8 @@ na_equal(VALUE self, volatile VALUE other)
             return Qfalse;
         }
     }
-    vbool = rb_funcall(self, rb_intern("eq"), 1, other);
-    return (rb_funcall(vbool, rb_intern("count_false"), 0)==INT2FIX(0)) ? Qtrue : Qfalse;
+    vbool = rb_funcall(self, id_eq, 1, other);
+    return (rb_funcall(vbool, id_count_false, 0)==INT2FIX(0)) ? Qtrue : Qfalse;
 }
 
 
@@ -1783,7 +1783,14 @@ Init_narray()
 {
     mNumo = rb_define_module("Numo");
 
-    /* define NArray class */
+    /*
+      Document-class: Numo::NArray
+
+      Numo::NArray is the abstract super class for
+      Numerical N-dimensional Array in the Ruby/Numo module.
+      Use Typed Subclasses of NArray (Numo::DFloat, Int32, etc)
+      to create data array instances.
+    */
     cNArray = rb_define_class_under(mNumo, "NArray", rb_cObject);
 
 #ifndef HAVE_RB_CCOMPLEX
@@ -1808,7 +1815,7 @@ Init_narray()
     rb_define_singleton_method(cNArray, "inspect_cols=", na_inspect_cols_set, 1);
 
     /* Ruby allocation framework  */
-    rb_define_alloc_func(cNArray, na_s_allocate);
+    rb_undef_alloc_func(cNArray);
     rb_define_method(cNArray, "initialize", na_initialize, -2);
     rb_define_method(cNArray, "initialize_copy", na_initialize_copy, 1);
 
@@ -1826,7 +1833,7 @@ Init_narray()
     rb_define_alias (cNArray, "rank","ndim");
     rb_define_method(cNArray, "empty?", na_empty_p, 0);
 
-    rb_define_method(cNArray, "debug_info", rb_narray_debug_info, 0);
+    rb_define_method(cNArray, "debug_info", nary_debug_info, 0);
 
     rb_define_method(cNArray, "contiguous?", na_check_contiguous, 0);
 
@@ -1867,7 +1874,22 @@ Init_narray()
     id_allocate = rb_intern("allocate");
     id_contiguous_stride = rb_intern(CONTIGUOUS_STRIDE);
     //id_element_bit_size = rb_intern(ELEMENT_BIT_SIZE);
-    //id_element_byte_size = rb_intern(ELEMENT_BYTE_SIZE);
+    id_element_byte_size = rb_intern(ELEMENT_BYTE_SIZE);
+
+    id_fill        = rb_intern("fill");
+    id_seq         = rb_intern("seq");
+    id_logseq      = rb_intern("logseq");
+    id_eye         = rb_intern("eye");
+    id_UPCAST      = rb_intern("UPCAST");
+    id_cast        = rb_intern("cast");
+    id_dup         = rb_intern("dup");
+    id_to_host     = rb_intern("to_host");
+    id_bracket     = rb_intern("[]");
+    id_shift_left  = rb_intern("<<");
+    id_eq          = rb_intern("eq");
+    id_count_false = rb_intern("count_false");
+    id_axis        = rb_intern("axis");
+    id_nan         = rb_intern("nan");
 
     sym_reduce   = ID2SYM(rb_intern("reduce"));
     sym_option   = ID2SYM(rb_intern("option"));
@@ -1878,26 +1900,28 @@ Init_narray()
     Init_nary_index();
 
     Init_nary_data();
+    Init_nary_ndloop();
+
+    Init_numo_dcomplex();
+    Init_numo_dfloat();
+    Init_numo_scomplex();
+    Init_numo_sfloat();
+
+    Init_numo_int64();
+    Init_numo_uint64();
+    Init_numo_int32();
+    Init_numo_uint32();
+    Init_numo_int16();
+    Init_numo_uint16();
+    Init_numo_int8();
+    Init_numo_uint8();
 
-    Init_nary_dcomplex();
-    Init_nary_dfloat();
-    Init_nary_scomplex();
-    Init_nary_sfloat();
-
-    Init_nary_int64();
-    Init_nary_uint64();
-    Init_nary_int32();
-    Init_nary_uint32();
-    Init_nary_int16();
-    Init_nary_uint16();
-    Init_nary_int8();
-    Init_nary_uint8();
-    Init_nary_bit();
+    Init_numo_bit();
+    Init_numo_robject();
 
     Init_nary_math();
 
     Init_nary_rand();
     Init_nary_array();
     Init_nary_struct();
-    Init_nary_robject();
 }