numo-narray 0.9.0.1 → 0.9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58347719d04b964755bd500150ee70b9e69b51b0
-  data.tar.gz: 86ca7cead3efb09e35f4a9cc6377266cecc79df2
+  metadata.gz: 74f41e5ff035eb49ec0110722546783161a6fe34
+  data.tar.gz: 33bbc3eb268834b15aaa646ca2973efe7061da14
 SHA512:
-  metadata.gz: 93df96b4d8153ef292b17f5ae180b034749fddae09cc6f6363437037cc1faffbbdf967529b94e3aa34702748edd4ac1a1455bc3d70b91a90ec8bd2c5fe8bdc88
-  data.tar.gz: 1771284be1faa0a8a023104be3f7019ef02c16c04198075e11303bbec7988940dadac47a6697f2419c668e230fd4c5e3f751bb0517f61eccbd9b697fa7542bce
+  metadata.gz: 360c0c2e95a630ff7fd73adc08df094fe4d3d19072a98fc42cc1e781a1453eaf1c6d5c405db283d0dc744904407fe1e34e3fe97cf133468f751797c69f512133
+  data.tar.gz: 9025c1c48a50ddde9fd7bd8d86491165c9cf7cb373efeedf000799a2cf56e24ab21dfe6e4fa0d649fdd35c677c0de725fcf9b4588d8db6dac6a535c0b699e9c7

data/README.md

@@ -1,5 +1,6 @@
 # Numo::NArray - New NArray class library for Ruby/Numo (NUmerical MOdule)
 
+[![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/narray)
 [![Build Status](https://travis-ci.org/ruby-numo/narray.svg?branch=master)](https://travis-ci.org/ruby-numo/narray)
 
 under development
@@ -17,7 +18,7 @@ apt install -y git ruby gcc ruby-dev rake make
 git clone git://github.com/ruby-numo/narray
 cd narray
 gem build numo-narray.gemspec
-gem install numo-narray-0.9.0.1.gem
+gem install numo-narray-0.9.0.2.gem
 ```
 
 ## Quick start

data/ext/numo/narray/array.c

@@ -1,7 +1,7 @@
 /*
   array.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2011 by Masahiro TANAKA
+    (C) Copyright 1999-2016 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -268,7 +268,7 @@ na_mdai_result(na_mdai_t *mdai, na_compose_t *nc)
         for (i=0; i<ndim; i++) {
             shape[i] = mdai->item[i].shape;
             //printf("shape[%d]=%d\n",i,shape[i]);
-            //rb_ary_push( shape, SIZE2NUM(mdai->item[i].shape) );
+            //rb_ary_push( shape, SIZET2NUM(mdai->item[i].shape) );
         }
 
 	// DataType
@@ -355,7 +355,7 @@ na_s_array_shape(VALUE mod, VALUE 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, SIZE2NUM(nc->shape[i]) );
+        rb_ary_push( shape, SIZET2NUM(nc->shape[i]) );
     }
     return shape;
 }

data/ext/numo/narray/data.c

@@ -1,7 +1,7 @@
 /*
   data.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2011,2013 by Masahiro TANAKA
+    (C) Copyright 1999-2016 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -76,7 +76,6 @@ na_copy(VALUE self)
     return v;
 }
 
-
 VALUE
 na_store(VALUE self, VALUE src)
 {
@@ -198,65 +197,72 @@ na_transpose_map(VALUE self, int *map)
 VALUE
 na_transpose(int argc, VALUE *argv, VALUE self)
 {
-    int ndim, *map, tmp;
-    int row_major;
-    int i, j, c, r;
-    size_t len;
-    ssize_t beg, step;
-    volatile VALUE v, view;
+    int ndim, *map, *permute;
+    int i, d;
+    bool is_positive, is_negative;
     narray_t *na1;
 
     GetNArray(self,na1);
     ndim = na1->ndim;
-    row_major = TEST_COLUMN_MAJOR( self );
-
+    if (ndim < 2) {
+        if (argc > 0) {
+            rb_raise(rb_eArgError, "unnecessary argument for 1-d array");
+        }
+        return na_make_view(self);
+    }
     map = ALLOCA_N(int,ndim);
-    for (i=0;i<ndim;i++) {
-	map[i] = i;
-    }
-    if (argc==0) {
-	SWAP(map[ndim-1], map[ndim-2], tmp);
-	goto new_object;
-    }
-    if (argc==2) {
-	if (TYPE(argv[0])==T_FIXNUM && TYPE(argv[1])==T_FIXNUM) {
-	    i = FIX2INT(argv[0]);
-	    j = FIX2INT(argv[1]);
-	    if (row_major) {
-		i = ndim-1-i;
-		j = ndim-1-j;
-	    }
-	    SWAP( map[i], map[j], tmp );
-	    goto new_object;
-	}
+    if (argc == 0) {
+        for (i=0; i < ndim; i++) {
+            map[i] = ndim-1-i;
+        }
+        return na_transpose_map(self,map);
     }
-    for (i=argc,c=ndim-1; i;) {
-	v = argv[--i];
-	if (TYPE(v)==T_FIXNUM) {
-	    beg = FIX2INT(v);
-	    len = 1;
-	    step = 0;
-	} else if (rb_obj_is_kind_of(v,rb_cRange) || rb_obj_is_kind_of(v,na_cStep)) {
-            // write me
-	    nary_step_array_index(v, ndim, &len, &beg, &step);
-            //printf("len=%d beg=%d step=%d\n",len,beg,step);
-	}
-	for (j=len; j; ) {
-	    r = beg + step*(--j);
-	    if (row_major) {
-		r = ndim-1-r;
+    // with argument
+    if (argc > ndim) {
+        rb_raise(rb_eArgError, "more arguments than ndim");
+    }
+    for (i=0; i < ndim; i++) {
+        map[i] = i;
+    }
+    permute = ALLOCA_N(int,argc);
+    for (i=0; i < argc; i++) {
+        permute[i] = 0;
+    }
+    is_positive = is_negative = 0;
+    for (i=0; i < argc; i++) {
+	if (TYPE(argv[i]) != T_FIXNUM) {
+            rb_raise(rb_eArgError, "invalid argument");
+        }
+        d = FIX2INT(argv[i]);
+        if (d >= 0) {
+            if (d >= argc) {
+                rb_raise(rb_eArgError, "out of dimension range");
             }
-	    if ( c < 0 ) {
-		rb_raise(rb_eArgError, "too many dims");
+            if (is_negative) {
+                rb_raise(rb_eArgError, "dimension must be non-negative only or negative only");
             }
-	    map[c--] = r;
-	    //printf("r=%d\n",r);
-	}
+            if (permute[d]) {
+                rb_raise(rb_eArgError, "not permutation");
+            }
+            map[i] = d;
+            permute[d] = 1;
+            is_positive = 1;
+        } else {
+            if (d < -argc) {
+                rb_raise(rb_eArgError, "out of dimension range");
+            }
+            if (is_positive) {
+                rb_raise(rb_eArgError, "dimension must be non-negative only or negative only");
+            }
+            if (permute[argc+d]) {
+                rb_raise(rb_eArgError, "not permutation");
+            }
+            map[ndim-argc+i] = ndim+d;
+            permute[argc+d] = 1;
+            is_negative = 1;
+        }
     }
-
- new_object:
-    view = na_transpose_map(self,map);
-    return view;
+    return na_transpose_map(self,map);
 }
 
 //----------------------------------------------------------------------
@@ -304,7 +310,7 @@ na_reshape(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "Total size must be same");
     }
 
-    copy = na_copy(self);
+    copy = rb_funcall(self,rb_intern("copy"),0);
     GetNArray(copy,na);
     //shape_save = NA_SHAPE(na);
     na_setup_shape(na,argc,shape);
@@ -592,7 +598,7 @@ na_diagonal(int argc, VALUE *argv, VALUE self)
     }
 
     if (vofs) {
-        kofs = NUM2SSIZE(vofs);
+        kofs = NUM2SSIZET(vofs);
     } else {
         kofs = 0;
     }
@@ -627,15 +633,15 @@ na_diagonal(int argc, VALUE *argv, VALUE self)
         k0 = 0;
         k1 = kofs;
         if (k1 >= na->shape[ax[1]]) {
-            rb_raise(rb_eArgError,"invalid diagonal offset(%ld) for "
-                     "last dimension size(%ld)",kofs,na->shape[ax[1]]);
+            rb_raise(rb_eArgError,"invalid diagonal offset(%"SZF"d) for "
+                     "last dimension size(%"SZF"d)",kofs,na->shape[ax[1]]);
         }
     } else {
         k0 = -kofs;
         k1 = 0;
         if (k0 >= na->shape[ax[0]]) {
-            rb_raise(rb_eArgError,"invalid diagonal offset(=%ld) for "
-                     "last-1 dimension size(%ld)",kofs,na->shape[ax[0]]);
+            rb_raise(rb_eArgError,"invalid diagonal offset(=%"SZF"d) for "
+                     "last-1 dimension size(%"SZF"d)",kofs,na->shape[ax[0]]);
         }
     }
 
@@ -749,7 +755,7 @@ na_diagonal(int argc, VALUE *argv, VALUE self)
 static VALUE
 na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
 {
-    int i, k, nd;
+    int i, k, l, nd;
     size_t  j;
     size_t *idx1, *idx2;
     size_t *shape;
@@ -775,27 +781,25 @@ na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
     }
     nd += len;
     shape = ALLOCA_N(size_t,nd);
-    i = k = 0;
-    while (i < nd) {
-        if (i == pos) {
-            for (; len; len--) {
-                shape[i++] = 1;
-            }
-            pos = -1; // new axis done
-        } else {
-            shape[i++] = na->shape[k++];
-        }
-    }
-
-    na_setup_shape((narray_t*)na2, nd, shape);
     na2->stridx = ALLOC_N(stridx_t,nd);
 
     switch(na->type) {
     case NARRAY_DATA_T:
     case NARRAY_FILEMAP_T:
+        i = k = 0;
+        while (i < nd) {
+            if (i == pos && len > 0) {
+                for (l=0; l<len; l++) {
+                    shape[i++] = 1;
+                }
+            } else {
+                shape[i++] = na->shape[k++];
+            }
+        }
+        na_setup_shape((narray_t*)na2, nd, shape);
         stride = na_get_elmsz(self);
         for (i=nd; i--;) {
-            SDX_SET_STRIDE(na2->stridx[i],stride);
+            SDX_SET_STRIDE(na2->stridx[i], stride);
             stride *= shape[i];
         }
         na2->offset = 0;
@@ -803,18 +807,35 @@ na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
         break;
     case NARRAY_VIEW_T:
         GetNArrayView(self, na1);
-        for (i=0; i<nd; i++) {
-            if (SDX_IS_INDEX(na1->stridx[i])) {
-                idx1 = SDX_GET_INDEX(na1->stridx[i]);
-                idx2 = ALLOC_N(size_t,na1->base.shape[i]);
-                for (j=0; j<na1->base.shape[i]; j++) {
-                    idx2[j] = idx1[j];
+        i = k = 0;
+        while (i < nd) {
+            if (i == pos && len > 0) {
+                if (SDX_IS_INDEX(na1->stridx[k])) {
+                    stride = SDX_GET_INDEX(na1->stridx[k])[0];
+                } else {
+                    stride = SDX_GET_STRIDE(na1->stridx[k]);
+                }
+                for (l=0; l<len; l++) {
+                    shape[i] = 1;
+                    SDX_SET_STRIDE(na2->stridx[i], stride);
+                    i++;
                 }
-                SDX_SET_INDEX(na2->stridx[i],idx2);
             } else {
-                na2->stridx[i] = na1->stridx[i];
+                shape[i] = na1->base.shape[k];
+                if (SDX_IS_INDEX(na1->stridx[k])) {
+                    idx1 = SDX_GET_INDEX(na1->stridx[k]);
+                    idx2 = ALLOC_N(size_t,na1->base.shape[k]);
+                    for (j=0; j<na1->base.shape[k]; j++) {
+                        idx2[j] = idx1[j];
+                    }
+                    SDX_SET_INDEX(na2->stridx[i], idx2);
+                } else {
+                    na2->stridx[i] = na1->stridx[k];
+                }
+                i++; k++;
             }
         }
+        na_setup_shape((narray_t*)na2, nd, shape);
         na2->offset = na1->offset;
         na2->data = na1->data;
         break;

data/ext/numo/narray/depend.erb

@@ -17,17 +17,19 @@ C_TMPL = <%=Dir.glob("#{__dir__}/gen/tmpl/*.c").join(" ")%>
 
 COGEN = <%= __dir__ %>/gen/cogen.rb
 DTYPE = <%= __dir__ %>/gen/dtype.erb.c
-COGEN_DTYPE = $(COGEN) -l $(DTYPE)
 DEPENDS = $(C_TMPL) $(DTYPE) <%= __dir__ %>/gen/*.rb
 
-<% Dir.glob("#{__dir__}/gen/def/*.rb") do |s| %>
-types/<%=File.basename(s,".rb")%>.c: <%=s%> $(DEPENDS)
+<%
+   type_c = ["types/bit.c"]
+   type_rb = Dir.glob("#{__dir__}/gen/def/*.rb")
+   type_rb.each do |s|
+     type_c << c = "types/"+File.basename(s,".rb")+".c"
+%>
+<%=c%>: <%=s%> $(DEPENDS)
 	$(MAKEDIRS) $(@D) types
-	ruby $(COGEN_DTYPE) <%=s%> > $@
+	ruby $(COGEN) -l -o $@ $(DTYPE) <%=s%>
 <% end %>
 
-types/bit.c: <%= __dir__ %>/gen/bit.erb.c $(DEPENDS)
-	$(MAKEDIRS) $(@D) types
-	ruby $(COGEN) -l <%= __dir__ %>/gen/bit.erb.c > $@
+src : <%= type_c.join(" ") %>
 
 CLEANOBJS = *.o */*.o *.bak types/*.c

data/ext/numo/narray/extconf.rb

@@ -1,9 +1,5 @@
 require 'rbconfig.rb'
-
-#RbConfig::MAKEFILE_CONFIG["optflags"] = "-g3 -gdwarf-2"
-
 require 'mkmf'
-
 require "erb"
 
 if RUBY_VERSION < "2.0.0"
@@ -11,12 +7,15 @@ if RUBY_VERSION < "2.0.0"
   exit(1)
 end
 
+rm_f 'numo/extconf.h'
+
 #$CFLAGS="-g3 -O0 -Wall"
 #$CFLAGS=" $(cflags) -O3 -m64 -msse2 -funroll-loops"
 #$CFLAGS=" $(cflags) -O3"
 $INCFLAGS = "-Itypes #$INCFLAGS"
 
 $INSTALLFILES = Dir.glob(%w[numo/*.h numo/types/*.h]).map{|x| [x,'$(archdir)'] }
+$INSTALLFILES << ['numo/extconf.h','$(archdir)']
 if /cygwin|mingw/ =~ RUBY_PLATFORM
   $INSTALLFILES << ['libnarray.a', '$(archdir)']
 end
@@ -48,20 +47,6 @@ struct
 rand
 )
 
-=begin
-have_header("atlas/cblas.h")
-have_library("atlas")
-
-if have_library("blas")
-  if have_library("lapack")
-    srcs.push "linalg"
-    $defs.push "-DHAVE_LAPACK"
-  else
-    #$defs.delete "-DHAVE_LAPACK"
-  end
-end
-=end
-
 if have_header("stdbool.h")
   stdbool = "stdbool.h"
 else
@@ -91,19 +76,14 @@ have_type("int64_t", stdint)
 unless have_type("u_int64_t", stdint)
   have_type("uint64_t", stdint)
 end
-#have_library("m")
-#have_func("sincos")
-#have_func("asinh")
 have_func("exp10")
 
 have_var("rb_cComplex")
 have_var("rb_cFixnum")
-#have_func("rb_alloc_tmp_buffer", "ruby.h")
-#have_func("rb_free_tmp_buffer", "ruby.h")
 
 $objs = srcs.collect{|i| i+".o"}
 
-create_header
+create_header('numo/extconf.h')
 
 depend_path = File.join(__dir__, "depend")
 File.open(depend_path, "w") do |depend|

data/ext/numo/narray/gen/cogen.rb

@@ -4,9 +4,18 @@ libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
 $LOAD_PATH.unshift libpath
 
 require "erbpp/narray_def"
-if ARGV[0] == "-l"
-  require "erbpp/line_number"
-  ARGV.shift
+while true
+  if ARGV[0] == "-l"
+    require "erbpp/line_number"
+    ARGV.shift
+  elsif ARGV[0] == "-o"
+    ARGV.shift
+    $output = ARGV.shift
+    require "fileutils"
+    FileUtils.rm_f($output)
+  else
+    break
+  end
 end
 
 unless (1..2) === ARGV.size
@@ -15,4 +24,10 @@ unless (1..2) === ARGV.size
 end
 
 erb_path, type_file = ARGV
-DataType.new(erb_path, type_file).run
+
+if $output
+  s = DataType.new(erb_path, type_file).result
+  open($output,"w").write(s)
+else
+  DataType.new(erb_path, type_file).run
+end