numo-narray 0.9.1.2 → 0.9.1.3

data/ext/numo/narray/ndloop.c

@@ -214,7 +214,7 @@ ndloop_func_loop_spec(ndfunc_t *nf, int user_ndim)
 static int
 ndloop_cast_required(VALUE type, VALUE value)
 {
-    return CASTABLE(type) && type != CLASS_OF(value);
+    return CASTABLE(type) && type != rb_obj_class(value);
 }
 
 static int
@@ -657,7 +657,7 @@ ndloop_check_inplace(VALUE type, int na_ndim, size_t *na_shape, VALUE v)
     narray_t *na;
 
     // type check
-    if (type != CLASS_OF(v)) {
+    if (type != rb_obj_class(v)) {
         return 0;
     }
     GetNArray(v,na);
@@ -724,7 +724,7 @@ ndloop_get_arg_type(ndfunc_t *nf, VALUE args, VALUE t)
         t = nf->ain[i].type;
         // if i-th type is Qnil, get the type of i-th input value
         if (!CASTABLE(t)) {
-            t = CLASS_OF(RARRAY_AREF(args,i));
+            t = rb_obj_class(RARRAY_AREF(args,i));
         }
     }
     return t;
@@ -1392,7 +1392,7 @@ loop_narray(ndfunc_t *nf, na_md_loop_t *lp)
 }
 
 
-VALUE
+static VALUE
 na_ndloop_main(ndfunc_t *nf, VALUE args, void *opt_ptr)
 {
     unsigned int copy_flag;
@@ -1495,7 +1495,7 @@ na_info_str(VALUE ary)
     GetNArray(ary,na);
     nd = na->ndim;
 
-    buf = rb_str_new2(rb_class2name(CLASS_OF(ary)));
+    buf = rb_str_new2(rb_class2name(rb_obj_class(ary)));
     if (NA_TYPE(na) == NARRAY_VIEW_T) {
         rb_str_cat(buf,"(view)",6);
     }
@@ -1644,8 +1644,8 @@ loop_store_subnarray(ndfunc_t *nf, na_md_loop_t *lp, int i0, size_t *c, VALUE a)
     int *dim_map;
     VALUE a_type;
 
-    a_type = CLASS_OF(LARG(lp,0).value);
-    if (CLASS_OF(a) != a_type) {
+    a_type = rb_obj_class(LARG(lp,0).value);
+    if (rb_obj_class(a) != a_type) {
         a = rb_funcall(a_type, id_cast, 1, a);
     }
     GetNArray(a,na);

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

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.2"
-#define NARRAY_VERSION_CODE 912
+#define NARRAY_VERSION "0.9.1.3"
+#define NARRAY_VERSION_CODE 913
 
 #include <math.h>
 #include "numo/compat.h"
@@ -107,6 +107,13 @@ extern "C" {
 # endif
 #endif
 
+#if SIZEOF_VALUE > 4
+# undef INT322NUM
+# undef UINT322NUM
+# define INT322NUM(x) INT2FIX(x)
+# define UINT322NUM(x) INT2FIX(x)
+#endif
+
 #ifndef HAVE_TYPE_BOOL
   typedef int bool;
 #endif

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

@@ -145,5 +145,23 @@ is_aligned_step(const ssize_t step, const size_t alignment)
     return ((step) & ((alignment)-1)) == 0;
 }
 
+static inline int
+get_count_of_elements_not_aligned_to_simd_size(const void *ptr, const size_t alignment, const size_t element_size)
+{
+    int cnt = (size_t)(ptr) & ((alignment)-1);
+    return cnt == 0 ?  0 : (alignment - cnt) / element_size;
+}
+
+static inline int is_same_aligned2(const void *ptr1, const void *ptr2, const size_t alignment)
+{
+    return ((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr2) & ((alignment)-1));
+}
+
+static inline int is_same_aligned3(const void *ptr1, const void *ptr2, const void *ptr3, const size_t alignment)
+{
+    return (((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr2) & ((alignment)-1))) &&
+           (((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr3) & ((alignment)-1)));
+}
+
 
 #endif /* ifndef TEMPLATE_H */

data/ext/numo/narray/numo/types/bit.h

@@ -11,6 +11,11 @@ typedef BIT_DIGIT rtype;
 
 #define m_from_double(x) (((x)==0) ? 0 : 1)
 #define m_from_real(x) (((x)==0) ? 0 : 1)
+#define m_from_sint(x) (((x)==0) ? 0 : 1)
+#define m_from_int32(x) (((x)==0) ? 0 : 1)
+#define m_from_int64(x) (((x)==0) ? 0 : 1)
+#define m_from_uint32(x) (((x)==0) ? 0 : 1)
+#define m_from_uint64(x) (((x)==0) ? 0 : 1)
 #define m_data_to_num(x) INT2FIX(x)
 #define m_sprintf(s,x)   sprintf(s,"%1d",(int)(x))
 

data/ext/numo/narray/numo/types/complex_macro.h

@@ -43,6 +43,11 @@ static inline dtype c_from_dcomplex(dcomplex x) {
 
 #define m_from_double(x) c_new(x,0)
 #define m_from_real(x)   c_new(x,0)
+#define m_from_sint(x)   c_new(x,0)
+#define m_from_int32(x)  c_new(x,0)
+#define m_from_int64(x)  c_new(x,0)
+#define m_from_uint32(x) c_new(x,0)
+#define m_from_uint64(x) c_new(x,0)
 #define m_from_scomplex(x) c_from_scomplex(x)
 #define m_from_dcomplex(x) c_from_dcomplex(x)
 

data/ext/numo/narray/numo/types/float_macro.h

@@ -17,6 +17,11 @@ extern double pow(double, double);
 
 #define m_from_double(x) (x)
 #define m_from_real(x) (x)
+#define m_from_sint(x) (x)
+#define m_from_int32(x) (x)
+#define m_from_int64(x) (x)
+#define m_from_uint32(x) (x)
+#define m_from_uint64(x) (x)
 
 #define m_add(x,y) ((x)+(y))
 #define m_sub(x,y) ((x)-(y))

data/ext/numo/narray/numo/types/int_macro.h

@@ -39,3 +39,27 @@ static dtype pow_int(dtype x, int p)
     }
     return r;
 }
+
+static inline int64_t f_sum(size_t n, char *p, ssize_t stride)
+{
+    int64_t x,y=0;
+    size_t i=n;
+    for (; i--;) {
+        x = *(dtype*)p;
+        y += x;
+        p += stride;
+    }
+    return y;
+}
+
+static inline int64_t f_prod(size_t n, char *p, ssize_t stride)
+{
+    int64_t x,y=1;
+    size_t i=n;
+    for (; i--;) {
+        x = *(dtype*)p;
+        y *= x;
+        p += stride;
+    }
+    return y;
+}

data/ext/numo/narray/numo/types/robj_macro.h

@@ -6,6 +6,11 @@
 
 #define m_from_double(x) rb_float_new(x)
 #define m_from_real(x)   rb_float_new(x)
+#define m_from_sint(x)   INT2FIX(x)
+#define m_from_int32(x)  INT322NUM(x)
+#define m_from_int64(x)  INT642NUM(x)
+#define m_from_uint32(x) UINT322NUM(x)
+#define m_from_uint64(x) UINT642NUM(x)
 
 #define m_add(x,y)     rb_funcall(x,'+',1,y)
 #define m_sub(x,y)     rb_funcall(x,'-',1,y)

data/ext/numo/narray/numo/types/uint_macro.h

@@ -30,3 +30,27 @@ static dtype pow_int(dtype x, int p)
     }
     return r;
 }
+
+static inline u_int64_t f_sum(size_t n, char *p, ssize_t stride)
+{
+    u_int64_t x,y=0;
+    size_t i=n;
+    for (; i--;) {
+        x = *(dtype*)p;
+        y += x;
+        p += stride;
+    }
+    return y;
+}
+
+static inline u_int64_t f_prod(size_t n, char *p, ssize_t stride)
+{
+    u_int64_t x,y=1;
+    size_t i=n;
+    for (; i--;) {
+        x = *(dtype*)p;
+        y *= x;
+        p += stride;
+    }
+    return y;
+}

data/ext/numo/narray/numo/types/xint_macro.h

@@ -3,6 +3,11 @@
 
 #define m_from_double(x) (x)
 #define m_from_real(x) (x)
+#define m_from_sint(x) (x)
+#define m_from_int32(x) (x)
+#define m_from_int64(x) (x)
+#define m_from_uint32(x) (x)
+#define m_from_uint64(x) (x)
 
 #define m_add(x,y) ((x)+(y))
 #define m_sub(x,y) ((x)-(y))
@@ -44,31 +49,6 @@
 #define cmpgt(a,b)                              \
     (qsort_cast(a) > qsort_cast(b))
 
-
-static inline dtype f_sum(size_t n, char *p, ssize_t stride)
-{
-    dtype x,y=0;
-    size_t i=n;
-    for (; i--;) {
-        x = *(dtype*)p;
-        y += x;
-        p += stride;
-    }
-    return y;
-}
-
-static inline dtype f_prod(size_t n, char *p, ssize_t stride)
-{
-    dtype x,y=1;
-    size_t i=n;
-    for (; i--;) {
-        x = *(dtype*)p;
-        y *= x;
-        p += stride;
-    }
-    return y;
-}
-
 static inline dtype f_min(size_t n, char *p, ssize_t stride)
 {
     dtype x,y;

data/ext/numo/narray/rand.c

@@ -10,35 +10,8 @@
 #include <sys/time.h>
 #endif
 
-int n_bits(u_int64_t a)
-{
-    int i, x, /*xu,*/ xl, n=5;
-    u_int64_t m;
-
-    if (a==0) return 0;
-    //if (a<0) a=-a;
-
-    x  = 1<<n;
-    //xu = 1<<(n+1);
-    xl = 0;
-    //printf("%3i, [%3i, %3i], %i\n", i, xu, xl, x);
-
-    for (i=n; i>=0; i--) {
-	m = ~((1<<(x-1))-1);
-	if (m & a) {
-	    xl = x;
-	    x += 1<<(i-1);
-	} else {
-	    //xu = x;
-	    x -= 1<<(i-1);
-	}
-	//printf("%3i, [%3i, %3i], %i, 0x%lx, 0x%lx\n", i, xu, xl, x, m, m&a);
-    }
-    return xl;
-}
-
 static u_int64_t
- random_seed()
+random_seed()
 {
     static int n = 0;
     struct timeval tv;
@@ -48,7 +21,7 @@ static u_int64_t
 }
 
 static VALUE
- nary_s_srand(int argc, VALUE *argv, VALUE obj)
+nary_s_srand(int argc, VALUE *argv, VALUE obj)
 {
     VALUE vseed;
     u_int64_t seed;

data/ext/numo/narray/step.c

@@ -56,22 +56,7 @@ step_init(
     SET_EXCL(self, excl);
 }
 
-VALUE
-nary_step_new(
-  VALUE beg,
-  VALUE end,
-  VALUE step,
-  VALUE len,
-  VALUE excl
-)
-{
-    VALUE self = rb_obj_alloc(na_cStep);
-
-    step_init(self, beg, end, step, len, excl);
-    return self;
-}
-
-VALUE
+static VALUE
 nary_step_new2(
   VALUE range,
   VALUE step,
@@ -455,18 +440,6 @@ nary_s_step( int argc, VALUE *argv, VALUE mod )
 }
 
 
-VALUE
-nary_is_sequence( VALUE arg )
-{
-    if ( rb_obj_is_kind_of(arg, rb_cRange) )
-        return Qtrue;
-    if ( rb_obj_is_kind_of(arg, na_cStep) )
-        return Qtrue;
-    return Qfalse;
-}
-
-
-
 void
 Init_nary_step()
 {

data/ext/numo/narray/struct.c

@@ -23,7 +23,7 @@ nst_allocate(VALUE self)
     case NARRAY_DATA_T:
         ptr = NA_DATA_PTR(na);
         if (na->size > 0 && ptr == NULL) {
-            velmsz = rb_const_get(CLASS_OF(self), rb_intern("element_byte_size"));
+            velmsz = rb_const_get(rb_obj_class(self), rb_intern("element_byte_size"));
             ptr = xmalloc(NUM2SIZET(velmsz) * na->size);
             NA_DATA_PTR(na) = ptr;
         }
@@ -51,7 +51,7 @@ static VALUE
 nst_definition(VALUE nst, VALUE idx)
 {
     long i;
-    VALUE def = nst_definitions(CLASS_OF(nst));
+    VALUE def = nst_definitions(rb_obj_class(nst));
     long  len = RARRAY_LEN(def);
 
     if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
@@ -76,7 +76,7 @@ nst_definition(VALUE nst, VALUE idx)
 
 void na_copy_array_structure(VALUE self, VALUE view);
 
-VALUE
+static VALUE
 na_make_view_struct(VALUE self, VALUE dtype, VALUE offset)
 {
     size_t i, n;
@@ -105,7 +105,7 @@ na_make_view_struct(VALUE self, VALUE dtype, VALUE offset)
         for (j=na->ndim,k=0; j<ndim; j++,k++) {
             shape[j] = nt->shape[k];
         }
-        klass = CLASS_OF(dtype);
+        klass = rb_obj_class(dtype);
         stridx = ALLOC_N(stridx_t, ndim);
         stride = na_dtype_elmsz(klass);
         for (j=ndim,k=nt->ndim; k; ) {
@@ -118,7 +118,7 @@ na_make_view_struct(VALUE self, VALUE dtype, VALUE offset)
         for (j=0; j<ndim; j++) {
             shape[j] = na->shape[j];
         }
-        klass = CLASS_OF(self);
+        klass = rb_obj_class(self);
         if (TYPE(dtype)==T_CLASS) {
             if (RTEST(rb_class_inherited_p(dtype,cNArray))) {
                 klass = dtype;
@@ -172,7 +172,7 @@ na_make_view_struct(VALUE self, VALUE dtype, VALUE offset)
 }
 
 
-VALUE
+static VALUE
 nst_field_view(VALUE self, VALUE idx)
 {
     VALUE def, type, ofs;
@@ -181,14 +181,14 @@ nst_field_view(VALUE self, VALUE idx)
     if (!RTEST(def)) {
         idx = rb_funcall(idx, rb_intern("to_s"), 0);
         rb_raise(rb_eTypeError, "Invalid field: '%s' for struct %s",
-                 StringValuePtr(idx), rb_class2name(CLASS_OF(self)));
+                 StringValuePtr(idx), rb_class2name(rb_obj_class(self)));
     }
     type = RARRAY_AREF(def,1);
     ofs  = RARRAY_AREF(def,2);
     return na_make_view_struct(self, type, ofs);
 }
 
-VALUE
+static VALUE
 nst_field(VALUE self, VALUE idx)
 {
     VALUE obj;
@@ -202,7 +202,7 @@ nst_field(VALUE self, VALUE idx)
     return obj;
 }
 
-VALUE
+static VALUE
 nst_field_set(VALUE self, VALUE idx, VALUE other)
 {
     VALUE obj;
@@ -353,7 +353,7 @@ nstruct_add_type(VALUE type, int argc, VALUE *argv, VALUE nst)
     if (rb_obj_is_kind_of(type,cNArray)) {
         narray_t *na;
         GetNArray(type,na);
-        type = CLASS_OF(type);
+        type = rb_obj_class(type);
         ndim = na->ndim;
         shape = na->shape;
     }
@@ -361,7 +361,7 @@ nstruct_add_type(VALUE type, int argc, VALUE *argv, VALUE nst)
     GetNArrayView(type,nt);
 
     nt->stridx = ALLOC_N(stridx_t,ndim);
-    stride = na_dtype_elmsz(CLASS_OF(type));
+    stride = na_dtype_elmsz(rb_obj_class(type));
     for (j=ndim; j--; ) {
         SDX_SET_STRIDE(nt->stridx[j], stride);
         stride *= shape[j];
@@ -441,7 +441,7 @@ nst_create_member_views(VALUE self)
     long  i, len;
     narray_view_t *ne;
 
-    defs = nst_definitions(CLASS_OF(self));
+    defs = nst_definitions(rb_obj_class(self));
     len = RARRAY_LEN(defs);
     types = rb_ary_new2(len);
     //ofsts = rb_ary_new2(len);
@@ -472,7 +472,7 @@ nary_struct_to_a(VALUE self)
 
 
 
-// ---
+/*
 static size_t
 check_array(VALUE item) {
     narray_t *na;
@@ -490,7 +490,9 @@ check_array(VALUE item) {
     }
     return 0;
 }
+*/
 
+/*
 static size_t
 check_array_1d(VALUE item, size_t size) {
     narray_t *na;
@@ -518,7 +520,9 @@ check_array_1d(VALUE item, size_t size) {
     }
     return 0;
 }
+*/
 
+/*
 VALUE
 nst_check_compatibility(VALUE nst, VALUE ary)
 {
@@ -527,7 +531,7 @@ nst_check_compatibility(VALUE nst, VALUE ary)
     narray_t *nt;
 
     if (TYPE(ary) != T_ARRAY) {
-        if (nst==CLASS_OF(ary)) { // same Struct
+        if (nst==rb_obj_class(ary)) { // same Struct
             return Qtrue;
         }
         return Qfalse;
@@ -579,7 +583,7 @@ nst_check_compatibility(VALUE nst, VALUE ary)
     }
     return Qtrue;
 }
-
+*/
 
 
 VALUE na_ary_composition_for_struct(VALUE nstruct, VALUE ary);
@@ -600,7 +604,7 @@ iter_nstruct_from_a(na_loop_t *const lp)
 
     len = RARRAY_LEN(types);
     ary = lp->args[1].value;
-    //rb_p(CLASS_OF(ary));rb_p(ary);
+    //rb_p(rb_obj_class(ary));rb_p(ary);
 
     for (i=0; i<len; i++) {
         def  = RARRAY_AREF(defs,i);
@@ -629,7 +633,7 @@ nary_struct_cast_array(VALUE klass, VALUE rary)
     ndfunc_t ndf = {iter_nstruct_from_a, NO_LOOP, 3, 0, ain, 0};
 
     //fprintf(stderr,"rary:");rb_p(rary);
-    //fprintf(stderr,"class_of(rary):");rb_p(CLASS_OF(rary));
+    //fprintf(stderr,"class_of(rary):");rb_p(rb_obj_class(rary));
 
     //vnc = na_ary_composition_for_struct(klass, rary);
     //Data_Get_Struct(vnc, na_compose_t, nc);
@@ -715,7 +719,7 @@ nary_struct_store_struct(VALUE self, VALUE obj)
 static inline VALUE
 nary_struct_store_array(VALUE self, VALUE obj)
 {
-    return nary_struct_store_struct(self, nary_struct_cast_array(CLASS_OF(self),obj));
+    return nary_struct_store_struct(self, nary_struct_cast_array(rb_obj_class(self),obj));
 }
 
 /*
@@ -731,13 +735,13 @@ nary_struct_store(VALUE self, VALUE obj)
         nary_struct_store_array(self,obj);
         return self;
     }
-    if (CLASS_OF(self) == CLASS_OF(obj)) {
+    if (rb_obj_class(self) == rb_obj_class(obj)) {
         nary_struct_store_struct(self,obj);
         return self;
     }
     rb_raise(nary_eCastError, "unknown conversion from %s to %s",
-             rb_class2name(CLASS_OF(obj)),
-             rb_class2name(CLASS_OF(self)));
+             rb_class2name(rb_obj_class(obj)),
+             rb_class2name(rb_obj_class(self)));
     return self;
 }
 
@@ -785,7 +789,7 @@ iter_struct_inspect(char *ptr, size_t pos, VALUE opt)
   @overload inspect
   @return [String]
 */
-VALUE
+static VALUE
 nary_struct_inspect(VALUE ary)
 {
     VALUE opt;