numo-narray 0.9.0.4 → 0.9.0.5

data/ext/numo/narray/gen/tmpl/frexp.c

@@ -0,0 +1,37 @@
+static void
+<%=c_iter%>(na_loop_t *const lp)
+{
+    size_t   i;
+    char    *p1, *p2, *p3;
+    ssize_t  s1, s2, s3;
+    dtype    x;
+    int      y;
+    INIT_COUNTER(lp, i);
+    INIT_PTR(lp, 0, p1, s1);
+    INIT_PTR(lp, 1, p2, s2);
+    INIT_PTR(lp, 2, p3, s3);
+    for (; i--;) {
+        GET_DATA_STRIDE(p1,s1,dtype,x);
+        x = m_<%=name%>(x,&y);
+        SET_DATA_STRIDE(p2,s2,dtype,x);
+        SET_DATA_STRIDE(p3,s3,int32_t,y);
+    }
+}
+
+/*
+  split the number x into a normalized fraction and an exponent.
+  Returns [mantissa, exponent], where x = mantissa * 2**exponent.
+
+  @overload <%=name%>(x)
+  @param [Numo::NArray,Numeric]  x
+  @return [Numo::<%=class_name%>,Numo::Int32]  mantissa and exponent.
+
+*/
+static VALUE
+<%=c_func(1)%>(VALUE mod, VALUE a1)
+{
+    ndfunc_arg_in_t ain[1] = {{cT,0}};
+    ndfunc_arg_out_t aout[2] = {{cT,0},{numo_cInt32,0}};
+    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP, 1,2, ain,aout };
+    return na_ndloop(&ndf, 1, a1);
+}

data/ext/numo/narray/gen/tmpl/init_class.c

@@ -0,0 +1,20 @@
+    /*
+      Document-class: <%= full_class_name %>
+      <%= description %>
+    */
+    cT = rb_define_class_under(<%=ns_var%>, "<%=class_name%>", cNArray);
+
+  <% for x in class_alias %>
+    // alias of <%=class_name%>
+    rb_define_const(<%=ns_var%>, "<%=x%>", <%=type_var%>);
+  <% end %>
+
+    hCast = rb_hash_new();
+    rb_define_const(cT, "UPCAST", hCast);
+    rb_hash_aset(hCast, rb_cArray,   cT);
+    <% for x in upcast %>
+    <%= x %><% end %>
+
+    <% @children.each do |m| %>
+    <%= m.init_def %><% end %>
+    rb_define_singleton_method(cT, "[]", <%=find("cast").c_func%>, -2);

data/ext/numo/narray/gen/tmpl/init_module.c

@@ -0,0 +1,12 @@
+    /*
+      Document-module: <%= full_module_name %>
+      <%= description %>
+    */
+    <%  if module_var != ns_var %>
+    <%=module_var%> = rb_define_module_under(<%=ns_var%>, "<%=module_name%>");
+    <%  end %>
+    <% @children.each do |m| %>
+    <%= m.init_def %><% end %>
+
+    //  how to do this?
+    //rb_extend_object(cT, mTM);

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

@@ -4,7 +4,7 @@ static VALUE
 <% if is_object %>
     return rb_inspect(*(VALUE*)(ptr+pos));
 <% else %>
-    return format_<%=tp%>(fmt, (dtype*)(ptr+pos));
+    return format_<%=type_name%>(fmt, (dtype*)(ptr+pos));
 <% end %>
 }
 
@@ -14,7 +14,7 @@ static VALUE
   @return [String]
 */
 VALUE
-<%=c_func%>(VALUE ary)
+<%=c_func(0)%>(VALUE ary)
 {
     return na_ndloop_inspect(ary, <%=c_iter%>, Qnil);
 }

data/ext/numo/narray/gen/tmpl/lib.c

@@ -0,0 +1,45 @@
+/*
+  <%= file_name %>
+  Ruby/Numo::GSL - GSL wrapper for Ruby/Numo::NArray
+
+  created on: 2017-03-11
+  Copyright (C) 2017 Masahiro Tanaka
+*/
+
+#include <ruby.h>
+#include <assert.h>
+#include "numo/narray.h"
+#include "numo/template.h"
+#include "SFMT.h"
+
+#define m_map(x) m_num_to_data(rb_yield(m_data_to_num(x)))
+
+<% id_decl.each do |x| %>
+<%= x %>
+<% end %>
+
+<% include_files.each do |f| %>
+#include <<%=f%>>
+<% end %>
+
+VALUE cT;
+extern VALUE cRT;
+
+<% children.each do |c|%>
+<%= c.result+"\n\n" %>
+<% end %>
+
+void
+Init_<%=lib_name%>(void)
+{
+    VALUE hCast, <%=ns_var%>;
+
+    <%=ns_var%> = rb_define_module("Numo");
+
+    <% id_assign.each do |x| %>
+    <%= x %><% end %>
+
+<% children.each do |c| %>
+<%= c.init_def %>
+<% end %>
+}

data/ext/numo/narray/gen/tmpl/logseq.c

@@ -61,7 +61,7 @@ static void
       [1+7.26156e-310i, 0.5+0.866025i, -0.5+0.866025i, -1+1.22465e-16i, ...]
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *args, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *args, VALUE self)
 {
     logseq_opt_t *g;
     VALUE vbeg, vstep, vbase;

data/ext/numo/narray/gen/tmpl/map_with_index.c

@@ -75,7 +75,7 @@ void
   Creates a new NArray containing the values returned by the block.
   Inplace option is allowed, i.e., `nary.inplace.map` overwrites `nary`.
 
-  @overload <%=method%>
+  @overload <%=name%>
 
   For a block {|x,i,j,...| ... }
   @yield [x,i,j,...]  x is an element, i,j,... are multidimensional indices.
@@ -84,7 +84,7 @@ void
 
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{Qnil,0}};
     ndfunc_arg_out_t aout[1] = {{cT,0}};

data/ext/numo/narray/gen/tmpl/median.c

@@ -1,5 +1,6 @@
+<% (is_float ? ["_ignan","_prnan"] : [""]).each do |j| %>
 static void
-<%=c_iter%>(na_loop_t *const lp)
+<%=c_iter%><%=j%>(na_loop_t *const lp)
 {
     size_t n;
     char *p1, *p2;
@@ -10,7 +11,7 @@ static void
     p2 = (lp->args[1]).ptr + (lp->args[1].iter[0]).pos;
     buf = (dtype*)p1;
 
-    <%=tp%>_qsort(buf, n, sizeof(dtype));
+    <%=type_name%>_qsort<%=j%>(buf, n, sizeof(dtype));
 
     <% if is_float %>
     for (; n; n--) {
@@ -28,17 +29,39 @@ static void
         *(dtype*)p2 = buf[(n-1)/2];
     }
 }
+<% end %>
+
+/*
+  <%=name%> of self.
+<% if is_float %>
+  @overload <%=name%>(axis:nil, nan:false)
+  @param [TrueClass] nan  If true, propagete NaN. If false, ignore NaN.
+<% else %>
+  @overload <%=name%>(axis:nil)
+<% end %>
+  @param [Numeric,Array,Range] axis  Affected dimensions.
+  @return [Numo::<%=class_name%>] returns <%=name%> of self.
+*/
 
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
+    int nan = 0;
     VALUE reduce;
-    ndfunc_arg_in_t ain[2] = {{cT,0},{sym_reduce,0}};
+    ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{sym_reduce,0}};
     ndfunc_arg_out_t aout[1] = {{INT2FIX(0),0}};
-    ndfunc_t ndf = {<%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE, 2,1, ain,aout};
-
-    self = na_copy(self);
-    reduce = na_reduce_dimension(argc, argv, 1, &self); // v[0] = self
+    ndfunc_t ndf = {0, NDF_HAS_LOOP|NDF_FLAT_REDUCE, 2,1, ain,aout};
 
+    self = na_copy(self); // as temporary buffer
+    reduce = na_reduce_dimension(argc, argv, 1, &self, &nan); // v[0] = self
+<% if is_float %>
+    if (nan) {
+        ndf.func = <%=c_iter%>_prnan;
+    } else {
+        ndf.func = <%=c_iter%>_ignan;
+    }
+<% else %>
+    ndf.func = <%=c_iter%>;
+<% end %>
     return na_ndloop(&ndf, 2, self, reduce);
 }

data/ext/numo/narray/gen/tmpl/minmax.c

@@ -1,47 +1,47 @@
+<% (is_float ? ["","_nan"] : [""]).each do |j| %>
 static void
-<%=c_iter%>(na_loop_t *const lp)
+<%=c_iter%><%=j%>(na_loop_t *const lp)
 {
-    size_t   i;
+    size_t   n;
     char    *p1;
     ssize_t  s1;
-    dtype    x,xmin,xmax;
+    dtype    xmin,xmax;
 
-    INIT_COUNTER(lp, i);
+    INIT_COUNTER(lp, n);
     INIT_PTR(lp, 0, p1, s1);
 
-    xmin = xmax = *(dtype*)p1;
-    p1 += s1;
-    i--;
-    for (; i--;) {
-        x = *(dtype*)p1;
-        if (!m_isnan(x)) {
-            if (m_isnan(xmax) || m_gt(x,xmax)) {
-                xmax = x;
-            }
-            if (m_isnan(xmin) || m_lt(x,xmin)) {
-                xmin = x;
-            }
-        }
-        p1 += s1;
-    }
+    f_<%=name%><%=j%>(n,p1,s1,&xmin,&xmax);
+
     *(dtype*)(lp->args[1].ptr + lp->args[1].iter[0].pos) = xmin;
     *(dtype*)(lp->args[2].ptr + lp->args[2].iter[0].pos) = xmax;
 }
+<% end %>
 
 /*
-  <%=method.capitalize%> of self.
-  @overload <%=method%>(*args)
-  @param [Array of Numeric,Range] args  Affected dimensions.
+  <%=name%> of self.
+<% if is_float %>
+  @overload <%=name%>(axis:nil, nan:false)
+  @param [TrueClass] nan  If true, propagete NaN. If false, ignore NaN.
+<% else %>
+  @overload <%=name%>(axis:nil)
+<% end %>
+  @param [Numeric,Array,Range] axis  Affected dimensions.
   @return [Numo::<%=class_name%>,Numo::<%=class_name%>] min and max of self.
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
+    int ignore_nan = 0;
     VALUE reduce;
     ndfunc_arg_in_t ain[2] = {{cT,0},{sym_reduce,0}};
     ndfunc_arg_out_t aout[2] = {{cT,0},{cT,0}};
     ndfunc_t ndf = {<%=c_iter%>, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE|NDF_EXTRACT, 2,2, ain,aout};
 
-    reduce = na_reduce_dimension(argc, argv, 1, &self);
+    reduce = na_reduce_dimension(argc, argv, 1, &self, &ignore_nan);
+<% if is_float %>
+    if (ignore_nan) {
+        ndf.func = <%=c_iter%>_nan;
+    }
+<% end %>
     return na_ndloop(&ndf, 2, self, reduce);
 }

data/ext/numo/narray/gen/tmpl/module.c

@@ -0,0 +1,9 @@
+/*
+  module definition: <%= full_module_name %>
+*/
+
+<%  if module_var != ns_var %>
+VALUE <%=module_var%>;
+<%  end %>
+
+<%= method_code %>

data/ext/numo/narray/gen/tmpl/new_dim0.c

@@ -0,0 +1,12 @@
+static VALUE
+<%=c_func(:nodef)%>(dtype x)
+{
+    VALUE v;
+    dtype *ptr;
+
+    v = nary_new(cT, 0, NULL);
+    ptr = (dtype*)(char*)na_get_pointer_for_write(v);
+    *ptr = x;
+    na_release_lock(v);
+    return v;
+}

data/ext/numo/narray/gen/tmpl/poly.c

@@ -18,13 +18,13 @@ static void
 
 /*
   Polynomial.: a0 + a1*x + a2*x**2 + a3*x**3 + ... + an*x**n
-  @overload <%=method%> a0, a1, ...
+  @overload <%=name%> a0, a1, ...
   @param [Numo::NArray,Numeric] a0
   @param [Numo::NArray,Numeric] a1 , ...
   @return [Numo::<%=class_name%>]
 */
 static VALUE
-<%=c_func%>(VALUE self, VALUE args)
+<%=c_func(-2)%>(VALUE self, VALUE args)
 {
     int argc, i;
     VALUE *argv;
@@ -45,5 +45,5 @@ static VALUE
     }
     a = rb_ary_new4(argc+1, argv);
     v = na_ndloop2(&ndf, a);
-    return numo_<%=tp%>_extract(v);
+    return <%=type_name%>_extract(v);
 }

data/ext/numo/narray/gen/tmpl/pow.c

@@ -61,7 +61,7 @@ static VALUE
   @return [Numo::NArray] self to the other-th power.
 */
 static VALUE
-<%=c_func%>(VALUE self, VALUE other)
+<%=c_func(1)%>(VALUE self, VALUE other)
 {
     <% if is_object %>
     return <%=c_func%>_self(self,other);

data/ext/numo/narray/gen/tmpl/powint.c

@@ -1,4 +1,4 @@
-static dtype pow_<%=tp%>(dtype x, int p)
+static dtype pow_<%=type_name%>(dtype x, int p)
 {
     dtype r = m_one;
     switch(p) {

data/ext/numo/narray/gen/tmpl/qsort.c

@@ -1,7 +1,7 @@
 /*
   qsort.c
   Numerical Array Extension for Ruby
-    (C) Copyright 2007-2016 by Masahiro TANAKA
+    (C) Copyright 2007-2017 by Masahiro TANAKA
 */
 
 /*
@@ -68,9 +68,16 @@
 #define qsort_dtype <%=dtype%>
 #undef qsort_cast
 #define qsort_cast <%=dcast%>
+<% if "#{suffix}" != "" %>
+#undef cmp
+#undef cmpgt
+#define cmp(a,b) cmp<%=suffix%>(a,b)
+#define cmpgt(a,b) cmpgt<%=suffix%>(a,b)
+<% end %>
+<% c_func(:nodef)%>
 
 void
-<%=tp%>_qsort(void *a, size_t n, ssize_t es)
+<%=type_name%>_qsort<%=suffix%>(void *a, size_t n, ssize_t es)
 {
     char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
     int  d, r, presorted;
@@ -134,7 +141,7 @@ void
     r = Min(pd - pc, pn - pd - es);
     vecswap(qsort_dtype, pb, pn - r, r);
     if ((r = pb - pa) > es)
-        <%=tp%>_qsort(a, r / es, es);
+        <%=type_name%>_qsort<%=suffix%>(a, r / es, es);
     if ((r = pd - pc) > es) {
         a = pn - r;
         n = r / es;

data/ext/numo/narray/gen/tmpl/rand.c

@@ -123,7 +123,7 @@ static void
        [4, 3, 3, 2, 4, 2]
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *args, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *args, VALUE self)
 {
     rand_opt_t g;
     VALUE v1=Qnil, v2=Qnil;

data/ext/numo/narray/gen/tmpl/rand_norm.c

@@ -95,7 +95,7 @@ static void
         [4.5528+7.11003i, 5.62117+6.69094i, 5.05443+5.35133i]]
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *args, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *args, VALUE self)
 {
     int n;
     randn_opt_t g;

data/ext/numo/narray/gen/tmpl/seq.c

@@ -67,7 +67,7 @@ static void
        [1+0i, 0.8+0.2i, 0.6+0.4i, 0.4+0.6i, 0.2+0.8i, 0+1i]
 */
 static VALUE
-<%=c_func%>(int argc, VALUE *args, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *args, VALUE self)
 {
     seq_opt_t *g;
     VALUE vbeg=Qnil, vstep=Qnil;

data/ext/numo/narray/gen/tmpl/set2.c

@@ -15,14 +15,14 @@ static void
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
                 GET_DATA_INDEX(p2,idx2,<%=dtype%>,y);
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 SET_DATA_INDEX(p1,idx1,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
                 GET_DATA_STRIDE(p2,s2,<%=dtype%>,y);
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 SET_DATA_INDEX(p1,idx1,dtype,x);
             }
         }
@@ -31,14 +31,14 @@ static void
             for (; i--;) {
                 GET_DATA(p1,dtype,x);
                 GET_DATA_INDEX(p2,idx2,<%=dtype%>,y);
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 SET_DATA_STRIDE(p1,s1,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA(p1,dtype,x);
                 GET_DATA_STRIDE(p2,s2,<%=dtype%>,y);
-                x = m_<%=method%>(x,y);
+                x = m_<%=name%>(x,y);
                 SET_DATA_STRIDE(p1,s1,dtype,x);
             }
         }
@@ -46,7 +46,7 @@ static void
 }
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE a1)
+<%=c_func(1)%>(VALUE self, VALUE a1)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{<%=tpclass%>,0}};
     ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP, 2, 0, ain, 0 };