numo-narray 0.9.1.2 → 0.9.1.3

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

@@ -1,4 +1,4 @@
-void
+static void
 <%=c_iter%>(na_loop_t *const lp)
 {
     size_t   i;

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

@@ -11,7 +11,7 @@ yield_each_with_index(dtype x, size_t *c, VALUE *a, int nd, int md)
 }
 
 
-void
+static void
 <%=c_iter%>(na_loop_t *const lp)
 {
     size_t   i;

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

@@ -11,7 +11,7 @@ static VALUE
   @overload inspect
   @return [String]
 */
-VALUE
+static VALUE
 <%=c_func(0)%>(VALUE ary)
 {
     return na_ndloop_inspect(ary, <%=c_iter%>, Qnil);

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

@@ -103,7 +103,7 @@ static VALUE
     g.idx0 = NULL;
     na_ndloop3(&ndf, &g, 2, mask, val);
 
-    view = na_s_allocate_view(CLASS_OF(val));
+    view = na_s_allocate_view(rb_obj_class(val));
     GetNArrayView(view, nv);
     na_setup_shape((narray_t*)nv, 1, &n_1);
 

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

@@ -1,4 +1,4 @@
-void
+static void
 <%=c_iter%>(na_loop_t *const lp)
 {
     size_t     i;

data/ext/numo/narray/index.c

@@ -82,7 +82,7 @@ static ID id_shift_left;
 static ID id_mask;
 
 
-void
+static void
 na_index_set_step(na_index_arg_t *q, int i, size_t n, size_t beg, ssize_t step)
 {
     q->n    = n;
@@ -93,7 +93,7 @@ na_index_set_step(na_index_arg_t *q, int i, size_t n, size_t beg, ssize_t step)
     q->orig_dim = i;
 }
 
-void
+static void
 na_index_set_scalar(na_index_arg_t *q, int i, ssize_t size, ssize_t x)
 {
     if (x < -size || x >= size)
@@ -567,7 +567,7 @@ VALUE na_aref_md_protected(VALUE data_value)
     } else {
         ndim_new = na_ndim_new_narray(ndim, q);
     }
-    view = na_s_allocate_view(CLASS_OF(self));
+    view = na_s_allocate_view(rb_obj_class(self));
 
     na_copy_flags(self, view);
     GetNArrayView(view,na2);
@@ -610,7 +610,7 @@ na_aref_md_ensure(VALUE data_value)
     return Qnil;
 }
 
-VALUE
+static VALUE
 na_aref_md(int argc, VALUE *argv, VALUE self, int keep_dim, int result_nd)
 {
     VALUE args; // should be GC protected
@@ -632,7 +632,7 @@ na_aref_md(int argc, VALUE *argv, VALUE self, int keep_dim, int result_nd)
         if (rb_obj_is_kind_of(idx, numo_cNArray)) {
             GetNArray(idx,nidx);
             if (NA_NDIM(nidx)>1) {
-                store = nary_new(CLASS_OF(self),NA_NDIM(nidx),NA_SHAPE(nidx));
+                store = nary_new(rb_obj_class(self),NA_NDIM(nidx),NA_SHAPE(nidx));
                 idx = na_flatten(idx);
                 RARRAY_ASET(args,0,idx);
             }
@@ -666,7 +666,7 @@ na_aref_main(int nidx, VALUE *idx, VALUE self, int keep_dim, int nd)
         return rb_funcall(self,id_dup,0);
     }
     if (nidx==1) {
-        if (CLASS_OF(*idx)==numo_cBit) {
+        if (rb_obj_class(*idx)==numo_cBit) {
             return rb_funcall(*idx,id_mask,1,self);
         }
     }
@@ -674,17 +674,6 @@ na_aref_main(int nidx, VALUE *idx, VALUE self, int keep_dim, int nd)
 }
 
 
-/* method: slice(idx1,idx2,...,idxN) */
-static VALUE na_slice(int argc, VALUE *argv, VALUE self)
-{
-    int nd;
-    size_t pos;
-
-    nd = na_get_result_dimension(self, argc, argv, 0, &pos);
-    return na_aref_main(argc, argv, self, 1, nd);
-}
-
-
 static int
 check_index_count(int argc, int na_ndim, int count_new, int count_rest)
 {
@@ -692,16 +681,18 @@ check_index_count(int argc, int na_ndim, int count_new, int count_rest)
 
     switch(count_rest) {
     case 0:
-        if (count_new == 0 && argc == 1) return 1;
+        if (argc == 1 && count_new == 0) return 1;
         if (argc == result_nd) return result_nd;
         rb_raise(rb_eIndexError,"# of index(=%i) should be "
-                 "equal to ndim(=%i)",argc,na_ndim);
+                 "equal to ndim(=%i) or 1", argc,na_ndim);
         break;
     case 1:
         if (argc-1 <= result_nd) return result_nd;
         rb_raise(rb_eIndexError,"# of index(=%i) > ndim(=%i) with :rest",
                  argc,na_ndim);
         break;
+    default:
+        rb_raise(rb_eIndexError,"multiple rest-dimension is not allowd");
     }
     return -1;
 }
@@ -712,7 +703,6 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
     int i, j;
     int count_new=0;
     int count_rest=0;
-    int count_else=0;
     ssize_t x, s, m, pos, *idx;
     narray_t *na;
     narray_view_t *nv;
@@ -721,8 +711,7 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
 
     GetNArray(self,na);
     if (na->size == 0) {
-        rb_raise(rb_eRuntimeError, "cannot get index of empty array");
-        return -1;
+        rb_raise(nary_eShapeError, "cannot get element of empty array");
     }
     idx = ALLOCA_N(ssize_t, argc);
     for (i=j=0; i<argc; i++) {
@@ -745,16 +734,10 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
                 argv[i] = sym_new;
                 count_new++;
             }
-            // not break
-        default:
-            count_else++;
         }
     }
 
-    if (count_rest > 1) {
-        rb_raise(rb_eIndexError,"multiple rest-dimension is not allowd");
-    }
-    if (count_else != 0) {
+    if (j != argc) {
         return check_index_count(argc, na->ndim, count_new, count_rest);
     }
 
@@ -773,8 +756,9 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
                 }
             }
             *pos_idx = pos;
+            return 0;
         }
-        else if (argc==1 && j==1) {
+        if (j == 1) {
             x = na_range_check(idx[0], na->size, 0);
             for (i=na->ndim-1; i>=0; i--) {
                 s = na->shape[i];
@@ -788,19 +772,19 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
                 }
             }
             *pos_idx = pos;
-        } else {
-            return check_index_count(argc, na->ndim, count_new, count_rest);
+            return 0;
         }
         break;
     default:
         if (!stride) {
             stride = nary_element_stride(self);
         }
-        if (argc==1 && j==1) {
+        if (j == 1) {
             x = na_range_check(idx[0], na->size, 0);
             *pos_idx = stride * x;
+            return 0;
         }
-        else if (j == na->ndim) {
+        if (j == na->ndim) {
             pos = 0;
             for (i=j-1; i>=0; i--) {
                 x = na_range_check(idx[i], na->shape[i], i);
@@ -808,11 +792,54 @@ na_get_result_dimension(VALUE self, int argc, VALUE *argv, ssize_t stride, size_
                 stride *= na->shape[i];
             }
             *pos_idx = pos;
-        } else {
-            return check_index_count(argc, na->ndim, count_new, count_rest);
+            return 0;
+        }
+    }
+    rb_raise(rb_eIndexError,"# of index(=%i) should be "
+             "equal to ndim(=%i) or 1", argc,na->ndim);
+    return -1;
+}
+
+
+static int
+na_get_result_dimension_for_slice(VALUE self, int argc, VALUE *argv)
+{
+    int i;
+    int count_new=0;
+    int count_rest=0;
+    narray_t *na;
+    VALUE a;
+
+    GetNArray(self,na);
+    if (na->size == 0) {
+        rb_raise(nary_eShapeError, "cannot get element of empty array");
+    }
+    for (i=0; i<argc; i++) {
+        a = argv[i];
+        switch(TYPE(a)) {
+        case T_FALSE:
+        case T_SYMBOL:
+            if (a==sym_rest || a==sym_tilde || a==Qfalse) {
+                argv[i] = Qfalse;
+                count_rest++;
+            } else if (a==sym_new || a==sym_minus) {
+                argv[i] = sym_new;
+                count_new++;
+            }
         }
     }
-    return 0;
+
+    return check_index_count(argc, na->ndim, count_new, count_rest);
+}
+
+
+/* method: slice(idx1,idx2,...,idxN) */
+static VALUE na_slice(int argc, VALUE *argv, VALUE self)
+{
+    int nd;
+
+    nd = na_get_result_dimension_for_slice(self, argc, argv);
+    return na_aref_main(argc, argv, self, 1, nd);
 }
 
 

data/ext/numo/narray/math.c

@@ -14,7 +14,7 @@ static ID id_UPCAST;
 static ID id_DISPATCH;
 static ID id_extract;
 
-VALUE
+static VALUE
 nary_type_s_upcast(VALUE type1, VALUE type2)
 {
     VALUE upcast_hash;
@@ -35,7 +35,7 @@ nary_type_s_upcast(VALUE type1, VALUE type2)
 }
 
 
-VALUE nary_math_cast2(VALUE type1, VALUE type2)
+static VALUE nary_math_cast2(VALUE type1, VALUE type2)
 {
     if ( RTEST(rb_class_inherited_p( type1, cNArray )) ){
 	return nary_type_s_upcast( type1, type2 );
@@ -57,7 +57,7 @@ VALUE nary_math_cast2(VALUE type1, VALUE type2)
 
 VALUE na_ary_composition_dtype(VALUE);
 
-VALUE nary_mathcast(int argc, VALUE *argv)
+static VALUE nary_mathcast(int argc, VALUE *argv)
 {
     VALUE type, type2;
     int i;
@@ -82,7 +82,7 @@ VALUE nary_mathcast(int argc, VALUE *argv)
   @param [NArray,Numeric] x  input array.
   @return [NArray] result.
 */
-VALUE nary_math_method_missing(int argc, VALUE *argv, VALUE mod)
+static VALUE nary_math_method_missing(int argc, VALUE *argv, VALUE mod)
 {
     VALUE type, ans, typemod, hash;
     if (argc>1) {

data/ext/numo/narray/narray.c

@@ -132,7 +132,7 @@ nary_debug_info(VALUE self)
     narray_t *na;
     GetNArray(self,na);
 
-    printf("%s:\n",rb_class2name(CLASS_OF(self)));
+    printf("%s:\n",rb_class2name(rb_obj_class(self)));
     printf("  id     = 0x%"PRI_VALUE_PREFIX"x\n", self);
     printf("  type   = %d\n", na->type);
     printf("  flag   = [%d,%d]\n", na->flag[0], na->flag[1]);
@@ -728,6 +728,38 @@ na_empty_p(VALUE self)
 }
 
 
+/*
+  Release memory for array data. Ignored for NArray-view.
+  This method is useful to free memory of referenced (i.e., GC does not work)
+  but unused NArray object.
+  @overload free
+*/
+static VALUE
+na_free(VALUE self)
+{
+    narray_t *na;
+    char *ptr;
+
+    GetNArray(self,na);
+
+    switch(NA_TYPE(na)) {
+    case NARRAY_DATA_T:
+        ptr = NA_DATA_PTR(na);
+        if (ptr != NULL) {
+            NA_DATA_PTR(na) = NULL;
+            xfree(ptr);
+        }
+        break;
+    case NARRAY_VIEW_T:
+        break;
+    case NARRAY_FILEMAP_T:
+    default:
+        rb_bug("invalid narray type : %d",NA_TYPE(na));
+    }
+    return self;
+}
+
+
 /* method: shape() -- returns shape, array of the size of dimensions */
 static VALUE
  na_shape(VALUE self)
@@ -912,7 +944,7 @@ na_make_view(VALUE self)
     GetNArray(self,na);
     nd = na->ndim;
 
-    view = na_s_allocate_view(CLASS_OF(self));
+    view = na_s_allocate_view(rb_obj_class(self));
 
     na_copy_flags(self, view);
     GetNArrayView(view, na2);
@@ -965,7 +997,7 @@ na_make_view(VALUE self)
  *  @param [Integer] dim  dimension at which new axis is inserted.
  *  @return [Numo::NArray]  result narray view.
  */
-VALUE
+static VALUE
 na_expand_dims(VALUE self, VALUE vdim)
 {
     int  i, j, nd, dim;
@@ -1024,7 +1056,7 @@ na_expand_dims(VALUE self, VALUE vdim)
  *
  *  Return reversed view along specified dimeinsion
  */
-VALUE
+static VALUE
 nary_reverse(int argc, VALUE *argv, VALUE self)
 {
     int i, nd;
@@ -1043,7 +1075,7 @@ nary_reverse(int argc, VALUE *argv, VALUE self)
     GetNArray(self,na);
     nd = na->ndim;
 
-    view = na_s_allocate_view(CLASS_OF(self));
+    view = na_s_allocate_view(rb_obj_class(self));
 
     na_copy_flags(self, view);
     GetNArrayView(view, na2);
@@ -1143,7 +1175,7 @@ nary_coerce(VALUE x, VALUE y)
 {
     VALUE type;
 
-    type = numo_na_upcast(CLASS_OF(x), CLASS_OF(y));
+    type = numo_na_upcast(rb_obj_class(x), rb_obj_class(y));
     y = rb_funcall(type,id_cast,1,y);
     return rb_assoc_new(y , x);
 }
@@ -1160,7 +1192,7 @@ nary_byte_size(VALUE self)
     narray_t *na;
 
     GetNArray(self,na);
-    velmsz = rb_const_get(CLASS_OF(self), id_element_byte_size);
+    velmsz = rb_const_get(rb_obj_class(self), id_element_byte_size);
     if (FIXNUM_P(velmsz)) {
         return SIZET2NUM(NUM2SIZET(velmsz) * na->size);
     }
@@ -1283,7 +1315,7 @@ nary_store_binary(int argc, VALUE *argv, VALUE self)
 
     GetNArray(self,na);
     size = NA_SIZE(na);
-    velmsz = rb_const_get(CLASS_OF(self), id_element_byte_size);
+    velmsz = rb_const_get(rb_obj_class(self), id_element_byte_size);
     if (FIXNUM_P(velmsz)) {
         byte_size = size * NUM2SIZET(velmsz);
     } else {
@@ -1341,7 +1373,7 @@ nary_marshal_dump(VALUE self)
     rb_ary_push(a, INT2FIX(1));     // version
     rb_ary_push(a, na_shape(self));
     rb_ary_push(a, INT2FIX(NA_FLAG0(self)));
-    if (CLASS_OF(self) == numo_cRObject) {
+    if (rb_obj_class(self) == numo_cRObject) {
         narray_t *na;
         VALUE *ptr;
         size_t offset=0;
@@ -1362,7 +1394,7 @@ nary_marshal_dump(VALUE self)
     return a;
 }
 
-VALUE na_inplace( VALUE self );
+static VALUE na_inplace( VALUE self );
 /*
   Load marshal data.
   @overload marshal_load(data)
@@ -1387,7 +1419,7 @@ nary_marshal_load(VALUE self, VALUE a)
     na_initialize(self,RARRAY_AREF(a,1));
     NA_FL0_SET(self,FIX2INT(RARRAY_AREF(a,2)));
     v = RARRAY_AREF(a,3);
-    if (CLASS_OF(self) == numo_cRObject) {
+    if (rb_obj_class(self) == numo_cRObject) {
         narray_t *na;
         char *ptr;
         if (TYPE(v) != T_ARRAY) {
@@ -1609,7 +1641,7 @@ nary_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv,
 /*
   Return true if column major.
 */
-VALUE na_column_major_p( VALUE self )
+static VALUE na_column_major_p( VALUE self )
 {
     if (TEST_COLUMN_MAJOR(self))
 	return Qtrue;
@@ -1620,7 +1652,7 @@ VALUE na_column_major_p( VALUE self )
 /*
   Return true if row major.
 */
-VALUE na_row_major_p( VALUE self )
+static VALUE na_row_major_p( VALUE self )
 {
     if (TEST_ROW_MAJOR(self))
 	return Qtrue;
@@ -1632,7 +1664,7 @@ VALUE na_row_major_p( VALUE self )
 /*
   Return true if byte swapped.
 */
-VALUE na_byte_swapped_p( VALUE self )
+static VALUE na_byte_swapped_p( VALUE self )
 {
     if (TEST_BYTE_SWAPPED(self))
       return Qtrue;
@@ -1642,7 +1674,7 @@ VALUE na_byte_swapped_p( VALUE self )
 /*
   Return true if not byte swapped.
 */
-VALUE na_host_order_p( VALUE self )
+static VALUE na_host_order_p( VALUE self )
 {
     if (TEST_BYTE_SWAPPED(self))
       return Qfalse;
@@ -1654,7 +1686,7 @@ VALUE na_host_order_p( VALUE self )
   Returns view of narray with inplace flagged.
   @return [Numo::NArray] view of narray with inplace flag.
 */
-VALUE na_inplace( VALUE self )
+static VALUE na_inplace( VALUE self )
 {
     VALUE view = self;
     view = na_make_view(self);
@@ -1666,24 +1698,16 @@ VALUE na_inplace( VALUE self )
   Set inplace flag to self.
   @return [Numo::NArray] self
 */
-VALUE na_inplace_bang( VALUE self )
+static VALUE na_inplace_bang( VALUE self )
 {
     SET_INPLACE(self);
     return self;
 }
 
-VALUE na_inplace_store( VALUE self, VALUE val )
-{
-    if (self==val)
-        return self;
-    else
-        return na_store( self, val );
-}
-
 /*
   Return true if inplace flagged.
 */
-VALUE na_inplace_p( VALUE self )
+static VALUE na_inplace_p( VALUE self )
 {
     if (TEST_INPLACE(self))
         return Qtrue;
@@ -1695,7 +1719,7 @@ VALUE na_inplace_p( VALUE self )
   Unset inplace flag to self.
   @return [Numo::NArray] self
 */
-VALUE na_out_of_place_bang( VALUE self )
+static VALUE na_out_of_place_bang( VALUE self )
 {
     UNSET_INPLACE(self);
     return self;
@@ -1791,7 +1815,7 @@ static VALUE na_inspect_cols_set(VALUE mod, VALUE num)
   @param [Object] other
   @return [Boolean] true if self and other is equal.
 */
-VALUE
+static VALUE
 na_equal(VALUE self, volatile VALUE other)
 {
     volatile VALUE vbool;
@@ -1801,7 +1825,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), id_cast, 1, other);
+        other = rb_funcall(rb_obj_class(self), id_cast, 1, other);
     }
 
     GetNArray(other,na2);
@@ -1875,6 +1899,7 @@ Init_narray()
     rb_define_method(cNArray, "ndim", na_ndim,0);
     rb_define_alias (cNArray, "rank","ndim");
     rb_define_method(cNArray, "empty?", na_empty_p, 0);
+    rb_define_method(cNArray, "free", na_free, 0);
 
     rb_define_method(cNArray, "debug_info", nary_debug_info, 0);