numo-narray 0.9.0.4 → 0.9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344742df38a815d85e70962da4cdb85969d816a2
-  data.tar.gz: 6da0a54faee1813628901213587213618ce696bc
+  metadata.gz: ee92d774c7adbc21131b5d25b83f2cd83ffb2870
+  data.tar.gz: 185833b9b03560dfd494a000268f6d920883b343
 SHA512:
-  metadata.gz: 908a26721c4d03e7af632747cce53ba41465d6e2917dbb97505a04ab9d8008c6764889bc669d79d83952b36a21467f7d8c8913046cc46ebf8cda23e792d62f9f
-  data.tar.gz: caa3d25b088c2ab5376ee64daf88581e9eeb64a9febd6456a3780ce05b0535c065867a6f9a64913db96cf422a38843c1d1800f3d53bcb5417f773af42ca123fe
+  metadata.gz: 9c4de1ae4febaa26a8b7da95f2e3e97278e0e3ee208194926cc0ecfdc5bcf799dcac372a2b970c0d89102e6210bd239d2ca357a5c7598e7c54719ccc63d5ae35
+  data.tar.gz: e474764872f99bb8cab763d268b971674831ddfaafadb457749cc90c54440ff74f014a77b85617946c36ddd17e96f59906112103c3305bdb9d38b78781826b34

data/README.md

@@ -13,6 +13,14 @@ This project is the successor to [Ruby/NArray](http://masa16.github.io/narray/).
 
 under development
 
+## Documentation
+All documents are primitive.
+
+* [Numo::NArray API Doc](http://ruby-numo.github.io/narray/narray/frames.html)
+* [Numo::NArray vs numpy](https://github.com/ruby-numo/narray/wiki/Numo-vs-numpy)
+* [Numo::NArray vs ndarray](https://github.com/ruby-numo/narray/wiki/Numo-vs-ndarray)
+* [Numo::NArray Overview](https://github.com/ruby-numo/narray/wiki/Numo::NArray%E6%A6%82%E8%A6%81) (in Japanese)
+
 ## Related Projects
 * [Numo::Linalg](https://github.com/ruby-numo/linalg) - Linear Algebra library with [LAPACK](http://www.netlib.org/lapack/).
 * [Numo::GSL](https://github.com/ruby-numo/gsl) - Ruby interface for [GSL (GNU Scientific Library)](http://www.gnu.org/software/gsl/).
@@ -20,6 +28,9 @@ under development
 * [Numo::Gnuplot](https://github.com/ruby-numo/gnuplot) - Simple and easy-to-use Gnuplot interface.
 
 ## Installation
+### Requirement
+Ruby ver 2.1 and later.
+
 ### Ubuntu, Debian, Bash on Windows
 ```shell
 apt install -y git ruby gcc ruby-dev rake make
@@ -47,11 +58,3 @@ An example
 => 15
 ```
 For more examples, check out this [narray version of 100 numpy exercises](https://github.com/ruby-numo/narray/wiki/100-narray-exercises) (and the [IRuby Notebook](https://github.com/ruby-numo/narray/blob/master/100-narray-exercises.ipynb)).
-
-## Documentation
-
-All documents are primitive.
-
-* [Numo::NArray API Doc](http://ruby-numo.github.io/narray/narray/frames.html)
-* [Numo::NArray概要](https://github.com/ruby-numo/narray/wiki/Numo::NArray%E6%A6%82%E8%A6%81) (in Japanese)
-* [Numo::NArray vs numpy](https://github.com/ruby-numo/narray/wiki/Numo-vs-numpy)

data/Rakefile

@@ -52,5 +52,14 @@ namespace :release do
   end
 end
 
+task :doc do
+  dir = "ext/numo/narray"
+  src = %w[array.c data.c index.c math.c narray.c rand.c struct.c].
+    map{|s| File.join(dir,s)} +
+    [File.join(dir,"types/*.c"), "lib/numo/narray/extra.rb"]
+  sh "cd ext/numo/narray; ruby extconf.rb; make src"
+  sh "rm -rf yard .yardoc; yard doc -o yard -r README.md #{src.join(' ')}"
+end
+
 rescue LoadError
 end

data/ext/numo/narray/array.c

@@ -1,13 +1,12 @@
 /*
   array.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"
-//#include "narray_local.h"
 
-/* Multi-Dimensional Array Investigation */
+// mdai: Multi-Dimensional Array Investigation
 typedef struct {
   size_t shape;
   VALUE  val;
@@ -25,6 +24,53 @@ typedef struct {
 enum { NA_NONE, NA_BIT, NA_INT32, NA_INT64, NA_RATIONAL,
        NA_DFLOAT, NA_DCOMPLEX, NA_ROBJ, NA_NTYPES };
 
+static ID id_begin;
+static ID id_end;
+static ID id_step;
+static ID id_abs;
+static ID id_cast;
+static ID id_le;
+static ID id_Complex;
+
+typedef struct {
+    int     ndim;
+    size_t *shape;
+    VALUE   dtype;
+} na_compose_t;
+
+static size_t
+na_compose_memsize(const void *ptr)
+{
+    const na_compose_t *nc = (const na_compose_t*)ptr;
+
+    return sizeof(na_compose_t) + nc->ndim * sizeof(size_t);
+}
+
+static void
+na_compose_free(void *ptr)
+{
+    na_compose_t *nc = (na_compose_t*)ptr;
+
+    if (nc->shape)
+        xfree(nc->shape);
+    xfree(nc);
+}
+
+static void
+na_compose_gc_mark(void* nc)
+{
+    rb_gc_mark(((na_compose_t*)nc)->dtype);
+}
+
+static const rb_data_type_t  compose_data_type = {
+    "Numo::NArray/compose",
+    {na_compose_gc_mark, na_compose_free, na_compose_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
+};
+
+#define WrapCompose(p) TypedData_Wrap_Struct(rb_cData, &compose_data_type, (void*)(p));
+#define GetCompose(v,p) TypedData_Get_Struct(v, na_compose_t, &compose_data_type, p)
+
 static VALUE
  na_object_type(int type, VALUE v)
 {
@@ -47,8 +93,8 @@ static VALUE
 	return type;
     case T_BIGNUM:
 	if (type<NA_INT64) {
-	    v = rb_funcall(v,rb_intern("abs"),0);
-	    if (RTEST(rb_funcall(v,rb_intern("<="),1,int32_max))) {
+	    v = rb_funcall(v,id_abs,0);
+	    if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
 		if (type<NA_INT32)
 		    return NA_INT32;
 	    } else {
@@ -78,8 +124,8 @@ static VALUE
     case T_FIXNUM:
     case T_BIGNUM:
 	if (type<NA_INT64) {
-	    v = rb_funcall(v,rb_intern("abs"),0);
-	    if (RTEST(rb_funcall(v,rb_intern("<="),1,int32_max))) {
+	    v = rb_funcall(v,id_abs,0);
+	    if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
 		if (type<NA_INT32)
 		    return NA_INT32;
 	    } else {
@@ -98,7 +144,7 @@ static VALUE
 	return type;
 
     default:
-	if (CLASS_OF(v) == rb_const_get( rb_cObject, rb_intern("Complex") )) {
+	if (CLASS_OF(v) == rb_const_get( rb_cObject, id_Complex )) {
 	    return NA_DCOMPLEX;
 	}
     }
@@ -107,7 +153,7 @@ static VALUE
 
 
 #define MDAI_ATTR_TYPE(tp,v,attr) \
- {tp = na_object_type(tp,rb_funcall(v,rb_intern(attr),0));}
+ {tp = na_object_type(tp,rb_funcall(v,id_##attr,0));}
 
 void na_mdai_object_type(na_mdai_t *mdai, VALUE v)
 {
@@ -118,12 +164,12 @@ void na_mdai_object_type(na_mdai_t *mdai, VALUE v)
             mdai->na_type = na_upcast(CLASS_OF(v), mdai->na_type);
 	}
     } else if (rb_obj_is_kind_of(v, rb_cRange)) {
-        MDAI_ATTR_TYPE(mdai->type,v,"begin");
-        MDAI_ATTR_TYPE(mdai->type,v,"end");
+        MDAI_ATTR_TYPE(mdai->type,v,begin);
+        MDAI_ATTR_TYPE(mdai->type,v,end);
     } else if (rb_obj_is_kind_of(v, na_cStep)) {
-        MDAI_ATTR_TYPE(mdai->type,v,"begin");
-        MDAI_ATTR_TYPE(mdai->type,v,"end");
-        MDAI_ATTR_TYPE(mdai->type,v,"step");
+        MDAI_ATTR_TYPE(mdai->type,v,begin);
+        MDAI_ATTR_TYPE(mdai->type,v,end);
+        MDAI_ATTR_TYPE(mdai->type,v,step);
     } else {
 	mdai->type = na_object_type(mdai->type,v);
     }
@@ -166,8 +212,9 @@ na_mdai_realloc(na_mdai_t *mdai, int n_extra)
 }
 
 static void
-na_mdai_free(na_mdai_t *mdai)
+na_mdai_free(void *ptr)
 {
+    na_mdai_t *mdai = (na_mdai_t*)ptr;
     xfree(mdai->item);
     xfree(mdai);
 }
@@ -255,15 +302,9 @@ na_mdai_result(na_mdai_t *mdai, na_compose_t *nc)
 
     if (ndim>0) {
 	// Shape
-	//shape = ALLOC_N(size_t,i);
-	//for (i=0; i<*ndim; i++) {
-	//    shape[i] = mdai->item[i].shape;
-	//}
         nc->shape = shape = ALLOC_N(size_t,ndim);
         for (i=0; i<ndim; i++) {
             shape[i] = mdai->item[i].shape;
-            //printf("shape[%d]=%d\n",i,shape[i]);
-            //rb_ary_push( shape, SIZET2NUM(mdai->item[i].shape) );
         }
 
 	// DataType
@@ -301,6 +342,20 @@ na_mdai_result(na_mdai_t *mdai, na_compose_t *nc)
 }
 
 
+static size_t
+na_mdai_memsize(const void *ptr)
+{
+    const na_mdai_t *mdai = (const na_mdai_t*)ptr;
+
+    return sizeof(na_mdai_t) + mdai->capa * sizeof(na_mdai_item_t);
+}
+
+static const rb_data_type_t mdai_data_type = {
+    "Numo::NArray/mdai",
+    {NULL, na_mdai_free, na_mdai_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
+};
+
 VALUE
 na_ary_composition(VALUE ary)
 {
@@ -310,12 +365,19 @@ na_ary_composition(VALUE ary)
     int j;
 
     nc = ALLOC(na_compose_t);
-    vnc = Data_Wrap_Struct(rb_cData, 0, -1, nc);
+    vnc = WrapCompose(nc);
     if (TYPE(ary) == T_ARRAY) {
         mdai = na_mdai_alloc(ary);
-        vmdai = Data_Wrap_Struct(rb_cData, 0, na_mdai_free, mdai);
-        na_mdai_investigate(mdai, 1);
-        na_mdai_result(mdai, nc);
+        vmdai = TypedData_Wrap_Struct(rb_cData, &mdai_data_type, (void*)mdai);
+        if ( na_mdai_investigate(mdai, 1) ) {
+            // empty
+            nc->ndim = 1;
+            nc->shape = ALLOC_N(size_t, 1);
+            nc->shape[0] = 0;
+            nc->dtype = Qnil;
+        } else {
+            na_mdai_result(mdai, nc);
+        }
         rb_gc_force_recycle(vmdai);
     } else if (IsNArray(ary)) {
         narray_t *na;
@@ -333,28 +395,94 @@ na_ary_composition(VALUE ary)
 }
 
 
+static void
+na_ary_composition2(VALUE ary, VALUE *type, VALUE *shape)
+{
+    VALUE vnc, dshape;
+    na_compose_t *nc;
+    int i;
+
+    // investigate MD-Array
+    vnc = na_ary_composition(ary);
+    GetCompose(vnc,nc);
+    dshape = rb_ary_new2(nc->ndim);
+    for (i=0; i<nc->ndim; i++) {
+        rb_ary_push(dshape, SIZET2NUM(nc->shape[i]));
+    }
+    if (shape) {*shape = dshape;}
+    if (type) {*type = nc->dtype;}
+    RB_GC_GUARD(vnc);
+}
+
 static VALUE
 na_s_array_shape(VALUE mod, VALUE ary)
 {
-    volatile VALUE vnc;
     VALUE shape;
-    na_compose_t *nc;
-    int i;
 
     if (TYPE(ary)!=T_ARRAY) {
 	// 0-dimension
 	return rb_ary_new();
     }
-    // investigate MD-Array
-    vnc = na_ary_composition(ary);
-    Data_Get_Struct(vnc, na_compose_t, nc);
-    shape = rb_ary_new2(nc->ndim);
-    for (i=0; i<nc->ndim; i++) {
-        rb_ary_push( shape, SIZET2NUM(nc->shape[i]) );
-    }
+    na_ary_composition2(ary, 0, &shape);
     return shape;
 }
 
+static inline void
+check_subclass_of_narray(VALUE dtype) {
+    if (RTEST(rb_obj_is_kind_of(dtype, rb_cClass))) {
+        if (RTEST(rb_funcall(dtype, id_le, 1, cNArray))) {
+            return;
+        }
+    }
+    rb_raise(nary_eCastError, "cannot convert to NArray");
+}
+
+
+/*
+  Generate new unallocated NArray instance with shape and type defined from obj.
+  Numo::NArray.new_like(obj) returns instance whose type is defined from obj.
+  Numo::DFloat.new_like(obj) returns DFloat instance.
+
+  @overload new_like(obj)
+  @param [Numeric,Array,Numo::NArray] obj
+  @return [Numo::NArray]
+  @example
+    Numo::NArray.new_like([[1,2,3],[4,5,6]])
+    => Numo::Int32#shape=[2,3](empty)
+    Numo::DFloat.new_like([[1,2],[3,4]])
+    => Numo::DFloat#shape=[2,2](empty)
+    Numo::NArray.new_like([1,2i,3])
+    => Numo::DComplex#shape=[3](empty)
+*/
+VALUE
+na_s_new_like(VALUE type, VALUE obj)
+{
+    VALUE vnc, newary;
+    na_compose_t *nc;
+
+    if (RTEST(rb_obj_is_kind_of(obj,rb_cNumeric))) {
+        // investigate type
+        if (type == cNArray) {
+            vnc = na_ary_composition(rb_ary_new3(1,obj));
+            GetCompose(vnc,nc);
+            type = nc->dtype;
+        }
+        check_subclass_of_narray(type);
+        newary = nary_new(type, 0, 0);
+    } else {
+        // investigate MD-Array
+        vnc = na_ary_composition(obj);
+        GetCompose(vnc,nc);
+        if (type == cNArray) {
+            type = nc->dtype;
+        }
+        check_subclass_of_narray(type);
+        newary = nary_new(type, nc->ndim, nc->shape);
+    }
+    RB_GC_GUARD(vnc);
+    return newary;
+}
+
 
 VALUE
 na_ary_composition_dtype(VALUE ary)
@@ -365,7 +493,7 @@ na_ary_composition_dtype(VALUE ary)
     switch(TYPE(ary)) {
     case T_ARRAY:
         vnc = na_ary_composition(ary);
-        Data_Get_Struct(vnc, na_compose_t, nc);
+        GetCompose(vnc,nc);
         return nc->dtype;
     }
     return CLASS_OF(ary);
@@ -379,6 +507,7 @@ na_s_array_type(VALUE mod, VALUE ary)
 
 
 
+
 /*
   Generate NArray object. NArray datatype is automatically selected.
   @overload [](elements)
@@ -393,16 +522,9 @@ nary_s_bracket(VALUE klass, VALUE ary)
     if (TYPE(ary)!=T_ARRAY) {
         rb_bug("Argument is not array");
     }
-
     dtype = na_ary_composition_dtype(ary);
-
-    if (RTEST(rb_obj_is_kind_of(dtype,rb_cClass))) {
-        if (RTEST(rb_funcall(dtype,rb_intern("<="),1,cNArray))) {
-            return rb_funcall(dtype,rb_intern("cast"),1,ary);
-        }
-    }
-    rb_raise(nary_eCastError, "cannot convert to NArray");
-    return Qnil;
+    check_subclass_of_narray(dtype);
+    return rb_funcall(dtype, id_cast, 1, ary);
 }
 
 
@@ -497,10 +619,10 @@ na_ary_composition_for_struct(VALUE nstruct, VALUE ary)
 
     mdai = na_mdai_alloc(ary);
     mdai->na_type = nstruct;
-    vmdai = Data_Wrap_Struct(rb_cData, 0, na_mdai_free, mdai);
+    vmdai = TypedData_Wrap_Struct(rb_cData, &mdai_data_type, (void*)mdai);
     na_mdai_for_struct(mdai, 0);
     nc = ALLOC(na_compose_t);
-    vnc = Data_Wrap_Struct(rb_cData, 0, -1, nc);
+    vnc = WrapCompose(nc);
     na_mdai_result(mdai, nc);
     //fprintf(stderr,"nc->ndim=%d\n",nc->ndim);
     rb_gc_force_recycle(vmdai);
@@ -515,6 +637,15 @@ Init_nary_array()
     //rb_define_singleton_method(cNArray, "mdai", na_mdai, 1);
     rb_define_singleton_method(cNArray, "array_shape", na_s_array_shape, 1);
     rb_define_singleton_method(cNArray, "array_type", na_s_array_type, 1);
+    rb_define_singleton_method(cNArray, "new_like", na_s_new_like, 1);
 
     rb_define_singleton_method(cNArray, "[]", nary_s_bracket, -2);
+
+    id_begin   = rb_intern("begin");
+    id_end     = rb_intern("end");
+    id_step    = rb_intern("step");
+    id_cast    = rb_intern("cast");
+    id_abs     = rb_intern("abs");
+    id_le      = rb_intern("<=");
+    id_Complex = rb_intern("Complex");
 }

data/ext/numo/narray/data.c

@@ -1,13 +1,19 @@
 /*
   data.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"
 #include "numo/template.h"
 
+static VALUE sym_mulsum;
+static ID id_mulsum;
+static ID id_respond_to_p;
+static ID id_store;
+static ID id_swap_byte;
+
 // ---------------------------------------------------------------------
 
 #define LOOP_UNARY_PTR(lp,proc)                    \
@@ -74,7 +80,7 @@ na_copy(VALUE self)
 VALUE
 na_store(VALUE self, VALUE src)
 {
-    return rb_funcall(self,rb_intern("store"),1,src);
+    return rb_funcall(self,id_store,1,src);
 }
 
 // ---------------------------------------------------------------------
@@ -125,7 +131,7 @@ nary_to_network(VALUE self)
     if (TEST_BIG_ENDIAN(self)) {
         return self;
     }
-    return rb_funcall(self, rb_intern("swap_byte"), 0);
+    return rb_funcall(self, id_swap_byte, 0);
 }
 
 static VALUE
@@ -134,7 +140,7 @@ nary_to_vacs(VALUE self)
     if (TEST_LITTLE_ENDIAN(self)) {
         return self;
     }
-    return rb_funcall(self, rb_intern("swap_byte"), 0);
+    return rb_funcall(self, id_swap_byte, 0);
 }
 
 static VALUE
@@ -143,7 +149,7 @@ nary_to_host(VALUE self)
     if (TEST_HOST_ORDER(self)) {
         return self;
     }
-    return rb_funcall(self, rb_intern("swap_byte"), 0);
+    return rb_funcall(self, id_swap_byte, 0);
 }
 
 static VALUE
@@ -152,12 +158,79 @@ nary_to_swapped(VALUE self)
     if (TEST_BYTE_SWAPPED(self)) {
         return self;
     }
-    return rb_funcall(self, rb_intern("swap_byte"), 0);
+    return rb_funcall(self, id_swap_byte, 0);
 }
 
 
 //----------------------------------------------------------------------
 
+static inline int
+check_axis(int axis, int ndim)
+{
+    if (axis < -ndim || axis >= ndim) {
+        rb_raise(nary_eDimensionError,"invalid axis (%d for %d-dimension)",
+                 axis, ndim);
+    }
+    if (axis < 0) {
+        axis += ndim;
+    }
+    return axis;
+}
+
+/*
+  Interchange two axes.
+  @overload  swapaxes(axis1,axis2)
+  @param [Integer] axis1
+  @param [Integer] axis2
+  @return [Numo::NArray]  view of NArray.
+  @example
+    x = Numo::Int32[[1,2,3]]
+
+    p x.swapaxes(0,1)
+    # Numo::Int32(view)#shape=[3,1]
+    # [[1],
+    #  [2],
+    #  [3]]
+
+    p x = Numo::Int32[[[0,1],[2,3]],[[4,5],[6,7]]]
+    # Numo::Int32#shape=[2,2,2]
+    # [[[0, 1],
+    #   [2, 3]],
+    #  [[4, 5],
+    #   [6, 7]]]
+
+    p x.swapaxes(0,2)
+    # Numo::Int32(view)#shape=[2,2,2]
+    # [[[0, 4],
+    #   [2, 6]],
+    #  [[1, 5],
+    #   [3, 7]]]
+*/
+VALUE
+na_swapaxes(VALUE self, VALUE a1, VALUE a2)
+{
+    int  i, j, ndim;
+    size_t tmp_shape;
+    stridx_t tmp_stridx;
+    narray_view_t *na;
+    volatile VALUE view;
+
+    view = na_make_view(self);
+    GetNArrayView(view,na);
+
+    ndim = na->base.ndim;
+    i = check_axis(NUM2INT(a1), ndim);
+    j = check_axis(NUM2INT(a2), ndim);
+
+    tmp_shape = na->base.shape[i];
+    tmp_stridx = na->stridx[i];
+    na->base.shape[i] = na->base.shape[j];
+    na->stridx[i] = na->stridx[j];
+    na->base.shape[j] = tmp_shape;
+    na->stridx[j] = tmp_stridx;
+
+    return view;
+}
 
 VALUE
 na_transpose_map(VALUE self, int *map)
@@ -305,7 +378,7 @@ na_reshape(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "Total size must be same");
     }
 
-    copy = rb_funcall(self,rb_intern("copy"),0);
+    copy = rb_funcall(self,rb_intern("dup"),0);
     GetNArray(copy,na);
     //shape_save = NA_SHAPE(na);
     na_setup_shape(na,argc,shape);
@@ -334,6 +407,9 @@ na_flatten_dim(VALUE self, int sd)
     GetNArray(self,na);
     nd = na->ndim;
 
+    if (nd==0) {
+        return na_make_view(self);
+    }
     if (sd<0 || sd>=nd) {
         rb_bug("na_flaten_dim: start_dim (%d) out of range",sd);
     }
@@ -361,9 +437,9 @@ na_flatten_dim(VALUE self, int sd)
     switch(na->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
-        stride = na_get_elmsz(self);
+        stride = nary_element_stride(self);
         for (i=sd+1; i--; ) {
-            //printf("data: i=%d stride=%d\n",i,stride);
+            //printf("data: i=%d shpae[i]=%ld stride=%ld\n",i,shape[i],stride);
             SDX_SET_STRIDE(na2->stridx[i],stride);
             stride *= shape[i];
         }
@@ -435,85 +511,6 @@ na_flatten(VALUE self)
     return na_flatten_dim(self,0);
 }
 
-
-VALUE
- na_flatten_by_reduce(int argc, VALUE *argv, VALUE self)
-{
-    size_t  sz_reduce=1;
-    int     i, j, ndim;
-    int     nd_reduce=0, nd_rest=0;
-    int    *dim_reduce, *dim_rest;
-    int    *map;
-    volatile VALUE view, reduce;
-    narray_t *na;
-
-    //puts("pass1");
-    //rb_p(self);
-    reduce = na_reduce_dimension(argc, argv, 1, &self);
-    //reduce = INT2FIX(1);
-    //rb_p(self);
-    //puts("pass2");
-
-    if (reduce==INT2FIX(0)) {
-	//puts("pass flatten_dim");
-        //rb_funcall(self,rb_intern("debug_info"),0);
-        //rb_p(self);
-	view = na_flatten_dim(self,0);
-        //rb_funcall(view,rb_intern("debug_info"),0);
-        //rb_p(view);
-    } else {
-        //printf("reduce=0x%x\n",NUM2INT(reduce));
-	GetNArray(self,na);
-	ndim = na->ndim;
-	if (ndim==0) {
-	    rb_raise(rb_eStandardError,"cannot flatten scalar(dim-0 array)");
-	    return Qnil;
-	}
-	map = ALLOC_N(int,ndim);
-	dim_reduce = ALLOC_N(int,ndim);
-	dim_rest = ALLOC_N(int,ndim);
-	for (i=0; i<ndim; i++) {
-	    if (na_test_reduce( reduce, i )) {
-		sz_reduce *= na->shape[i];
-		//printf("i=%d, nd_reduce=%d, na->shape[i]=%ld\n", i, nd_reduce, na->shape[i]);
-		dim_reduce[nd_reduce++] = i;
-	    } else {
-		//shape[nd_rest] = na->shape[i];
-		//sz_rest *= na->shape[i];
-		//printf("i=%d, nd_rest=%d, na->shape[i]=%ld\n", i, nd_rest, na->shape[i]);
-		dim_rest[nd_rest++] = i;
-	    }
-	}
-	for (i=0; i<nd_rest; i++) {
-	    map[i] = dim_rest[i];
-	    //printf("dim_rest[i=%d]=%d\n",i,dim_rest[i]);
-	    //printf("map[i=%d]=%d\n",i,map[i]);
-	}
-	for (j=0; j<nd_reduce; j++,i++) {
-	    map[i] = dim_reduce[j];
-	    //printf("dim_reduce[j=%d]=%d\n",j,dim_reduce[j]);
-	    //printf("map[i=%d]=%d\n",i,map[i]);
-	}
-	xfree(dim_reduce);
-	xfree(dim_rest);
-        //for (i=0; i<ndim; i++) {
-        //    printf("map[%d]=%d\n",i,map[i]);
-        //}
-	//puts("pass transpose_map");
-	view = na_transpose_map(self,map);
-	xfree(map);
-        //rb_p(view);
-	//rb_funcall(view,rb_intern("debug_print"),0);
-
-	//puts("pass flatten_dim");
-	view = na_flatten_dim(view,nd_rest);
-	//rb_funcall(view,rb_intern("debug_print"),0);
-        //rb_p(view);
-    }
-    return view;
-}
-
-
 //----------------------------------------------------------------------
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
@@ -665,7 +662,7 @@ na_diagonal(int argc, VALUE *argv, VALUE self)
     case NARRAY_FILEMAP_T:
         na2->offset = 0;
         na2->data = self;
-        stride = stride0 = stride1 = na_get_elmsz(self);
+        stride = stride0 = stride1 = nary_element_stride(self);
         for (i=nd,k=nd-2; i--; ) {
             if (i==ax[1]) {
                 stride1 = stride;
@@ -792,7 +789,7 @@ na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
             }
         }
         na_setup_shape((narray_t*)na2, nd, shape);
-        stride = na_get_elmsz(self);
+        stride = nary_element_stride(self);
         for (i=nd; i--;) {
             SDX_SET_STRIDE(na2->stridx[i], stride);
             stride *= shape[i];
@@ -858,35 +855,40 @@ na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
 static VALUE
 numo_na_dot(VALUE self, VALUE other)
 {
-    VALUE test, sym_mulsum;
+    VALUE test;
     volatile VALUE a1=self, a2=other;
-    ID id_mulsum;
     narray_t *na1, *na2;
 
-    id_mulsum = rb_intern("mulsum");
-    sym_mulsum = ID2SYM(id_mulsum);
-    test = rb_funcall(a1, rb_intern("respond_to?"), 1, sym_mulsum);
+    test = rb_funcall(a1, id_respond_to_p, 1, sym_mulsum);
     if (!RTEST(test)) {
         rb_raise(rb_eNoMethodError,"requires mulsum method for dot method");
     }
     GetNArray(a1,na1);
     GetNArray(a2,na2);
+    if (na1->ndim==0 || na2->ndim==0) {
+        rb_raise(nary_eDimensionError,"zero dimensional narray");
+    }
     if (na2->ndim > 1) {
+        if (na1->shape[na1->ndim-1] != na2->shape[na2->ndim-2]) {
+            rb_raise(nary_eShapeError,"shape mismatch: self.shape[-1](=%"SZF"d) != other.shape[-2](=%"SZF"d)",
+                     na1->shape[na1->ndim-1], na2->shape[na2->ndim-2]);
+        }
         // insert new axis [ ..., last-1-dim, newaxis*other.ndim, last-dim ]
         a1 = na_new_dimension_for_dot(a1, na1->ndim-1, na2->ndim-1, 0);
         // insert & transpose [ newaxis*self.ndim, ..., last-dim, last-1-dim ]
         a2 = na_new_dimension_for_dot(a2, 0, na1->ndim-1, 1);
     }
-    return rb_funcall(a1,rb_intern("mulsum"),2,a2,INT2FIX(-1));
+    return rb_funcall(a1,id_mulsum,2,a2,INT2FIX(-1));
 }
 
 
 void
 Init_nary_data()
 {
-    rb_define_method(cNArray, "copy", na_copy, 0);
+    rb_define_method(cNArray, "copy", na_copy, 0); // deprecated
 
     rb_define_method(cNArray, "flatten", na_flatten, 0);
+    rb_define_method(cNArray, "swapaxes", na_swapaxes, 2);
     rb_define_method(cNArray, "transpose", na_transpose, -1);
 
     rb_define_method(cNArray, "reshape", na_reshape,-1);
@@ -913,4 +915,10 @@ Init_nary_data()
     rb_define_method(cNArray, "to_swapped", nary_to_swapped, 0);
 
     rb_define_method(cNArray, "dot", numo_na_dot, 1);
+
+    id_mulsum       = rb_intern("mulsum");
+    sym_mulsum      = ID2SYM(id_mulsum);
+    id_respond_to_p = rb_intern("respond_to?");
+    id_store        = rb_intern("store");
+    id_swap_byte    = rb_intern("swap_byte");
 }