numo-narray 0.9.0.1-x86-mingw32 → 0.9.0.3-x86-mingw32

data/ext/numo/narray/ndloop.c

@@ -73,7 +73,7 @@ typedef struct NA_MD_LOOP {
 
 #define NDL_READ 1
 #define NDL_WRITE 2
-#define NDL_READ_WRITE 3
+#define NDL_READ_WRITE (NDL_READ|NDL_WRITE)
 
 static inline VALUE
 nary_type_s_cast(VALUE type, VALUE obj)
@@ -153,7 +153,7 @@ print_ndloop(na_md_loop_t *lp) {
         printf("--user.args[%d]--\n", j);
         printf("  user.args[%d].ptr = 0x%"SZF"x\n", j, (size_t)LARG(lp,j).ptr);
         printf("  user.args[%d].elmsz = %"SZF"d\n", j, LARG(lp,j).elmsz);
-        printf("  user.args[%d].value = 0x%"SZF"x\n", j, LARG(lp,j).value);
+        printf("  user.args[%d].value = 0x%"PRI_VALUE_PREFIX"x\n", j, LARG(lp,j).value);
         printf("  user.args[%d].ndim = %d\n", j, LARG(lp,j).ndim);
         printf("  user.args[%d].shape = 0x%"SZF"x\n", j, (size_t)LARG(lp,j).shape);
         if (LARG(lp,j).shape) {
@@ -253,7 +253,7 @@ ndloop_cast_args(ndfunc_t *nf, VALUE args)
         value = RARRAY_AREF(args,j);
         if (!ndloop_cast_required(type, value))
             continue;
-        
+
         if (ndloop_castable_type(type)) {
             RARRAY_ASET(args,j,nary_type_s_cast(type, value));
             copy_flag |= 1<<j;
@@ -300,7 +300,7 @@ ndloop_find_max_dimension(na_md_loop_t *lp, ndfunc_t *nf, VALUE args)
     int nin=0; // number of input objects (except for symbols)
     int user_nd=0; // max dimension of user function
     int loop_nd=0; // max dimension of md-loop
-    
+
     for (j=0; j<RARRAY_LEN(args); j++) {
         VALUE t = nf->ain[j].type;
         VALUE v = RARRAY_AREF(args,j);
@@ -309,7 +309,7 @@ ndloop_find_max_dimension(na_md_loop_t *lp, ndfunc_t *nf, VALUE args)
         } else {
             nin++;
             user_nd = max2(user_nd, nf->ain[j].dim);
-            if (IsNArray(v)) 
+            if (IsNArray(v))
                 loop_nd = max2(loop_nd, RNARRAY_NDIM(v) - nf->ain[j].dim);
         }
     }
@@ -377,7 +377,7 @@ ndloop_alloc(na_md_loop_t *lp, ndfunc_t *nf, VALUE args,
     ndloop_find_max_dimension(lp, nf, args);
     narg = lp->nin + nf->nout;
     max_nd = lp->ndim + lp->user.ndim;
-    
+
     lp->n    = lp->n_ptr = ALLOC_N(size_t, max_nd+1);
     lp->xargs = ALLOC_N(na_loop_xargs_t, narg);
     lp->user.args = ALLOC_N(na_loop_args_t, narg);
@@ -535,11 +535,14 @@ ndloop_set_stepidx(na_md_loop_t *lp, int j, VALUE vna, int *dim_map, int rwflag)
 
     LARG(lp,j).value = vna;
     LARG(lp,j).elmsz = na_get_elmsz(vna);
-    if (rwflag & NDL_READ) {
+    if (rwflag == NDL_READ) {
         LARG(lp,j).ptr = na_get_pointer_for_read(vna);
     } else
-    if (rwflag & NDL_WRITE) {
+    if (rwflag == NDL_WRITE) {
         LARG(lp,j).ptr = na_get_pointer_for_write(vna);
+    } else
+    if (rwflag == NDL_READ_WRITE) {
+        LARG(lp,j).ptr = na_get_pointer_for_read_write(vna);
     } else {
         rb_bug("invalid value for read-write flag");
     }
@@ -890,7 +893,8 @@ ndfunc_contract_loop(na_md_loop_t *lp)
             }
         }
         if (success) {
-            //printf("contract i=%d-th and %d-th\n",i-1,i);
+            //printf("contract i=%d-th and %d-th, lp->n[%d]=%"SZF"d, lp->n[%d]=%"SZF"d\n",
+            //       i-1,i, i,lp->n[i], i-1,lp->n[i-1]);
             // contract (i-1)-th and i-th dimension
             lp->n[i] *= lp->n[i-1];
             // shift dimensions
@@ -915,6 +919,7 @@ ndfunc_contract_loop(na_md_loop_t *lp)
     //printf("contract cnt=%d\n",cnt);
     if (cnt>0) {
         for (j=0; j<lp->narg; j++) {
+            LITER(lp,cnt,j).pos = LITER(lp,0,j).pos;
             lp->xargs[j].iter = &LITER(lp,cnt,j);
         }
         lp->n = &(lp->n[cnt]);
@@ -1312,10 +1317,10 @@ ndloop_run(VALUE vlp)
     // loop
     (*(lp->loop_func))(nf, lp);
 
-    if (na_debug_flag) {
-        printf("-- after loop --\n");
-        print_ndloop(lp);
-    }
+    //if (na_debug_flag) {
+    //    printf("-- after loop --\n");
+    //    print_ndloop(lp);
+    //}
 
     if (RTEST(lp->user.err_type)) {
         rb_raise(lp->user.err_type, "error in NArray operation");
@@ -1531,25 +1536,9 @@ na_info_str(VALUE ary)
 
 //----------------------------------------------------------------------
 
-static void
-ndloop_inspect_get_width(int *ncol, int *nrow)
-{
-    VALUE cols, rows;
-
-    cols = rb_ivar_get(cNArray,rb_intern("inspect_cols"));
-    if (RTEST(cols)) {
-        *ncol = NUM2INT(cols);
-    } else {
-        *ncol = 80;
-    }
-
-    rows = rb_ivar_get(cNArray,rb_intern("inspect_rows"));
-    if (RTEST(rows)) {
-        *nrow = NUM2INT(rows);
-    } else {
-        *nrow = 20;
-    }
-}
+#define ncol numo_na_inspect_cols
+#define nrow numo_na_inspect_rows
+extern int ncol, nrow;
 
 static void
 loop_inspect(ndfunc_t *nf, na_md_loop_t *lp)
@@ -1559,8 +1548,6 @@ loop_inspect(ndfunc_t *nf, na_md_loop_t *lp)
     int col=0, row=0;
     long len;
     VALUE str;
-    int ncol;
-    int nrow;
     na_text_func_t func = (na_text_func_t)(nf->func);
     VALUE buf, opt;
 
@@ -1587,8 +1574,6 @@ loop_inspect(ndfunc_t *nf, na_md_loop_t *lp)
         rb_str_cat(buf,"",0);
     }
 
-    ndloop_inspect_get_width(&ncol,&nrow);
-
     col = nd*2;
     for (i=0;;) {
         if (i<nd-1) {

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

@@ -1,7 +1,7 @@
 /*
   intern.h
   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
@@ -19,6 +19,7 @@ VALUE na_original_data(VALUE self);
 VALUE na_make_view(VALUE self);
 VALUE na_make_view_struct(VALUE self, VALUE dtype, VALUE offset);
 void na_array_to_internal_shape(VALUE self, VALUE ary, size_t *shape);
+VALUE na_expand_dims(VALUE self, VALUE vdim);
 
 VALUE na_reduce_dimension(int argc, VALUE *argv, int naryc, VALUE *naryv);
 
@@ -37,7 +38,7 @@ VALUE na_sort_index_main(int argc, VALUE *argv, VALUE self, void (*func_qsort)()
 char *na_get_pointer(VALUE);
 char *na_get_pointer_for_write(VALUE);
 char *na_get_pointer_for_read(VALUE);
-char *na_get_pointer_at_origin_for_read(VALUE);
+char *na_get_pointer_for_read_write(VALUE);
 
 size_t na_get_offset(VALUE self);
 
@@ -50,7 +51,6 @@ void na_alloc_index(narray_t *na);
 void na_copy_flags(VALUE src, VALUE dst);
 
 VALUE na_flatten(VALUE);
-VALUE na_dup(VALUE);
 VALUE na_copy(VALUE);
 VALUE na_upcast(VALUE type1, VALUE type2);
 

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

@@ -1,7 +1,7 @@
 /*
   narray.h
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2003 by Masahiro TANAKA
+    (C) Copyright 1999-2016 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -11,14 +11,13 @@
 #ifndef NARRAY_H
 #define NARRAY_H
 
-#define NARRAY_VERSION "0.9.0.1"
-#define NARRAY_VERSION_CODE 901
+#define NARRAY_VERSION "0.9.0.3"
+#define NARRAY_VERSION_CODE 903
 
 #include <math.h>
 #include "numo/compat.h"
 #include "numo/template.h"
-
-#include "extconf.h"
+#include "numo/extconf.h"
 
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
@@ -56,19 +55,7 @@
 # endif
 #endif
 
-#if   SIZEOF_VOIDP==SIZEOF_LONG
-# define NUM2SIZE(x) NUM2ULONG(x)
-# define NUM2SSIZE(x) NUM2LONG(x)
-# define SIZE2NUM(x) ULONG2NUM(x)
-# define SSIZE2NUM(x) LONG2NUM(x)
-# define SZF "l"
-#elif SIZEOF_VOIDP==SIZEOF_LONG_LONG
-# define NUM2SIZE(x) NUM2ULL(x)
-# define NUM2SSIZE(x) NUM2LL(x)
-# define SIZE2NUM(x) ULL2NUM(x)
-# define SSIZE2NUM(x) LL2NUM(x)
-# define SZF "ll"
-#endif
+#define SZF PRI_SIZE_PREFIX // defined in ruby.h
 
 #if   SIZEOF_LONG==8
 # define NUM2INT64(x) NUM2LONG(x)
@@ -358,13 +345,10 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 #endif
 #endif
 
-
 #define IsNArray(obj) (rb_obj_is_kind_of(obj,cNArray)==Qtrue)
 
 #define DEBUG_PRINT(v) puts(StringValueCStr(rb_funcall(v,rb_intern("inspect"),0)))
 
-
-
 #define NA_IsNArray(obj) \
   (rb_obj_is_kind_of(obj,cNArray)==Qtrue)
 #define NA_IsArray(obj) \
@@ -375,37 +359,17 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 
 #define NA_MAX_DIMENSION (int)(sizeof(VALUE)*8-2)
 
-/* Function Prototypes */
-
-
-typedef struct {
-    double beg;
-    double step;
-    double count;
-} seq_opt_t;
-
-typedef struct {
-    u_int64_t max;
-    int64_t sign;
-    int shift;
-} rand_opt_t;
-
-
 typedef unsigned int BIT_DIGIT;
 //#define BYTE_BIT_DIGIT sizeof(BIT_DIGIT)
 #define NB     (sizeof(BIT_DIGIT)*8)
 #define BALL   (~(BIT_DIGIT)0)
 #define SLB(n) (((n)==NB)?~(BIT_DIGIT)0:(~(~(BIT_DIGIT)0<<(n))))
 
-//#include "template.h"
-
 #define ELEMENT_BIT_SIZE  "ELEMENT_BIT_SIZE"
 #define ELEMENT_BYTE_SIZE "ELEMENT_BYTE_SIZE"
 #define CONTIGUOUS_STRIDE "CONTIGUOUS_STRIDE"
 
 #include "numo/ndloop.h"
-//#include "ndfunc.h"
-
 #include "numo/intern.h"
 
 #endif /* ifndef NARRAY_H */

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

@@ -1,7 +1,7 @@
 /*
-  narray.h
+  template.h
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2003 by Masahiro TANAKA
+    (C) Copyright 1999-2016 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program

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

@@ -1,19 +1,33 @@
-typedef int dtype;
+typedef BIT_DIGIT dtype;
+typedef BIT_DIGIT rtype;
+#define cT  numo_cBit
+#define cRT cT
 
-#define m_load_data(ptr,pos) load_data(ptr,pos)
+#define m_zero 0
+#define m_one  1
 
-#define m_sprintf(s,x)   sprintf(s,"%1d",(int)(x))
-
-#define m_bit_not(x)   (~(x))
+#define m_abs(x)     (x)
+#define m_sign(x)    (((x)==0) ? 0:1)
 
-#define m_bit_and(x,y) ((x)&(y))
-#define m_bit_or(x,y)  ((x)|(y))
-#define m_bit_xor(x,y) ((x)^(y))
-#define m_eq(x,y)      (~((x)^(y)))
+#define m_from_double(x) (((x)==0) ? 0 : 1)
+#define m_from_real(x) (((x)==0) ? 0 : 1)
+#define m_data_to_num(x) INT2FIX(x)
+#define m_sprintf(s,x)   sprintf(s,"%1d",(int)(x))
 
-#define m_count_true(x)  (x!=0)
-#define m_count_false(x) (x==0)
+#define m_copy(x)  (x)
+#define m_not(x)   (~(x))
+#define m_and(x,y) ((x)&(y))
+#define m_or(x,y)  ((x)|(y))
+#define m_xor(x,y) ((x)^(y))
+#define m_eq(x,y)  (~((x)^(y)))
+#define m_count_true(x)  ((x)!=0)
+#define m_count_false(x) ((x)==0)
 
-static inline dtype load_data(void *ptr, size_t pos) {
-    return (((BIT_DIGIT*)(ptr))[(pos)/NB]>>((pos)%NB)) & 1u;
+static inline BIT_DIGIT m_num_to_data(VALUE num) {
+    if (RTEST(num)) {
+        if (!RTEST(rb_equal(num,INT2FIX(0)))) {
+            return 1;
+        }
+    }
+    return 0;
 }

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

@@ -123,7 +123,7 @@ static inline dtype c_div_r(dtype x, rtype y) {
     return z;
 }
 
-static inline dtype c_inverse(dtype x) {
+static inline dtype c_reciprocal(dtype x) {
     dtype z;
     if ( r_abs(REAL(x)) > r_abs(IMAG(x)) ) {
         IMAG(z) = IMAG(x)/REAL(x);
@@ -372,7 +372,7 @@ static inline dtype c_pow_int(dtype x, int p)
     dtype z = c_one();
     if (p<0) {
 	x = c_pow_int(x,-p);
-	return c_inverse(x);
+	return c_reciprocal(x);
     }
     if (p==2) {return c_square(x);}
     if (p&1) {z = x;}

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

@@ -61,13 +61,21 @@ static inline dtype c_from_dcomplex(dcomplex x) {
 #define m_pow(x,y) c_pow(x,y)
 #define m_pow_int(x,y) c_pow_int(x,y)
 
-#define m_minus(x)   c_minus(x)
-#define m_inverse(x) c_inverse(x)
-#define m_square(x)  c_square(x)
-#define m_im(x)      c_im(x)
-
-#define m_conj(x)  c_new(REAL(x),-IMAG(x))
 #define m_abs(x)   c_abs(x)
+#define m_minus(x) c_minus(x)
+#define m_reciprocal(x) c_reciprocal(x)
+#define m_square(x) c_square(x)
+#define m_floor(x) c_new(floor(REAL(x)),floor(IMAG(x)))
+#define m_round(x) c_new(round(REAL(x)),round(IMAG(x)))
+#define m_ceil(x)  c_new(ceil(REAL(x)),ceil(IMAG(x)))
+#define m_trunc(x) c_new(trunc(REAL(x)),trunc(IMAG(x)))
+#define m_rint(x)  c_new(rint(REAL(x)),rint(IMAG(x)))
+#define m_sign(x)  c_new( \
+ ((REAL(x)==0) ? 0.0:((REAL(x)>0) ? 1.0:((REAL(x)<0) ? -1.0:REAL(x)))), \
+ ((IMAG(x)==0) ? 0.0:((IMAG(x)>0) ? 1.0:((IMAG(x)<0) ? -1.0:IMAG(x)))))
+
+#define m_im(x)    c_im(x)
+#define m_conj(x)  c_new(REAL(x),-IMAG(x))
 #define m_arg(x)   atan2(IMAG(x),REAL(x))
 
 #define m_eq(x,y) c_eq(x,y)
@@ -84,7 +92,6 @@ static inline dtype c_from_dcomplex(dcomplex x) {
 #define m_mulsum(x,y,z) {z = c_add(c_mul(x,y),z);}
 #define m_mulsum_init INT2FIX(0)
 
-#define m_rand c_new(to_res53(gen_rand64()),to_res53(gen_rand64()))
 #define m_rand_norm(a) rand_norm(a)
 
 #define m_sprintf(s,x) sprintf(s,"%g%+gi",REAL(x),IMAG(x))
@@ -203,3 +210,8 @@ static inline rtype f_rms(size_t n, char *p, ssize_t stride)
     }
     return r_sqrt(y/count);
 }
+
+static inline dtype f_seq(dtype x, dtype y, double c)
+{
+    return c_add(x,c_mul_r(y,c));
+}

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

@@ -9,3 +9,12 @@ typedef double rtype;
 static inline bool c_nearly_eq(dtype x, dtype y) {
     return c_abs(c_sub(x,y)) <= (c_abs(x)+c_abs(y))*DBL_EPSILON*2;
 }
+
+/* generates a random number on [0,1)-real-interval */
+inline static dtype m_rand(dtype max)
+{
+    dtype z;
+    REAL(z) = genrand_res53_mix() * REAL(max);
+    IMAG(z) = genrand_res53_mix() * IMAG(max);
+    return z;
+}

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

@@ -6,6 +6,12 @@ typedef double rtype;
 
 #include "float_macro.h"
 
+/* generates a random number on [0,1)-real-interval */
+inline static dtype m_rand(dtype max)
+{
+    return genrand_res53_mix() * max;
+}
+
 #define m_min_init numo_dfloat_new_dim0(0.0/0.0)
 #define m_max_init numo_dfloat_new_dim0(0.0/0.0)
 #define m_extract(x) rb_float_new(*(double*)x)

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

@@ -30,11 +30,14 @@ EXTERN double pow(double, double);
 
 #define m_abs(x)     fabs(x)
 #define m_minus(x)   (-(x))
-#define m_inverse(x) (1/(x))
+#define m_reciprocal(x) (1/(x))
 #define m_square(x)  ((x)*(x))
 #define m_floor(x)   floor(x)
 #define m_round(x)   round(x)
 #define m_ceil(x)    ceil(x)
+#define m_trunc(x)   trunc(x)
+#define m_rint(x)    rint(x)
+#define m_sign(x)    (((x)==0) ? 0.0:(((x)>0) ? 1.0:(((x)<0) ? -1.0:(x))))
 
 #define m_eq(x,y) ((x)==(y))
 #define m_ne(x,y) ((x)!=(y))
@@ -50,7 +53,6 @@ EXTERN double pow(double, double);
 #define m_mulsum(x,y,z) {z += x*y;}
 #define m_mulsum_init INT2FIX(0)
 
-#define m_rand to_res53(gen_rand64())
 #define m_rand_norm(a) rand_norm(a)
 
 #define m_sprintf(s,x) sprintf(s,"%g",x)
@@ -275,3 +277,8 @@ static inline size_t f_max_index(size_t n, char *p, ssize_t stride)
     }
     return j;
 }
+
+static inline dtype f_seq(dtype x, dtype y, double c)
+{
+    return x + y * c;
+}