numo-narray 0.9.1.4 → 0.9.1.9

data/ext/numo/narray/depend.erb

@@ -1,17 +1,13 @@
 TAGSRC = \
- ../../ruby/include/ruby/*.h \
- ../../ruby/*.c \
- *.h \
- types/*.h \
- *.c \
- types/*.c
+ numo/types/*.h \
+ *.c
 
 tags : TAGS
 TAGS : $(TAGSRC)
 	etags $(TAGSRC)
 
 doc :
-	yard doc *.c types/*.c
+	yard doc *.c
 
 C_TMPL = <%=Dir.glob("#{__dir__}/gen/tmpl*/*.c").join(" ")%>
 
@@ -22,13 +18,13 @@ DEPENDS = $(C_TMPL) <%= __dir__ %>/gen/*.rb
    type_c = []
    type_rb = Dir.glob("#{__dir__}/gen/def/*.rb")
    type_rb.each do |s|
-     type_c << c = "types/"+File.basename(s,".rb")+".c"
+     type_c << c = "t_"+File.basename(s,".rb")+".c"
 %>
 <%=c%>: <%=s%> $(DEPENDS)
-	$(MAKEDIRS) $(@D) types
 	ruby $(COGEN) -l -o $@ <%=s%>
 <% end %>
 
 src : <%= type_c.join(" ") %>
 
-CLEANOBJS = *.o */*.o *.bak types/*.c
+CLEANOBJS = *.o t_*.c *.bak
+DISTCLEANFILES = depend TAGS

data/ext/numo/narray/extconf.rb

@@ -7,7 +7,11 @@ if RUBY_VERSION < "2.1.0"
   exit(1)
 end
 
-rm_f 'numo/extconf.h'
+def d(file)
+  File.join(__dir__,file)
+end
+
+rm_f d('numo/extconf.h')
 
 #$CFLAGS="-g3 -O0 -Wall"
 #$CFLAGS=" $(cflags) -O3 -m64 -msse2 -funroll-loops"
@@ -28,20 +32,20 @@ step
 index
 ndloop
 data
-types/bit
-types/int8
-types/int16
-types/int32
-types/int64
-types/uint8
-types/uint16
-types/uint32
-types/uint64
-types/sfloat
-types/dfloat
-types/scomplex
-types/dcomplex
-types/robject
+t_bit
+t_int8
+t_int16
+t_int32
+t_int64
+t_uint8
+t_uint16
+t_uint32
+t_uint64
+t_sfloat
+t_dfloat
+t_scomplex
+t_dcomplex
+t_robject
 math
 SFMT
 struct
@@ -83,19 +87,18 @@ unless have_type("u_int64_t", stdint)
   have_type("uint64_t", stdint)
 end
 have_func("exp10")
+have_func("rb_arithmetic_sequence_extract")
 
 have_var("rb_cComplex")
 
 $objs = srcs.collect{|i| i+".o"}
 
-create_header('numo/extconf.h')
+create_header d('numo/extconf.h')
 
-depend_path = File.join(__dir__, "depend")
-File.open(depend_path, "w") do |depend|
-  depend_erb_path = File.join(__dir__, "depend.erb")
-  File.open(depend_erb_path, "r") do |depend_erb|
+File.open(d('depend'), "w") do |depend|
+  File.open(d('depend.erb'), "r") do |depend_erb|
     erb = ERB.new(depend_erb.read)
-    erb.filename = depend_erb_path
+    erb.filename = d('depend.erb')
     depend.print(erb.result)
   end
 end

data/ext/numo/narray/gen/cogen.rb

@@ -50,7 +50,7 @@ code = DefLib.new do
   set file_name: $output||""
   set include_files: ["numo/types/#{type_name}.h"]
   set lib_name: "numo_"+type_name
-  
+
   if (::RbConfig::CONFIG['target_cpu'] == 'x86_64') or  (::RbConfig::CONFIG['target_cpu'] == 'x64')
     set is_simd: true
   else
@@ -66,7 +66,7 @@ code = DefLib.new do
 end.result
 
 if $output
-  open($output,"w").write(code)
+  File.write($output, code)
 else
   $stdout.write(code)
 end

data/ext/numo/narray/gen/narray_def.rb

@@ -27,7 +27,7 @@ module NArrayMethod
 
   def set2(meth, dtype, result_class)
     h = {dtype:dtype, result_class:result_class}
-    def_method(meth, "set2", h)
+    def_method(meth, "set2", **h)
   end
 
   def cond_binary(meth,op=nil)
@@ -57,6 +57,10 @@ module NArrayMethod
     def_method(meth, "accum_index")
   end
 
+  def accum_arg(meth)
+    def_method(meth, "accum_arg")
+  end
+
   def cum(meth, cmacro)
     def_method(meth, "cum", cmacro:cmacro)
   end

data/ext/numo/narray/gen/spec.rb

@@ -1,8 +1,6 @@
 def_id "cast"
-def_id "eq"
-def_id "ne"
-def_id "pow"
 def_id "mulsum"
+def_id "to_a"
 if is_complex
   def_id "real"
   def_id "imag"
@@ -32,7 +30,6 @@ if is_object
   def_id "bit_xor"
   def_id "bit_not"
   def_id "abs"
-  def_id "minus"
   def_id "reciprocal"
   def_id "square"
   def_id "floor"
@@ -42,6 +39,7 @@ if is_object
   def_id "nan?"
   def_id "infinite?"
   def_id "finite?"
+  def_id "-@","minus"
   def_id "==","eq"
   def_id "!=","ne"
   def_id ">" ,"gt"
@@ -49,6 +47,9 @@ if is_object
   def_id "<" ,"lt"
   def_id "<=","le"
   def_id "<=>","ufo"
+else
+  def_id "eq"
+  def_id "ne"
 end
 
 if is_int && !is_object
@@ -179,7 +180,12 @@ if !is_complex
   binary2 "divmod"
 end
 
-pow
+
+if !is_bit
+  pow
+  def_id "**","pow"
+  def_alias "pow","**"
+end
 
 unary "minus", "-@"
 unary "reciprocal"
@@ -273,7 +279,7 @@ if is_float
   cond_unary "isfinite"
 end
 
-if is_int
+if is_int && !is_object
   if is_unsigned
     accum "sum","u_int64_t","numo_cUInt64"
     accum "prod","u_int64_t","numo_cUInt64"
@@ -303,6 +309,8 @@ if is_comparable
   accum "ptp","dtype","cT"
   accum_index "max_index"
   accum_index "min_index"
+  accum_arg   "argmax"
+  accum_arg   "argmin"
   def_method "minmax"
   def_module_function "maximum", "ewcomp", n_arg:2
   def_module_function "minimum", "ewcomp", n_arg:2
@@ -366,6 +374,7 @@ cn = get(:class_name)
 nm = get(:name)
 st = get(:simd_type)
 dp = get(:is_double_precision)
+algn = get(:need_align)
 is_c = is_complex
 
 def_module do
@@ -377,8 +386,9 @@ def_module do
   set module_name: "Math"
   set module_var: "mTM"
   set simd_type: st
-  set is_double_precision: dp 
+  set is_double_precision: dp
   set is_complex: is_c
+  set need_align: algn
 
   math "sqrt"
   math "cbrt"

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

@@ -22,8 +22,8 @@ static void
 <% else %>
   @overload <%=name%>(axis:nil, keepdims:false)
 <% end %>
-  @param [Numeric,Array,Range] axis (keyword) Affected dimensions.
-  @param [TrueClass] keepdims (keyword) If true, the reduced axes are left in the result array as dimensions with size one.
+  @param [Numeric,Array,Range] axis  Performs <%=name%> along the axis.
+  @param [TrueClass] keepdims  If true, the reduced axes are left in the result array as dimensions with size one.
   @return [Numo::<%=class_name%>] returns result of <%=name%>.
 */
 static VALUE

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

@@ -0,0 +1,88 @@
+<% (is_float ? ["","_nan"] : [""]).each do |j|
+   [64,32].each do |i| %>
+#define idx_t int<%=i%>_t
+static void
+<%=c_iter%>_arg<%=i%><%=j%>(na_loop_t *const lp)
+{
+    size_t   n, idx;
+    char    *d_ptr, *o_ptr;
+    ssize_t  d_step;
+
+    INIT_COUNTER(lp, n);
+    INIT_PTR(lp, 0, d_ptr, d_step);
+
+    idx = f_<%=name[3..5]%>_index<%=j%>(n,d_ptr,d_step);
+
+    o_ptr = NDL_PTR(lp,1);
+    *(idx_t*)o_ptr = (idx_t)idx;
+}
+#undef idx_t
+<% end;end %>
+
+/*
+  Index of the <%=name[3..5]%>imum value.
+<% if is_float %>
+  @overload <%=name%>(axis:nil, nan:false)
+  @param [TrueClass] nan  If true, apply NaN-aware algorithm (return NaN posision if exist).
+<% else %>
+  @overload <%=name%>(axis:nil)
+<% end %>
+  @param [Numeric,Array,Range] axis  Finds <%=name[3..5]%>imum values along the axis and returns **indices along the axis**.
+  @return [Integer,Numo::Int] returns the result indices.
+  @see #<%=name[3..5]%>_index
+  @see #<%=name[3..5]%>
+
+  @example
+<% case name; when /min/ %>
+      a = Numo::NArray[3,4,1,2]
+      a.argmin  #=> 2
+
+      b = Numo::NArray[[3,4,1],[2,0,5]]
+      b.argmin                       #=> 4
+      b.argmin(axis:1)               #=> [2, 1]
+      b.argmin(axis:0)               #=> [1, 1, 0]
+      b.at(b.argmin(axis:0), 0..-1)  #=> [2, 0, 1]
+<% when /max/ %>
+      a = Numo::NArray[3,4,1,2]
+      a.argmax  #=> 1
+
+      b = Numo::NArray[[3,4,1],[2,0,5]]
+      b.argmax                       #=> 5
+      b.argmax(axis:1)               #=> [1, 2]
+      b.argmax(axis:0)               #=> [0, 0, 1]
+      b.at(b.argmax(axis:0), 0..-1)  #=> [3, 4, 5]
+<% end %>
+ */
+static VALUE
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
+{
+    narray_t *na;
+    VALUE reduce;
+    ndfunc_arg_in_t ain[2] = {{Qnil,0},{sym_reduce,0}};
+    ndfunc_arg_out_t aout[1] = {{0,0,0}};
+    ndfunc_t ndf = {0, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE|NDF_EXTRACT, 2,1, ain,aout};
+
+    GetNArray(self,na);
+    if (na->ndim==0) {
+        return INT2FIX(0);
+    }
+    if (na->size > (~(u_int32_t)0)) {
+        aout[0].type = numo_cInt64;
+        ndf.func = <%=c_iter%>_arg64;
+      <% if is_float %>
+        reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_arg64_nan);
+      <% else %>
+        reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
+      <% end %>
+    } else {
+        aout[0].type = numo_cInt32;
+        ndf.func = <%=c_iter%>_arg32;
+      <% if is_float %>
+        reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, <%=c_iter%>_arg32_nan);
+      <% else %>
+        reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
+      <% end %>
+    }
+
+    return na_ndloop(&ndf, 2, self, reduce);
+}

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

@@ -70,7 +70,7 @@ static VALUE
   @overload <%=op_map%>(other, axis:nil, keepdims:false)
 <% end %>
   @param [Numo::NArray,Numeric] other
-  @param [Numeric,Array,Range] axis (keyword) Affected dimensions.
+  @param [Numeric,Array,Range] axis  Performs <%=name%> along the axis.
   @param [TrueClass] keepdims (keyword) If true, the reduced axes are left in the result array as dimensions with size one.
 <% if is_float %>
   @param [TrueClass] nan (keyword) If true, apply NaN-aware algorithm (avoid NaN if exists).

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

@@ -21,27 +21,38 @@ static void
 <% end;end %>
 
 /*
-  <%=name%>. Return an index of result.
+  Index of the <%=name[0..2]%>imum value.
 <% if is_float %>
   @overload <%=name%>(axis:nil, nan:false)
   @param [TrueClass] nan  If true, apply NaN-aware algorithm (return NaN posision if exist).
 <% else %>
   @overload <%=name%>(axis:nil)
 <% end %>
-  @param [Numeric,Array,Range] axis  Affected dimensions.
-  @return [Integer,Numo::Int] returns result index of <%=name%>.
+  @param [Numeric,Array,Range] axis  Finds <%=name[0..2]%>imum values along the axis and returns **flat 1-d indices**.
+  @return [Integer,Numo::Int] returns result indices.
+  @see #arg<%=name[0..2]%>
+  @see #<%=name[0..2]%>
+
   @example
-  <% if name == 'min_index' %>
-      Numo::NArray[3,4,1,2].min_index => 2
-      Numo::NArray[[3,4,1],[2,0,5]].min_index => 4
-      Numo::NArray[[3,4,1],[2,0,5]].min_index(axis: 1) => [2, 4]
-      Numo::NArray[[3,4,1],[2,0,5]].min_index(axis: 0) => [3, 4, 2]
-  <% else %>
-      Numo::NArray[3,4,1,2].max_index => 1
-      Numo::NArray[[3,4,1],[2,0,5]].max_index => 5
-      Numo::NArray[[3,4,1],[2,0,5]].max_index(axis: 1) => [1, 5]
-      Numo::NArray[[3,4,1],[2,0,5]].max_index(axis: 0) => [0, 1, 5]
-  <% end %>
+<% case name; when /min/ %>
+      a = Numo::NArray[3,4,1,2]
+      a.min_index  #=> 2
+
+      b = Numo::NArray[[3,4,1],[2,0,5]]
+      b.min_index             #=> 4
+      b.min_index(axis:1)     #=> [2, 4]
+      b.min_index(axis:0)     #=> [3, 4, 2]
+      b[b.min_index(axis:0)]  #=> [2, 0, 1]
+<% when /max/ %>
+      a = Numo::NArray[3,4,1,2]
+      a.max_index  #=> 1
+
+      b = Numo::NArray[[3,4,1],[2,0,5]]
+      b.max_index             #=> 5
+      b.max_index(axis:1)     #=> [1, 5]
+      b.max_index(axis:0)     #=> [0, 1, 5]
+      b[b.max_index(axis:0)]  #=> [3, 4, 5]
+<% end %>
  */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

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

@@ -29,7 +29,9 @@ static void
     assert(na->base.type == NARRAY_DATA_T);
 
     if (na->ptr != NULL) {
-        xfree(na->ptr);
+        if (na->owned) {
+            xfree(na->ptr);
+        }
         na->ptr = NULL;
     }
     if (na->base.size > 0) {
@@ -103,5 +105,6 @@ static VALUE
     na->base.shape = NULL;
     na->base.reduce = INT2FIX(0);
     na->ptr = NULL;
+    na->owned = FALSE;
     return TypedData_Wrap_Struct(klass, &<%=type_name%>_data_type, (void*)na);
 }

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

@@ -20,6 +20,7 @@ static VALUE
             }
             <% end %>
             NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case NARRAY_VIEW_T:

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

@@ -1,40 +1,10 @@
 /*
-  Array element referenece or slice view.
+  Multi-dimensional element reference.
   @overload [](dim0,...,dimL)
-  @param [Numeric,Range,etc] dim0,...,dimL  Multi-dimensional Index.
-  @return [Numeric,NArray::<%=class_name%>] Element object or NArray view.
-
-  --- Returns the element at +dim0+, +dim1+, ... are Numeric indices
-  for each dimension, or returns a NArray View as a sliced subarray if
-  +dim0+, +dim1+, ... includes other than Numeric index, e.g., Range
-  or Array or true.
-
-  @example
-      a = Numo::DFloat.new(4,5).seq
-      => Numo::DFloat#shape=[4,5]
-      [[0, 1, 2, 3, 4],
-       [5, 6, 7, 8, 9],
-       [10, 11, 12, 13, 14],
-       [15, 16, 17, 18, 19]]
-
-      a[1,1]
-      => 6.0
-
-      a[1..3,1]
-      => Numo::DFloat#shape=[3]
-      [6, 11, 16]
-
-      a[1,[1,3,4]]
-      => Numo::DFloat#shape=[3]
-      [6, 8, 9]
-
-      a[true,2].fill(99)
-      a
-      => Numo::DFloat#shape=[4,5]
-      [[0, 1, 99, 3, 4],
-       [5, 6, 99, 8, 9],
-       [10, 11, 99, 13, 14],
-       [15, 16, 99, 18, 19]]
+  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol] dim0,...,dimL  multi-dimensional indices.
+  @return [Numeric,Numo::<%=class_name%>] an element or NArray view.
+  @see Numo::NArray#[]
+  @see #[]=
  */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)