numo-narray 0.9.1.1 → 0.9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9851b8d675467f0aa278a6600a631ba1d5a86e5a478ff5f51a6835ba1777d4
-  data.tar.gz: c0966fbbe3878466b39cee78282b7c5476f40529db98d86a57ccd0814fbe14fb
+  metadata.gz: 21795de8941d7b8176772c41039e4d8a5b3ae03a51090f6ee2979f257de88d43
+  data.tar.gz: ff44506a3ce17bed9b927c23bf0c92395e1c1c54b8ccfcff9edc0aa6edb833c5
 SHA512:
-  metadata.gz: e04617bfa3066a4b021636582bbd7476f0c68ff3b262904679e1922b830d9ea8e3e90873c9a47d05052575afd4828c41f66d9d093ba812ca7891a24e1812f47a
-  data.tar.gz: 0662567f04b57c0e62a30d36841a17441c92aec4e36cff5a9027561a255263ac73125efb96eb97e18f4f90bc3ce452f24e303c9492f878bffdf89652f0e4748e
+  metadata.gz: 1be858a3b1ba7c5028dea3a034ecc4b70ff9e41711957b8989e58a517f911bf41849c84a0f64ec1beb993416b42675384e3e035179910b724692613f765b10cc
+  data.tar.gz: 7db10683049eab739ee97f3599112ea95566ed223d4e24b020cfe400011ae0d6ad862ed01080c50fe3dd3546c508286b70abd4f0c3a7fdec6a977655e08957ba

data/ext/numo/narray/extconf.rb

@@ -17,7 +17,8 @@ $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)']
+  $DLDFLAGS << " -Wl,--export-all,--out-implib=libnarray.a"
+  $INSTALLFILES << ['./libnarray.a', '$(archdir)']
 end
 
 srcs = %w(

data/ext/numo/narray/gen/tmpl/format_to_a.c

@@ -37,7 +37,7 @@ static void
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
-    volatile VALUE fmt=Qnil;
+    VALUE fmt=Qnil;
     ndfunc_arg_in_t ain[3] = {{Qnil,0},{sym_loop_opt},{sym_option}};
     ndfunc_arg_out_t aout[1] = {{rb_cArray,0}}; // dummy?
     ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP_NIP, 3, 1, ain, aout };

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

@@ -38,7 +38,7 @@ static void
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
-    volatile VALUE fmt=Qnil;
+    VALUE fmt=Qnil;
     ndfunc_arg_in_t ain[3] = {{Qnil,0},{sym_loop_opt},{sym_option}};
     ndfunc_arg_out_t aout[1] = {{rb_cArray,0}}; // dummy?
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP_NIP, 3,1, ain,aout};

data/ext/numo/narray/narray.c

@@ -631,12 +631,6 @@ na_get_pointer_for_rw(VALUE self, int flag)
         if ((flag & WRITE) && OBJ_FROZEN(obj)) {
             rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
         }
-
-        if (flag & WRITE) {
-            if (OBJ_FROZEN(obj)) {
-                rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
-            }
-        }
         GetNArray(obj,na);
         switch(NA_TYPE(na)) {
         case NARRAY_DATA_T:

data/ext/numo/narray/narray.def

@@ -0,0 +1,28 @@
+EXPORTS
+Init_narray
+nary_new
+nary_view_new
+nary_debug_info
+nary_make_view
+nary_element_stride
+nary_dtype_element_stride
+nary_get_pointer
+nary_get_pointer_for_write
+nary_get_pointer_for_read
+nary_get_pointer_for_read_write
+nary_get_offset
+nary_copy_flags
+nary_check_ladder
+nary_check_contiguous
+nary_flatten_dim
+nary_flatten
+nary_dup
+nary_store
+nary_reduce_dimension
+nary_reduce_options
+na_ndloop
+na_ndloop2
+na_ndloop3
+na_ndloop4
+nary_info_str
+nary_test_reduce

data/ext/numo/narray/ndloop.c

@@ -510,7 +510,7 @@ static void
 ndloop_set_stepidx(na_md_loop_t *lp, int j, VALUE vna, int *dim_map, int rwflag)
 {
     size_t n, s;
-    int i, k;
+    int i, k, nd;
     stridx_t sdx;
     narray_t *na;
 
@@ -528,6 +528,7 @@ ndloop_set_stepidx(na_md_loop_t *lp, int j, VALUE vna, int *dim_map, int rwflag)
         rb_bug("invalid value for read-write flag");
     }
     GetNArray(vna,na);
+    nd = LARG(lp,j).ndim;
 
     switch(NA_TYPE(na)) {
     case NARRAY_DATA_T:
@@ -540,13 +541,14 @@ ndloop_set_stepidx(na_md_loop_t *lp, int j, VALUE vna, int *dim_map, int rwflag)
         s = LARG(lp,j).elmsz;
         for (k=na->ndim; k--;) {
             n = na->shape[k];
-            if (n > 1) {
+            if (n > 1 || nd > 0) {
                 i = dim_map[k];
                 //printf("n=%d k=%d i=%d\n",n,k,i);
                 LITER(lp,i,j).step = s;
-                LITER(lp,i,j).idx = NULL;
+                //LITER(lp,i,j).idx = NULL;
             }
             s *= n;
+            nd--;
         }
         LITER(lp,0,j).pos = 0;
         break;
@@ -555,20 +557,21 @@ ndloop_set_stepidx(na_md_loop_t *lp, int j, VALUE vna, int *dim_map, int rwflag)
         for (k=0; k<na->ndim; k++) {
             n = na->shape[k];
             sdx = NA_VIEW_STRIDX(na)[k];
-            if (n > 1) {
+            if (n > 1 || nd > 0) {
                 i = dim_map[k];
                 if (SDX_IS_INDEX(sdx)) {
                     LITER(lp,i,j).step = 0;
                     LITER(lp,i,j).idx = SDX_GET_INDEX(sdx);
                 } else {
                     LITER(lp,i,j).step = SDX_GET_STRIDE(sdx);
-                    LITER(lp,i,j).idx = NULL;
+                    //LITER(lp,i,j).idx = NULL;
                 }
             } else if (n==1) {
                 if (SDX_IS_INDEX(sdx)) {
                     LITER(lp,0,j).pos += SDX_GET_INDEX(sdx)[0];
                 }
             }
+            nd--;
         }
         break;
     default:
@@ -621,8 +624,8 @@ na->shape[i] == lp->n[ dim_map[i] ]
             } else {
                 lp->xargs[j].flag = flag = NDL_READ;
             }
-            ndloop_set_stepidx(lp, j, v, dim_map, flag);
             LARG(lp,j).ndim = nf_dim;
+            ndloop_set_stepidx(lp, j, v, dim_map, flag);
             if (nf_dim > 0) {
                 LARG(lp,j).shape = na->shape + (na->ndim - nf_dim);
             }
@@ -787,8 +790,8 @@ ndloop_set_output_narray(ndfunc_t *nf, na_md_loop_t *lp, int k,
     }
 
     j = lp->nin + k;
-    ndloop_set_stepidx(lp, j, v, dim_map, flag);
     LARG(lp,j).ndim = nd = nf->aout[k].dim;
+    ndloop_set_stepidx(lp, j, v, dim_map, flag);
     if (nd > 0) {
         LARG(lp,j).shape = nf->aout[k].shape;
     }
@@ -981,7 +984,7 @@ ndfunc_set_bufcp(na_md_loop_t *lp, unsigned int loop_spec)
             if (LARG(lp,j).shape) {
                 n = LARG(lp,j).shape[i];
             } else {
-                printf("shape is NULL\n");
+                //printf("shape is NULL\n");
                 n = lp->user.n[i];
             }
             stride = sz * n;

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

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.1"
-#define NARRAY_VERSION_CODE 911
+#define NARRAY_VERSION "0.9.1.2"
+#define NARRAY_VERSION_CODE 912
 
 #include <math.h>
 #include "numo/compat.h"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.1
+  version: 0.9.1.2
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,6 +209,7 @@ files:
 - ext/numo/narray/kwargs.c
 - ext/numo/narray/math.c
 - ext/numo/narray/narray.c
+- ext/numo/narray/narray.def
 - ext/numo/narray/ndloop.c
 - ext/numo/narray/numo/compat.h
 - ext/numo/narray/numo/intern.h