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

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

@@ -7,6 +7,5 @@ typedef int16_t rtype;
 #define m_data_to_num(x) INT2NUM((int)(x))
 #define m_extract(x)     INT2NUM((int)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "int_macro.h"

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

@@ -7,6 +7,5 @@ typedef int32_t rtype;
 #define m_data_to_num(x) INT322NUM((int32_t)(x))
 #define m_extract(x)     INT322NUM((int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId32,(int32_t)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "int_macro.h"

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

@@ -7,6 +7,5 @@ typedef int64_t rtype;
 #define m_data_to_num(x) INT642NUM((int64_t)(x))
 #define m_extract(x)     INT642NUM((int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId64,(int64_t)(x))
-#define m_rand           ((dtype)gen_rand64())
 
 #include "int_macro.h"

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

@@ -7,6 +7,5 @@ typedef int8_t rtype;
 #define m_data_to_num(x) INT2NUM((int)(x))
 #define m_extract(x)     INT2NUM((int)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "int_macro.h"

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

@@ -1,8 +1,9 @@
 #include "xint_macro.h"
 
 #define m_abs(x)     ((x<0)?-x:x)
+#define m_sign(x)    (((x)==0) ? 0 : (((x)>0) ? 1 : -1))
 
-static inline dtype int_inverse(dtype x) {
+static inline dtype int_reciprocal(dtype x) {
     switch (x) {
     case 1:
         return 1;

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

@@ -20,11 +20,13 @@
 
 #define m_abs(x)       rb_funcall(x,id_abs,0)
 #define m_minus(x)     rb_funcall(x,id_minus,0)
-#define m_inverse(x)   rb_funcall(x,id_inverse,0)
+#define m_reciprocal(x)   rb_funcall(x,id_reciprocal,0)
 #define m_square(x)    rb_funcall(x,'*',1,x)
 #define m_floor(x)     rb_funcall(x,id_floor,0)
 #define m_round(x)     rb_funcall(x,id_round,0)
 #define m_ceil(x)      rb_funcall(x,id_ceil,0)
+#define m_trunc(x)     rb_funcall(x,id_truncate,0)
+#define m_sign(x)      rb_funcall(x,id_op_ufo,1,INT2FIX(0))
 
 #define m_eq(x,y)      RTEST(rb_funcall(x,id_eq,1,y))
 #define m_ne(x,y)      RTEST(rb_funcall(x,id_ne,1,y))
@@ -45,7 +47,6 @@
 #define m_mulsum(x,y,z) {z = m_add(m_mul(x,y),z);}
 #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) robj_sprintf(s,x)
@@ -216,3 +217,9 @@ 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, size_t c)
+{
+    y = m_mul(y,SIZET2NUM(c));
+    return m_add(x,y);
+}

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

@@ -19,3 +19,9 @@ inline static int robj_nearly_eq(VALUE vx, VALUE vy)
     y = NUM2DBL(vy);
     return (fabs(x-y)<=(fabs(x)+fabs(y))*DBL_EPSILON*2);
 }
+
+/* generates a random number on [0,1)-real-interval */
+inline static dtype m_rand(dtype max)
+{
+    return DBL2NUM(genrand_res53_mix() * max);
+}

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

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

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

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

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

@@ -7,6 +7,5 @@ typedef u_int16_t rtype;
 #define m_data_to_num(x) UINT2NUM((unsigned int)(x))
 #define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "uint_macro.h"

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

@@ -7,6 +7,5 @@ typedef u_int32_t rtype;
 #define m_data_to_num(x) UINT322NUM((u_int32_t)(x))
 #define m_extract(x)     UINT322NUM((u_int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu32,(u_int32_t)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "uint_macro.h"

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

@@ -7,6 +7,5 @@ typedef u_int64_t rtype;
 #define m_data_to_num(x) UINT642NUM((u_int64_t)(x))
 #define m_extract(x)     UINT642NUM((u_int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu64,(u_int64_t)(x))
-#define m_rand           ((dtype)gen_rand64())
 
 #include "uint_macro.h"

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

@@ -7,6 +7,5 @@ typedef u_int8_t rtype;
 #define m_data_to_num(x) UINT2NUM((unsigned int)(x))
 #define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
-#define m_rand           ((dtype)gen_rand32())
 
 #include "uint_macro.h"

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

@@ -1,8 +1,9 @@
 #include "xint_macro.h"
 
 #define m_abs(x)     (x)
+#define m_sign(x)    (((x)==0) ? 0:1)
 
-static inline dtype int_inverse(dtype x) {
+static inline dtype int_reciprocal(dtype x) {
     switch (x) {
     case 1:
         return 1;

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

@@ -19,7 +19,7 @@
 #define m_bit_not(x)   (~(x))
 
 #define m_minus(x)   (-(x))
-#define m_inverse(x) int_inverse(x)
+#define m_reciprocal(x) int_reciprocal(x)
 #define m_square(x)  ((x)*(x))
 
 #define m_eq(x,y) ((x)==(y))
@@ -131,3 +131,8 @@ static inline size_t f_max_index(size_t n, char *p, ssize_t stride)
     }
     return j;
 }
+
+static inline double f_seq(double x, double y, double c)
+{
+    return x + y * c;
+}

data/ext/numo/narray/rand.c

@@ -41,9 +41,9 @@ void rand_norm(double *a)
 {
     double x1, x2, w;
     do {
-	x1 = to_res53(gen_rand64());
+	x1 = genrand_res53_mix();
 	x1 = x1*2-1;
-	x2 = to_res53(gen_rand64());
+	x2 = genrand_res53_mix();
 	x2 = x2*2-1;
 	w = x1 * x1 + x2 * x2;
     } while (w>=1);

data/ext/numo/narray/step.c

@@ -230,13 +230,13 @@ nary_step_array_index(VALUE self, size_t ary_size,
     //vstep = rb_funcall(self, id_step, 0);
 
     if (RTEST(vbeg)) {
-        beg = NUM2SSIZE(vbeg);
+        beg = NUM2SSIZET(vbeg);
         if (beg<0) {
             beg += ary_size;
         }
     }
     if (RTEST(vend)) {
-        end = NUM2SSIZE(vend);
+        end = NUM2SSIZET(vend);
         if (end<0) {
             end += ary_size;
         }
@@ -245,10 +245,10 @@ nary_step_array_index(VALUE self, size_t ary_size,
     //puts("pass 1");
 
     if (RTEST(vlen)) {
-        len = NUM2SIZE(vlen);
+        len = NUM2SIZET(vlen);
         if (len>0) {
             if (RTEST(vstep)) {
-                step = NUM2SSIZE(step);
+                step = NUM2SSIZET(step);
                 if (RTEST(vbeg)) {
                     if (RTEST(vend)) {
                         rb_raise( rb_eStandardError, "verbose Step object" );
@@ -295,7 +295,7 @@ nary_step_array_index(VALUE self, size_t ary_size,
         }
     } else { // no len
         if (RTEST(vstep)) {
-            step = NUM2SSIZE(vstep);
+            step = NUM2SSIZET(vstep);
         } else {
             step = 1;
         }
@@ -368,7 +368,7 @@ nary_step_sequence( VALUE self, size_t *plen, double *pbeg, double *pstep )
     //vstep = rb_funcall(self, id_step,0);
 
     if (RTEST(vlen)) {
-        size = NUM2SIZE(vlen);
+        size = NUM2SIZET(vlen);
 
         if (!RTEST(vstep)) {
             if (RTEST(vend)) {
@@ -429,7 +429,7 @@ step_each( VALUE self )
     a = nary_step_parameters( self, Qnil );
     beg  = NUM2DBL(RARRAY_PTR(a)[0]);
     step = NUM2DBL(RARRAY_PTR(a)[1]);
-    size = NUM2SIZE(RARRAY_PTR(a)[2]);
+    size = NUM2SIZET(RARRAY_PTR(a)[2]);
 
     for (i=0; i<size; i++) {
         rb_yield(rb_float_new(beg+i*step));

data/ext/numo/narray/struct.c

@@ -1,7 +1,7 @@
 /*
   nstrut.c
   Numerical Array Extension for Ruby
-    (C) Copyright 1999-2007,2013 by Masahiro TANAKA
+    (C) Copyright 1999-2016 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -29,7 +29,7 @@ nst_allocate(VALUE self)
         ptr = NA_DATA_PTR(na);
         if (na->size > 0 && ptr == NULL) {
             velmsz = rb_const_get(CLASS_OF(self), rb_intern("element_byte_size"));
-            ptr = xmalloc(NUM2SIZE(velmsz) * na->size);
+            ptr = xmalloc(NUM2SIZET(velmsz) * na->size);
             NA_DATA_PTR(na) = ptr;
         }
         break;
@@ -70,7 +70,7 @@ nst_definition(VALUE nst, VALUE idx)
     } else if (rb_obj_is_kind_of(idx,rb_cNumeric)) {
         i = NUM2LONG(idx);
         if (i<-len || i>=len) {
-            rb_raise(rb_eIndexError,"offset %"SZF"u out of range of struct(size:%ld)", i, len);
+            rb_raise(rb_eIndexError,"offset %ld out of range of struct(size:%ld)", i, len);
         }
         return RARRAY_AREF(def,i);
     }
@@ -170,7 +170,7 @@ na_make_view_struct(VALUE self, VALUE dtype, VALUE offset)
     }
 
     if (RTEST(offset)) {
-        na2->offset += NUM2SIZE(offset);
+        na2->offset += NUM2SIZET(offset);
     }
 
     return view;
@@ -273,9 +273,8 @@ nst_s_new(int argc, VALUE *argv, VALUE klass)
     }
 
     if (NIL_P(name)) {
-        st = rb_class_new(klass);
-        rb_make_metaclass(st, RBASIC(klass)->klass);
-        rb_class_inherited(klass, st);
+        st = rb_define_class_id(name, klass);
+        rb_funcall(klass, rb_intern("inherited"), 1, st);
     }
     else {
         char *cname = StringValuePtr(name);
@@ -374,7 +373,7 @@ nstruct_add_type(VALUE type, int argc, VALUE *argv, VALUE nst)
     }
 
     ofs  = rb_iv_get(nst, "__offset__");
-    nt->offset = NUM2SIZE(ofs);
+    nt->offset = NUM2SIZET(ofs);
 
     size = rb_funcall(type, rb_intern("byte_size"), 0);
     rb_iv_set(nst, "__offset__", rb_funcall(ofs,'+',1,size));
@@ -410,8 +409,8 @@ iter_nstruct_to_a(na_loop_t *const lp)
 
     for (i=0; i<len; i++) {
         def  = RARRAY_AREF(defs,i);
-        ofs  = NUM2SIZE(RARRAY_AREF(def,2));
-        //ofs  = NUM2SIZE(RARRAY_AREF(ofsts,i));
+        ofs  = NUM2SIZET(RARRAY_AREF(def,2));
+        //ofs  = NUM2SIZET(RARRAY_AREF(ofsts,i));
         elmt = RARRAY_AREF(types,i);
         GetNArrayView(elmt,ne);
         ne->offset = pos + ofs;
@@ -593,7 +592,7 @@ iter_nstruct_from_a(na_loop_t *const lp)
 
     for (i=0; i<len; i++) {
         def  = RARRAY_AREF(defs,i);
-        ofs  = NUM2SIZE(RARRAY_AREF(def,2));
+        ofs  = NUM2SIZET(RARRAY_AREF(def,2));
         elmt = RARRAY_AREF(types,i);
         GetNArrayView(elmt,ne);
         ne->offset = lp->args[1].iter[0].pos + ofs;
@@ -748,7 +747,7 @@ iter_struct_inspect(char *ptr, size_t pos, VALUE opt)
     for (i=0; i<len; i++) {
         def  = RARRAY_AREF(defs,i);
         name = RARRAY_AREF(def,0);
-        ofs  = NUM2SIZE(RARRAY_AREF(def,2));
+        ofs  = NUM2SIZET(RARRAY_AREF(def,2));
         elmt = RARRAY_AREF(types,i);
         GetNArrayView(elmt,ne);
         ne->offset = pos + ofs;

data/lib/erbpp.rb

@@ -148,7 +148,7 @@ class Function < ErbPP
 
   attrs = %w[
     singleton
-    method
+    meth
     n_arg
   ]
   define_attrs attrs
@@ -161,6 +161,10 @@ class Function < ErbPP
     end
   end
 
+  def method
+    meth.gsub(/\?/,"_p").gsub(/\!/,"_bang")
+  end
+
   def initialize(parent,tmpl,**opts)
     super
     @aliases = opts[:aliases] || []
@@ -195,7 +199,7 @@ class Function < ErbPP
   alias c_instance_method c_func
 
   def op_map
-    @op || method
+    @op || meth
   end
 
   def code

data/lib/erbpp/line_number.rb

@@ -115,7 +115,7 @@ class ERB
         # skip
       elsif num==1
         f = @filename.dump
-        line.sub!(/_erbout = '';/, "_erbout = CountLnString.new(#{f});")
+        line.sub!(/_erbout = (''|String\.new);/, "_erbout = CountLnString.new(#{f});")
       elsif /^; _erbout\.force_encoding/ =~ line
         line.sub!(/^;/,";_erbout.ln(#{num});")
       end

data/lib/erbpp/narray_def.rb

@@ -7,7 +7,7 @@ module DefMethod
   end
 
   def def_method(meth, n_arg, tmpl=nil, opts={})
-    h = {:method => meth, :n_arg => n_arg}
+    h = {:meth => meth, :n_arg => n_arg}
     h.merge!(opts)
     tmpl ||= meth
     Function.new(self, tmpl, h)
@@ -22,7 +22,7 @@ module DefMethod
   end
 
   def def_allocate(tmpl)
-    h = {:method => "allocate", :singleton => true}
+    h = {:meth => "allocate", :singleton => true}
     Allocate.new(self, tmpl, h)
   end
 
@@ -62,22 +62,15 @@ module DefMethod
     def_method(meth, 0, "cond_unary")
   end
 
-  def bit_binary(meth, op=nil)
-    h = {:op=>op}
-    h[:aliases] = [meth] if op
-    def_method(meth, 1, "bit_binary", h)
-  end
-
-  def bit_unary(meth, op=nil)
-    h = {:op=>op}
-    h[:aliases] = [meth] if op
-    def_method(meth, 0, "bit_unary", h)
-  end
-
   def bit_count(meth)
     def_method(meth, -1, "bit_count")
   end
 
+  def bit_reduce(meth, init_bit)
+    h = {:init_bit=>init_bit}
+    def_method(meth, -1, "bit_reduce", h)
+  end
+
   def accum(meth, dtype, tpclass)
     h = {:dtype => dtype, :tpclass => tpclass}
     def_method(meth, -1, "accum", h)
@@ -102,7 +95,7 @@ module DefMethod
   end
 
   def math(meth, n=1)
-    h = {:method => meth, :mod_var => 'mTM', :n_arg => n}
+    h = {:meth => meth, :mod_var => 'mTM', :n_arg => n}
     case n
     when 1
       ModuleFunction.new(self, "unary_s", h)
@@ -131,12 +124,16 @@ module DefMethod
     Store.new(self,"store_from",cname.downcase,dtype,"numo_c"+cname,macro)
   end
 
+  def store_bit(cname)
+    Store.new(self,"store_bit",cname.downcase,nil,"numo_c"+cname,nil)
+  end
+
   def store
     Function.new(self,"store","store")
   end
 
   def find_method(meth)
-    Function::DEFS.find{|x| x.kind_of?(Function) and meth == x.method }
+    Function::DEFS.find{|x| x.kind_of?(Function) and meth == x.meth }
   end
 
   def find_tmpl(meth)
@@ -158,8 +155,9 @@ class DataType < ErbPP
     @class_alias = []
     @upcast = []
     @mod_var = "cT"
-    @tmpl_dir = File.join(File.dirname(erb_path),"tmpl")
     load_type(type_file) if type_file
+    dir = template_dir || "tmpl"
+    @tmpl_dir = File.join(File.dirname(erb_path),dir)
   end
 
   attr_reader :tmpl_dir
@@ -171,6 +169,7 @@ class DataType < ErbPP
   attrs = %w[
     class_name
     ctype
+    template_dir
     blas_char
     complex_class_name
     complex_type
@@ -249,8 +248,13 @@ class DataType < ErbPP
       t = "cT"
     end
     if c=="Integer"
-      @upcast << "rb_hash_aset(hCast, rb_cFixnum, #{t});"
-      @upcast << "rb_hash_aset(hCast, rb_cBignum, #{t});"
+      if defined?(Fixnum) && Fixnum != Integer
+        @upcast << "rb_hash_aset(hCast, rb_cFixnum, #{t});"
+        @upcast << "rb_hash_aset(hCast, rb_cBignum, #{t});"
+      else
+        # RUBY_VERSION >= "2.4.0"
+        @upcast << "rb_hash_aset(hCast, rb_cInteger, #{t});"
+      end
     else
       @upcast << "rb_hash_aset(hCast, rb_c#{c}, #{t});"
     end