numo-narray-alt 0.9.3 → 0.9.5

data/ext/numo/narray/index.c

@@ -71,7 +71,10 @@ static void na_index_set_step(na_index_arg_t* q, int i, size_t n, size_t beg, ss
 }
 
 static void na_index_set_scalar(na_index_arg_t* q, int i, ssize_t size, ssize_t x) {
-  if (x < -size || x >= size) rb_raise(rb_eRangeError, "array index (%" SZF "d) is out of array size (%" SZF "d)", x, size);
+  if (x < -size || x >= size)
+    rb_raise(
+      rb_eRangeError, "array index (%" SZF "d) is out of array size (%" SZF "d)", x, size
+    );
   if (x < 0) x += size;
   q->n = 1;
   q->beg = x;
@@ -172,7 +175,8 @@ static void na_parse_narray_index(VALUE a, int orig_dim, ssize_t size, na_index_
   q->orig_dim = orig_dim;
 }
 
-static void na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size, na_index_arg_t* q) {
+static void
+na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size, na_index_arg_t* q) {
   int n;
   ssize_t beg, end, beg_orig, end_orig;
   const char *dot = "..", *edot = "...";
@@ -192,7 +196,9 @@ static void na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size
       dot = edot;
     }
     if (beg < 0 || beg >= size) {
-      rb_raise(rb_eRangeError, "%" SZF "d%s is out of range for size=%" SZF "d", beg_orig, dot, size);
+      rb_raise(
+        rb_eRangeError, "%" SZF "d%s is out of range for size=%" SZF "d", beg_orig, dot, size
+      );
     }
   } else {
     end = end_orig = NUM2SSIZET(x.end);
@@ -204,7 +210,10 @@ static void na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size
       dot = edot;
     }
     if (beg < 0 || beg >= size || end < 0 || end >= size) {
-      rb_raise(rb_eRangeError, "%" SZF "d%s%" SZF "d is out of range for size=%" SZF "d", beg_orig, dot, end_orig, size);
+      rb_raise(
+        rb_eRangeError, "%" SZF "d%s%" SZF "d is out of range for size=%" SZF "d", beg_orig,
+        dot, end_orig, size
+      );
     }
   }
 #else
@@ -224,7 +233,10 @@ static void na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size
     dot = edot;
   }
   if (beg < 0 || beg >= size || end < 0 || end >= size) {
-    rb_raise(rb_eRangeError, "%" SZF "d%s%" SZF "d is out of range for size=%" SZF "d", beg_orig, dot, end_orig, size);
+    rb_raise(
+      rb_eRangeError, "%" SZF "d%s%" SZF "d is out of range for size=%" SZF "d", beg_orig, dot,
+      end_orig, size
+    );
   }
 #endif
   n = (int)((end - beg) / step + 1);
@@ -342,7 +354,8 @@ static void na_index_parse_each(volatile VALUE a, ssize_t size, int i, na_index_
   }
 }
 
-static void na_at_parse_each(volatile VALUE a, ssize_t size, int i, VALUE* idx, ssize_t stride) {
+static void
+na_at_parse_each(volatile VALUE a, ssize_t size, int i, VALUE* idx, ssize_t stride) {
   na_index_arg_t q;
   size_t n, k;
   ssize_t* index;
@@ -444,7 +457,6 @@ static size_t na_index_parse_args(VALUE args, narray_t* na, na_index_arg_t* q, i
     // rest (ellipsis) dimension
     if (v == Qfalse) {
       for (l = ndim - (nidx - 1); l > 0; l--) {
-        // printf("i=%d j=%d k=%d l=%d ndim=%d nidx=%d\n",i,j,k,l,ndim,nidx);
         na_index_parse_each(Qtrue, na->shape[k], k, &q[j]);
         if (q[j].n > 1) {
           total *= q[j].n;
@@ -473,14 +485,18 @@ static size_t na_index_parse_args(VALUE args, narray_t* na, na_index_arg_t* q, i
 
 static void na_get_strides_nadata(const narray_data_t* na, ssize_t* strides, ssize_t elmsz) {
   int i = na->base.ndim - 1;
-  strides[i] = elmsz;
-  for (; i > 0; i--) {
-    strides[i - 1] = strides[i] * na->base.shape[i];
+  if (i >= 0) {
+    strides[i] = elmsz;
+    for (; i > 0; i--) {
+      strides[i - 1] = strides[i] * na->base.shape[i];
+    }
   }
 }
 
-static void na_index_aref_nadata(narray_data_t* na1, narray_view_t* na2, na_index_arg_t* q, ssize_t elmsz, int ndim,
-                                 int keep_dim) {
+static void na_index_aref_nadata(
+  narray_data_t* na1, narray_view_t* na2, na_index_arg_t* q, ssize_t elmsz, int ndim,
+  int keep_dim
+) {
   int i, j;
   ssize_t size, k, total = 1;
   ssize_t stride1;
@@ -529,8 +545,10 @@ static void na_index_aref_nadata(narray_data_t* na1, narray_view_t* na2, na_inde
   na2->base.size = total;
 }
 
-static void na_index_aref_naview(narray_view_t* na1, narray_view_t* na2, na_index_arg_t* q, ssize_t elmsz, int ndim,
-                                 int keep_dim) {
+static void na_index_aref_naview(
+  narray_view_t* na1, narray_view_t* na2, na_index_arg_t* q, ssize_t elmsz, int ndim,
+  int keep_dim
+) {
   int i, j;
   ssize_t total = 1;
 
@@ -777,10 +795,12 @@ static int check_index_count(int argc, int na_ndim, int count_new, int count_res
   case 0:
     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) or 1",
-             argc, na_ndim);
+    rb_raise(
+      rb_eIndexError,
+      "# of index(=%i) should be "
+      "equal to ndim(=%i) or 1",
+      argc, na_ndim
+    );
     break;
   case 1:
     if (argc - 1 <= result_nd) return result_nd;
@@ -792,7 +812,9 @@ static int check_index_count(int argc, int na_ndim, int count_new, int count_res
   return -1;
 }
 
-int na_get_result_dimension(VALUE self, int argc, VALUE* argv, ssize_t stride, size_t* pos_idx) {
+int na_get_result_dimension(
+  VALUE self, int argc, VALUE* argv, ssize_t stride, size_t* pos_idx
+) {
   int i, j;
   int count_new = 0;
   int count_rest = 0;
@@ -888,10 +910,12 @@ int na_get_result_dimension(VALUE self, int argc, VALUE* argv, ssize_t stride, s
       return 0;
     }
   }
-  rb_raise(rb_eIndexError,
-           "# of index(=%i) should be "
-           "equal to ndim(=%i) or 1",
-           argc, na->ndim);
+  rb_raise(
+    rb_eIndexError,
+    "# of index(=%i) should be "
+    "equal to ndim(=%i) or 1",
+    argc, na->ndim
+  );
   return -1;
 }
 
@@ -934,11 +958,12 @@ static VALUE na_slice(int argc, VALUE* argv, VALUE self) {
 
 /*
   Multi-dimensional element reference.
-  Returns an element at `dim0`, `dim1`, ... are Numeric indices for each dimension, or returns a NArray View as a sliced array
-  if `dim0`, `dim1`, ... includes other than Numeric index, e.g., Range or Array or true.
+  Returns an element at `dim0`, `dim1`, ... are Numeric indices for each dimension, or returns a
+  NArray View as a sliced array if `dim0`, `dim1`, ... includes other than Numeric index, e.g.,
+  Range or Array or true.
   @overload [](dim0,...,dimL)
-  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol] dim0,...,dimL  multi-dimensional
-  indices.
+  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol]
+  dim0,...,dimL  multi-dimensional indices.
   @return [Numeric,Numo::NArray] an element or NArray view.
   @see #[]=
   @see #at
@@ -978,8 +1003,8 @@ static VALUE na_slice(int argc, VALUE* argv, VALUE self) {
   Replace element(s) at `dim0`, `dim1`, ... .
   Broadcasting mechanism is applied.
   @overload []=(dim0,...,dimL,val)
-  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol] dim0,...,dimL  multi-dimensional
-  indices.
+  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol]
+  dim0,...,dimL  multi-dimensional indices.
   @param [Numeric,Numo::NArray,Array] val  Value(s) to be set to self.
   @return [Numeric,Numo::NArray,Array] returns `val` (last argument).
   @see #[]

data/ext/numo/narray/kwargs.c

@@ -15,10 +15,10 @@ struct RBasicRaw {
   VALUE klass;
 };
 
-#define RBASIC_SET_CLASS(obj, cls)                                                                                             \
-  do {                                                                                                                         \
-    VALUE _obj_ = (obj);                                                                                                       \
-    RB_OBJ_WRITE(_obj_, &((struct RBasicRaw*)(_obj_))->klass, cls);                                                            \
+#define RBASIC_SET_CLASS(obj, cls)                                  \
+  do {                                                              \
+    VALUE _obj_ = (obj);                                            \
+    RB_OBJ_WRITE(_obj_, &((struct RBasicRaw*)(_obj_))->klass, cls); \
   } while (0)
 
 /* from class.c */
@@ -69,7 +69,7 @@ static int separate_symbol(st_data_t key, st_data_t value, st_data_t arg) {
 
 VALUE
 rb_extract_keywords(VALUE* orighash) {
-  VALUE parthash[2] = {0, 0};
+  VALUE parthash[2] = { 0, 0 };
   VALUE hash = *orighash;
 
   if (RHASH_EMPTY_P(hash)) {
@@ -84,15 +84,17 @@ rb_extract_keywords(VALUE* orighash) {
   return parthash[0];
 }
 
-int rb_get_kwargs(VALUE keyword_hash, const ID* table, int required, int optional, VALUE* values) {
+int rb_get_kwargs(
+  VALUE keyword_hash, const ID* table, int required, int optional, VALUE* values
+) {
   int i = 0, j;
   int rest = 0;
   VALUE missing = Qnil;
   st_data_t key;
 
-#define extract_kwarg(keyword, val)                                                                                            \
-  (key = (st_data_t)(keyword),                                                                                                 \
-   values ? st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
+#define extract_kwarg(keyword, val)                                                           \
+  (key = (st_data_t)(keyword), values ? st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) \
+                                      : st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
 
   if (NIL_P(keyword_hash)) keyword_hash = 0;
 

data/ext/numo/narray/math.c

@@ -40,8 +40,10 @@ static VALUE nary_math_cast2(VALUE type1, VALUE type2) {
   if (RTEST(rb_class_inherited_p(type2, cNArray))) {
     return nary_type_s_upcast(type2, type1);
   }
-  if (RTEST(rb_class_inherited_p(type1, rb_cNumeric)) && RTEST(rb_class_inherited_p(type2, rb_cNumeric))) {
-    if (RTEST(rb_class_inherited_p(type1, rb_cComplex)) || RTEST(rb_class_inherited_p(type2, rb_cComplex))) {
+  if (RTEST(rb_class_inherited_p(type1, rb_cNumeric)) &&
+      RTEST(rb_class_inherited_p(type2, rb_cNumeric))) {
+    if (RTEST(rb_class_inherited_p(type1, rb_cComplex)) ||
+        RTEST(rb_class_inherited_p(type2, rb_cComplex))) {
       return rb_cComplex;
     }
     return rb_cFloat;

data/ext/numo/narray/narray.c

@@ -77,6 +77,8 @@ void Init_nary_math();
 void Init_nary_rand();
 void Init_nary_array();
 void Init_nary_struct();
+// define mean method for integer array
+void Init_nary_mean();
 
 const rb_data_type_t na_data_type = {
   "Numo::NArray",
@@ -857,7 +859,8 @@ void na_copy_flags(VALUE src, VALUE dst) {
   na2->flag[0] = na1->flag[0];
   // na2->flag[1] = NA_FL1_INIT;
 
-  RBASIC(dst)->flags |= (RBASIC(src)->flags) & (FL_USER1 | FL_USER2 | FL_USER3 | FL_USER4 | FL_USER5 | FL_USER6 | FL_USER7);
+  RBASIC(dst)->flags |= (RBASIC(src)->flags) & (FL_USER1 | FL_USER2 | FL_USER3 | FL_USER4 |
+                                                FL_USER5 | FL_USER6 | FL_USER7);
 }
 
 // fix name, ex, allow_stride_for_flatten_view
@@ -1423,10 +1426,12 @@ static VALUE nary_marshal_load(VALUE self, VALUE a) {
     rb_raise(rb_eArgError, "marshal array size should be 4");
   }
   if (RARRAY_AREF(a, 0) != INT2FIX(1)) {
-    rb_raise(rb_eArgError,
-             "NArray marshal version %d is not supported "
-             "(only version 1)",
-             NUM2INT(RARRAY_AREF(a, 0)));
+    rb_raise(
+      rb_eArgError,
+      "NArray marshal version %d is not supported "
+      "(only version 1)",
+      NUM2INT(RARRAY_AREF(a, 0))
+    );
   }
   na_initialize(self, RARRAY_AREF(a, 1));
   NA_FL0_SET(self, FIX2INT(RARRAY_AREF(a, 2)));
@@ -1538,7 +1543,6 @@ static VALUE na_get_reduce_flag_from_axes(VALUE na_obj, VALUE axes) {
   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);
       if (beg < 0) beg += ndim;
@@ -1547,7 +1551,6 @@ static VALUE na_get_reduce_flag_from_axes(VALUE na_obj, VALUE axes) {
       }
       len = 1;
       step = 0;
-      // printf("beg=%d step=%d len=%d\n",beg,step,len);
     } else if (rb_obj_is_kind_of(v, rb_cRange)
 #ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
                || rb_obj_is_kind_of(v, rb_cArithSeq)
@@ -1611,12 +1614,14 @@ nary_reduce_options(VALUE axes, VALUE* opts, int naryc, VALUE* naryv, ndfunc_t*
 }
 
 VALUE
-nary_reduce_dimension(int argc, VALUE* argv, int naryc, VALUE* naryv, ndfunc_t* ndf, na_iter_func_t iter_nan) {
+nary_reduce_dimension(
+  int argc, VALUE* argv, int naryc, VALUE* naryv, ndfunc_t* ndf, na_iter_func_t iter_nan
+) {
   long narg;
   VALUE axes;
   VALUE kw_hash = Qnil;
-  ID kw_table[3] = {id_axis, id_keepdims, id_nan};
-  VALUE opts[3] = {Qundef, Qundef, Qundef};
+  ID kw_table[3] = { id_axis, id_keepdims, id_nan };
+  VALUE opts[3] = { Qundef, Qundef, Qundef };
 
   narg = rb_scan_args(argc, argv, "*:", &axes, &kw_hash);
   rb_get_kwargs(kw_hash, kw_table, 0, 3, opts);
@@ -1968,6 +1973,8 @@ void Init_narray(void) {
   Init_numo_bit();
   Init_numo_robject();
 
+  Init_nary_mean();
+
   Init_nary_math();
 
   Init_nary_rand();