cumo 0.4.3 → 0.5.1

data/ext/cumo/narray/data.c

@@ -195,21 +195,21 @@ check_axis(int axis, int ndim)
   @example
     x = Cumo::Int32[[1,2,3]]
 
-    p x.swapaxes(0,1)
-    # Cumo::Int32(view)#shape=[3,1]
+    x.swapaxes(0,1)
+    # => Cumo::Int32(view)#shape=[3,1]
     # [[1],
     #  [2],
     #  [3]]
 
-    p x = Cumo::Int32[[[0,1],[2,3]],[[4,5],[6,7]]]
-    # Cumo::Int32#shape=[2,2,2]
+    x = Cumo::Int32[[[0,1],[2,3]],[[4,5],[6,7]]]
+    # => Cumo::Int32#shape=[2,2,2]
     # [[[0, 1],
     #   [2, 3]],
     #  [[4, 5],
     #   [6, 7]]]
 
-    p x.swapaxes(0,2)
-    # Cumo::Int32(view)#shape=[2,2,2]
+    x.swapaxes(0,2)
+    # => Cumo::Int32(view)#shape=[2,2,2]
     # [[[0, 4],
     #   [2, 6]],
     #  [[1, 5],
@@ -402,6 +402,10 @@ cumo_na_reshape_bang(int argc, VALUE *argv, VALUE self)
 {
     size_t *shape;
     cumo_narray_t *na;
+    cumo_narray_view_t *na2;
+    ssize_t stride;
+    cumo_stridx_t *stridx;
+    int i;
 
     if (cumo_na_check_contiguous(self)==Qfalse) {
         rb_raise(rb_eStandardError, "cannot change shape of non-contiguous NArray");
@@ -410,6 +414,23 @@ cumo_na_reshape_bang(int argc, VALUE *argv, VALUE self)
     cumo_na_check_reshape(argc, argv, self, shape);
 
     CumoGetNArray(self, na);
+    if (na->type == CUMO_NARRAY_VIEW_T) {
+        CumoGetNArrayView(self, na2);
+        if (na->ndim < argc) {
+            stridx = ALLOC_N(cumo_stridx_t,argc);
+        } else {
+            stridx = na2->stridx;
+        }
+        stride = CUMO_SDX_GET_STRIDE(na2->stridx[na->ndim-1]);
+        for (i=argc; i--;) {
+            CUMO_SDX_SET_STRIDE(stridx[i],stride);
+            stride *= shape[i];
+        }
+        if (stridx != na2->stridx) {
+            xfree(na2->stridx);
+            na2->stridx = stridx;
+        }
+    }
     cumo_na_setup_shape(na, argc, shape);
     return self;
 }
@@ -457,7 +478,7 @@ cumo_na_flatten_dim(VALUE self, int sd)
     CumoGetNArray(self,na);
     nd = na->ndim;
 
-    if (nd==0) {
+     if (nd==0 || na->size==0) {
         return cumo_na_make_view(self);
     }
     if (sd<0 || sd>=nd) {
@@ -489,7 +510,6 @@ cumo_na_flatten_dim(VALUE self, int sd)
     case CUMO_NARRAY_FILEMAP_T:
         stride = cumo_na_element_stride(self);
         for (i=sd+1; i--; ) {
-            //printf("data: i=%d shpae[i]=%ld stride=%ld\n",i,shape[i],stride);
             CUMO_SDX_SET_STRIDE(na2->stridx[i],stride);
             stride *= shape[i];
         }
@@ -512,12 +532,10 @@ cumo_na_flatten_dim(VALUE self, int sd)
                 CUMO_SDX_SET_INDEX(na2->stridx[i],idx2);
             } else {
                 na2->stridx[i] = na1->stridx[i];
-                //printf("view: i=%d stridx=%d\n",i,CUMO_SDX_GET_STRIDE(sdx));
             }
         }
         // flat dimenion == last dimension
         if (RTEST(cumo_na_check_ladder(self,sd))) {
-        //if (0) {
             na2->stridx[sd] = na1->stridx[nd-1];
         } else {
             // set index
@@ -586,28 +604,30 @@ void cumo_na_diagonal_stride_index_kernel_launch(size_t *idx, ssize_t s0, size_t
   @return [Cumo::NArray]  diagonal view of NArray.
   @example
     a = Cumo::DFloat.new(4,5).seq
-    => Cumo::DFloat#shape=[4,5]
-    [[0, 1, 2, 3, 4],
-     [5, 6, 7, 8, 9],
-     [10, 11, 12, 13, 14],
-     [15, 16, 17, 18, 19]]
+    # => Cumo::DFloat#shape=[4,5]
+    # [[0, 1, 2, 3, 4],
+    #  [5, 6, 7, 8, 9],
+    #  [10, 11, 12, 13, 14],
+    #  [15, 16, 17, 18, 19]]
     b = a.diagonal(1)
-    => Cumo::DFloat(view)#shape=[4]
-    [1, 7, 13, 19]
+    # => Cumo::DFloat(view)#shape=[4]
+    # [1, 7, 13, 19]
+
     b.store(0)
     a
-    => Cumo::DFloat#shape=[4,5]
-    [[0, 0, 2, 3, 4],
-     [5, 6, 0, 8, 9],
-     [10, 11, 12, 0, 14],
-     [15, 16, 17, 18, 0]]
+    # => Cumo::DFloat#shape=[4,5]
+    # [[0, 0, 2, 3, 4],
+    #  [5, 6, 0, 8, 9],
+    #  [10, 11, 12, 0, 14],
+    #  [15, 16, 17, 18, 0]]
+
     b.store([1,2,3,4])
     a
-    => Cumo::DFloat#shape=[4,5]
-    [[0, 1, 2, 3, 4],
-     [5, 6, 2, 8, 9],
-     [10, 11, 12, 3, 14],
-     [15, 16, 17, 18, 4]]
+    # => Cumo::DFloat#shape=[4,5]
+    # [[0, 1, 2, 3, 4],
+    #  [5, 6, 2, 8, 9],
+    #  [10, 11, 12, 3, 14],
+    #  [15, 16, 17, 18, 4]]
  */
 static VALUE
 cumo_na_diagonal(int argc, VALUE *argv, VALUE self)
@@ -940,7 +960,7 @@ cumo_na_dot(VALUE self, VALUE other)
 #endif
 
 void
-Init_cumo_na_data()
+Init_cumo_na_data(void)
 {
     rb_define_method(cNArray, "copy", cumo_na_copy, 0); // deprecated
 

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

@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
 
 thisdir = File.dirname(__FILE__)
-libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
+libpath = File.absolute_path(File.dirname(__FILE__)) + "/../../../../lib"
 $LOAD_PATH.unshift libpath
 
 require_relative "narray_def"
@@ -28,11 +29,11 @@ if ARGV.size != 1
 end
 
 type_file, = ARGV
-type_name = File.basename(type_file,".rb")
+type_name = File.basename(type_file, ".rb")
 
 erb_dir = ["tmpl"]
 erb_dir.unshift("tmpl_bit") if (type_name == "bit")
-erb_dir.map!{|d| File.join(thisdir,d)}
+erb_dir.map! { |d| File.join(thisdir, d) }
 
 code = DefLib.new do
   set line_number: $line_number
@@ -40,20 +41,20 @@ code = DefLib.new do
   set erb_suffix: ".c"
   set ns_var: "mCumo"
 
-  set file_name: $output||""
+  set file_name: $output || ""
   set type_name: type_name
-  set lib_name: "cumo_"+type_name
+  set lib_name: "cumo_" + type_name
 
   def_class do
     extend NArrayMethod
     extend NArrayType
     eval File.read(type_file), binding, type_file
-    eval File.read(File.join(thisdir,"spec.rb")), binding, "spec.rb"
+    eval File.read(File.join(thisdir, "spec.rb")), binding, "spec.rb"
   end
 end.result
 
 if $output
-  open($output,"w").write(code)
+  open($output, "w").write(code)
 else
   $stdout.write(code)
 end

data/ext/cumo/narray/gen/cogen_kernel.rb

@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
 
 thisdir = File.dirname(__FILE__)
-libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
+libpath = File.absolute_path(File.dirname(__FILE__)) + "/../../../../lib"
 $LOAD_PATH.unshift libpath
 
 require_relative "narray_def"
@@ -28,11 +29,11 @@ if ARGV.size != 1
 end
 
 type_file, = ARGV
-type_name = File.basename(type_file,".rb")
+type_name = File.basename(type_file, ".rb")
 
 erb_dir = ["tmpl"]
 erb_dir.unshift("tmpl_bit") if (type_name == "bit")
-erb_dir.map!{|d| File.join(thisdir,d)}
+erb_dir.map! { |d| File.join(thisdir, d) }
 
 code = DefLib.new do
   set line_number: $line_number
@@ -40,9 +41,9 @@ code = DefLib.new do
   set erb_suffix: "_kernel.cu"
   set ns_var: "mCumo"
 
-  set file_name: $output||""
+  set file_name: $output || ""
   set type_name: type_name
-  set lib_name: "cumo_"+type_name
+  set lib_name: "cumo_" + type_name
 
   set opt_indexer_ndim: File.read(File.expand_path("../../../include/cumo/indexer.h", __FILE__)).match(/CUMO_NA_INDEXER_OPTIMIZED_NDIM (\d+)/)[1].to_i
 
@@ -50,12 +51,12 @@ code = DefLib.new do
     extend NArrayMethod
     extend NArrayType
     eval File.read(type_file), binding, type_file
-    eval File.read(File.join(thisdir,"spec.rb")), binding, "spec.rb"
+    eval File.read(File.join(thisdir, "spec.rb")), binding, "spec.rb"
   end
 end.result
 
 if $output
-  open($output,"w").write(code)
+  open($output, "w").write(code)
 else
   $stdout.write(code)
 end

data/ext/cumo/narray/gen/def/bit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "bit"
 set type_name:           "bit"
 set full_class_name:     "Cumo::Bit"
@@ -16,7 +18,7 @@ set is_object:     false
 set is_real:       false
 set is_comparable: false
 set is_double_precision: false
-set need_align:    false
+set need_align: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/cumo/narray/gen/def/dcomplex.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "dcomplex"
 set type_name:           "dcomplex"
 set full_class_name:     "Cumo::DComplex"

data/ext/cumo/narray/gen/def/dfloat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "dfloat"
 set type_name:           "dfloat"
 set full_class_name:     "Cumo::DFloat"

data/ext/cumo/narray/gen/def/int16.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "int16"
 set type_name:           "int16"
 set full_class_name:     "Cumo::Int16"

data/ext/cumo/narray/gen/def/int32.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "int32"
 set type_name:           "int32"
 set full_class_name:     "Cumo::Int32"

data/ext/cumo/narray/gen/def/int64.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "int64"
 set type_name:           "int64"
 set full_class_name:     "Cumo::Int64"

data/ext/cumo/narray/gen/def/int8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "int8"
 set type_name:           "int8"
 set full_class_name:     "Cumo::Int8"

data/ext/cumo/narray/gen/def/robject.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "robject"
 set type_name:           "robject"
 set full_class_name:     "Cumo::RObject"

data/ext/cumo/narray/gen/def/scomplex.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "scomplex"
 set type_name:           "scomplex"
 set full_class_name:     "Cumo::SComplex"

data/ext/cumo/narray/gen/def/sfloat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "sfloat"
 set type_name:           "sfloat"
 set full_class_name:     "Cumo::SFloat"

data/ext/cumo/narray/gen/def/uint16.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "uint16"
 set type_name:           "uint16"
 set full_class_name:     "Cumo::UInt16"

data/ext/cumo/narray/gen/def/uint32.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "uint32"
 set type_name:           "uint32"
 set full_class_name:     "Cumo::UInt32"

data/ext/cumo/narray/gen/def/uint64.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "uint64"
 set type_name:           "uint64"
 set full_class_name:     "Cumo::UInt64"

data/ext/cumo/narray/gen/def/uint8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set name:                "uint8"
 set type_name:           "uint8"
 set full_class_name:     "Cumo::UInt8"

data/ext/cumo/narray/gen/erbln.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 class ErbPP
@@ -7,11 +9,11 @@ class ErbPP
     def initialize(filename)
       @filename = filename
       @lnchar = "\n"
-      @buf = ""
-      @str = ""
+      @buf = +""
+      @str = +""
       @countln = 1
       @current = 1
-      super("\n"+report_line)
+      super("\n" + report_line)
     end
 
     def report_line
@@ -52,7 +54,7 @@ class ErbPP
       end
       concat(@buf)
 
-      b = @buf.gsub(/".*?(?<!\\)"/,'""')
+      b = @buf.gsub(/".*?(?<!\\)"/, '""')
       /^.*(\/\*)(.*?)$/ =~ b
       x = $2
       /^.*(\*\/)(.*?)$/ =~ b
@@ -81,12 +83,12 @@ class ErbPP
 
       @countln = @current + @buf.count(@lnchar)
       @current = n
-      @buf = ""
-      @str = ""
+      @buf = +""
+      @str = +""
     end
 
     def d(s)
-      p [s, [x,y], r]
+      p [s, [x, y], r]
       r
     end
 

data/ext/cumo/narray/gen/erbpp2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 require_relative "erbln"
 
@@ -38,7 +40,7 @@ class ErbPP
 
   def description
     if s = @opts[:description] || @opts[:desc]
-      s.gsub(/\@\{/,"[").gsub(/\@\}/,"]")
+      s.gsub(/\@\{/, "[").gsub(/\@\}/, "]")
     end
   end
 
@@ -65,7 +67,7 @@ class ErbPP
     dirs = [dirs] if !dirs.kind_of?(Array)
     dirs.each do |x|
       Dir.glob(x).each do |dir|
-        path = File.join(dir,file)
+        path = File.join(dir, file)
         if File.exist?(path)
           if get(:line_number)
             erb = ERBLN.new(File.read(path), path, trim_mode)
@@ -100,7 +102,7 @@ class ErbPP
   end
 
   def write(output)
-    File.open(output,"wt") do |f|
+    File.open(output, "wt") do |f|
       f.print(result)
     end
   end
@@ -109,11 +111,11 @@ class ErbPP
   end
 
   def find_tmpl(name)
-    @parent.children.find{|x| x.name == name }
+    @parent.children.find { |x| x.name == name }
   end
 
   def find(name)
-    children.find{|x| x.name == name }
+    children.find { |x| x.name == name }
   end
 end
 
@@ -126,13 +128,13 @@ class DefLib < ErbPP
   end
   def cumo_id_assign
     ids = []
-    @children.each{|c| a=c.get(:cumo_id_list); ids.concat(a) if a}
-    ids.sort.uniq.map{|x| "cumo_id_#{x[1]} = rb_intern(\"#{x[0]}\");"}
+    @children.each { |c| a = c.get(:cumo_id_list); ids.concat(a) if a }
+    ids.sort.uniq.map { |x| "cumo_id_#{x[1]} = rb_intern(\"#{x[0]}\");" }
   end
   def cumo_id_decl
     ids = []
-    @children.each{|c| a=c.get(:cumo_id_list); ids.concat(a) if a}
-    ids.sort.uniq.map{|x| "static ID cumo_id_#{x[1]};\n"}
+    @children.each { |c| a = c.get(:cumo_id_list); ids.concat(a) if a }
+    ids.sort.uniq.map { |x| "static ID cumo_id_#{x[1]};\n" }
   end
   def def_class(**opts, &block)
     DefClass.new(self, **opts, &block)
@@ -144,25 +146,25 @@ end
 
 module DeclMethod
   def def_alloc_func(m, erb_path=nil, **opts, &block)
-    DefAllocFunc.new(self, erb_path||m, name:m, singleton:true, **opts, &block)
+    DefAllocFunc.new(self, erb_path || m, name:m, singleton:true, **opts, &block)
   end
   def undef_alloc_func
     UndefAllocFunc.new(self)
   end
   def def_method(m, erb_path=nil, **opts, &block)
-    DefMethod.new(self, erb_path||m, name:m, **opts, &block)
+    DefMethod.new(self, erb_path || m, name:m, **opts, &block)
   end
   def undef_method(m)
-    UndefMethod.new(self,name:m)
+    UndefMethod.new(self, name:m)
   end
   def def_singleton_method(m, erb_path=nil, **opts, &block)
-    DefMethod.new(self, erb_path||m, name:m, singleton:true, **opts, &block)
+    DefMethod.new(self, erb_path || m, name:m, singleton:true, **opts, &block)
   end
   def undef_singleton_method(m)
-    UndefSingletonMethod.new(self,name:m)
+    UndefSingletonMethod.new(self, name:m)
   end
   def def_module_function(m, erb_path=nil, **opts, &block)
-    DefModuleFunction.new(self, erb_path||m, name:m, **opts, &block)
+    DefModuleFunction.new(self, erb_path || m, name:m, **opts, &block)
   end
   def def_alias(from, to)
     DefAlias.new(self, from:from, to:to)
@@ -181,9 +183,9 @@ class DefModule < ErbPP
   def cumo_id_list
     @cumo_id_list ||= []
   end
-  def def_id(name,var=nil)
-    var = name.gsub(/\?/,"_p").gsub(/\!/,"_bang") if var.nil?
-    cumo_id_list << [name,var]
+  def def_id(name, var=nil)
+    var = name.gsub(/\?/, "_p").gsub(/\!/, "_bang") if var.nil?
+    cumo_id_list << [name, var]
   end
   def init_def
     load_erb(init_erb).result(binding)
@@ -192,7 +194,7 @@ class DefModule < ErbPP
     @opts[:init_erb] || "init_module"
   end
   def method_code
-    @children.map{|c| c.result}.join("\n")
+    @children.map { |c| c.result }.join("\n")
   end
   def _mod_var
     @opts[:module_var]
@@ -214,7 +216,7 @@ class DefClass < DefModule
     @opts[:super_class] || "rb_cObject"
   end
   def free_func
-    @opts[:free_func] || "gsl_"+get(:name)+"_free"
+    @opts[:free_func] || "gsl_" + get(:name) + "_free"
   end
 end
 
@@ -235,7 +237,7 @@ class DefMethod < ErbPP
   end
 
   def c_name
-    @opts[:name].gsub(/\?/,"_p").gsub(/\!/,"_bang").gsub(/=/,"_set")
+    @opts[:name].gsub(/\?/, "_p").gsub(/\!/, "_bang").gsub(/=/, "_set")
   end
 
   def op_map
@@ -318,7 +320,7 @@ end
 
 class DefError < ErbPP
   def initialize(parent, name, sup_var, **opts, &block)
-    super(parent, error_name:name, error_var:"e"+name, super_var:sup_var,
+    super(parent, error_name:name, error_var:"e" + name, super_var:sup_var,
           **opts, &block)
   end
   def result
@@ -335,7 +337,7 @@ class DefStruct < ErbPP
     "static VALUE #{class_var};"
   end
   def init_def
-    items = members.map{|s| "\"#{s}\""}.join(",")
+    items = members.map { |s| "\"#{s}\"" }.join(",")
     "/*#{description}*/
     #{class_var} = rb_struct_define(\"#{class_name}\",#{items},NULL);"
   end
@@ -343,7 +345,7 @@ end
 
 class DefInclueModule < ErbPP
   def initialize(parent=nil, incl_class, incl_module, **opts, &block)
-    super(parent,incl_class:incl_class,incl_module:incl_module,**opts,&block)
+    super(parent, incl_class:incl_class, incl_module:incl_module, **opts, &block)
   end
   def init_def
     "rb_include_module(#{get(:incl_class)}, #{get(:incl_module)});"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'erbpp2'
 
 module NArrayMethod
@@ -27,10 +29,10 @@ 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)
+  def cond_binary(meth, op=nil)
     op = meth unless op
     def_method(meth, "cond_binary", op:op)
   end
@@ -105,11 +107,11 @@ module NArrayType
   alias tp type_name
 
   def type_var
-    @opts[:type_var] ||= "cumo_c"+class_name
+    @opts[:type_var] ||= "cumo_c" + class_name
   end
 
   def math_var
-    @opts[:math_var] ||= "cumo_m"+class_name+"Math"
+    @opts[:math_var] ||= "cumo_m" + class_name + "Math"
   end
 
   def real_class_name(arg=nil)
@@ -129,7 +131,7 @@ module NArrayType
   end
 
   def real_type_var
-    @opts[:real_type_var] ||= "cumo_c"+real_class_name
+    @opts[:real_type_var] ||= "cumo_c" + real_class_name
   end
 
   def real_type_name
@@ -147,7 +149,7 @@ module NArrayType
     a.concat(args)
   end
 
-  def upcast(c=nil,t=nil)
+  def upcast(c=nil, t=nil)
     @opts[:upcast] ||= []
     if c
       if t
@@ -161,14 +163,14 @@ module NArrayType
     end
   end
 
-  def upcast_rb(c,t=nil)
+  def upcast_rb(c, t=nil)
     @opts[:upcast] ||= []
     if t
       t = "cumo_c#{t}"
     else
       t = "cT"
     end
-    if c=="Integer"
+    if c == "Integer"
       @opts[:upcast] << "#ifdef RUBY_INTEGER_UNIFICATION"
       @opts[:upcast] << "rb_hash_aset(hCast, rb_cInteger, #{t});"
       @opts[:upcast] << "#else"
@@ -186,10 +188,10 @@ end
 module StoreFrom
 
   def store_from(cname, dtype=nil, macro=nil)
-    tmpl = (cname=="Bit") ? "store_bit" : "store_from"
+    tmpl = (cname == "Bit") ? "store_bit" : "store_from"
     h = { name:cname.downcase,
           type_name:cname,
-          type_var:"cumo_c"+cname,
+          type_var:"cumo_c" + cname,
           dtype:dtype,
           macro:macro }
     Store.new(self, tmpl, **h)
@@ -229,7 +231,7 @@ class Store < DefMethod
     "#{klass}==#{type_var}"
   end
 
-  def extract_data(ptr,pos,x)
+  def extract_data(ptr, pos, x)
     case type_name
     when "Bit"
       "{BIT_DIGIT b; CUMO_LOAD_BIT(#{ptr},#{pos},b); x = m_from_sint(b);}"