numo-narray 0.9.1.0 → 0.9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f25d67eb3b5fbf2fbfb211acc0b839a58500954c64224a7fb605f0516e506297
-  data.tar.gz: f7a1c70751bcbb89db48a7be3bfb9b519494445bb39e4e8a9b37af57441578eb
+  metadata.gz: 2e9851b8d675467f0aa278a6600a631ba1d5a86e5a478ff5f51a6835ba1777d4
+  data.tar.gz: c0966fbbe3878466b39cee78282b7c5476f40529db98d86a57ccd0814fbe14fb
 SHA512:
-  metadata.gz: 202b2db2d9e89bf17933b8d972c418a6c82bc15df08ff7bb81804575efd1e4ba7fc307b1df73f30dd4ea7ff404699a04646860c2bb09630cb1f8c4729c944f86
-  data.tar.gz: c512052952cbb874207d22dbd0bcc9eb59b59b5137283dcd322b5dcb33fbc9c8c8f518aa3f768288ea80d0799285b546dc488446179cebbb8a61ee3f04c99584
+  metadata.gz: e04617bfa3066a4b021636582bbd7476f0c68ff3b262904679e1922b830d9ea8e3e90873c9a47d05052575afd4828c41f66d9d093ba812ca7891a24e1812f47a
+  data.tar.gz: 0662567f04b57c0e62a30d36841a17441c92aec4e36cff5a9027561a255263ac73125efb96eb97e18f4f90bc3ce452f24e303c9492f878bffdf89652f0e4748e

data/README.md

@@ -1,9 +1,9 @@
 # Numo::NArray - New NArray class library for Ruby/Numo (NUmerical MOdule)
 
-[![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/narray)
-[![Build Status](https://travis-ci.org/ruby-numo/narray.svg?branch=master)](https://travis-ci.org/ruby-numo/narray)
+[![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/numo-narray)
+[![Build Status](https://travis-ci.org/ruby-numo/numo-narray.svg?branch=master)](https://travis-ci.org/ruby-numo/numo-narray)
 
-[GitHub](https://github.com/ruby-numo/narray)
+[GitHub](https://github.com/ruby-numo/numo-narray)
  | [RubyGems](https://rubygems.org/gems/numo-narray)
 
 Numo::NArray is an Numerical N-dimensional Array class
@@ -17,15 +17,16 @@ under development
 All documents are primitive.
 
 * [Numo::NArray API Doc](http://ruby-numo.github.io/narray/narray/frames.html)
-* [Numo::NArray vs numpy](https://github.com/ruby-numo/narray/wiki/Numo-vs-numpy)
-* [Numo::NArray vs ndarray](https://github.com/ruby-numo/narray/wiki/Numo-vs-ndarray)
-* [Numo::NArray Overview](https://github.com/ruby-numo/narray/wiki/Numo::NArray%E6%A6%82%E8%A6%81) (in Japanese)
+* [Numo::NArray vs numpy](https://github.com/ruby-numo/numo-narray/wiki/Numo-vs-numpy)
+* [Numo::NArray vs ndarray](https://github.com/ruby-numo/numo-narray/wiki/Numo-vs-ndarray)
+* [Numo::NArray Overview](https://github.com/ruby-numo/numo-narray/wiki/Numo::NArray%E6%A6%82%E8%A6%81) (in Japanese)
 
 ## Related Projects
-* [Numo::Linalg](https://github.com/ruby-numo/linalg) - Linear Algebra library with [LAPACK](http://www.netlib.org/lapack/).
-* [Numo::GSL](https://github.com/ruby-numo/gsl) - Ruby interface for [GSL (GNU Scientific Library)](http://www.gnu.org/software/gsl/).
-* [Numo::FFTE](https://github.com/ruby-numo/ffte) - Ruby interface for [FFTE (A Fast Fourier Transform library with radix-2,3,5)](http://www.ffte.jp/).
-* [Numo::Gnuplot](https://github.com/ruby-numo/gnuplot) - Simple and easy-to-use Gnuplot interface.
+* [Numo::Linalg](https://github.com/ruby-numo/numo-linalg) - Linear Algebra library with [LAPACK](http://www.netlib.org/lapack/).
+* [Numo::GSL](https://github.com/ruby-numo/numo-gsl) - Ruby interface for [GSL (GNU Scientific Library)](http://www.gnu.org/software/gsl/).
+* [Numo::FFTW](https://github.com/ruby-numo/numo-fftw) - Ruby/Numo interface to [FFTW (A Discrete Fourier Transform library](http://www.fftw.org/).
+* [Numo::FFTE](https://github.com/ruby-numo/numo-ffte) - Ruby interface for [FFTE (A Fast Fourier Transform library with radix-2,3,5)](http://www.ffte.jp/).
+* [Numo::Gnuplot](https://github.com/ruby-numo/numo-gnuplot) - Simple and easy-to-use Gnuplot interface.
 
 ## Installation
 ### Requirement
@@ -35,7 +36,7 @@ Ruby ver 2.1 and later.
 ```shell
 apt install -y git ruby gcc ruby-dev rake make
 gem install specific_install
-gem specific_install https://github.com/ruby-numo/narray.git
+gem specific_install https://github.com/ruby-numo/numo-narray.git
 ```
 
 ## Quick start
@@ -57,4 +58,25 @@ An example
 [6] pry(main)> a.size
 => 15
 ```
-For more examples, check out this [narray version of 100 numpy exercises](https://github.com/ruby-numo/narray/wiki/100-narray-exercises) (and the [IRuby Notebook](https://github.com/ruby-numo/narray/blob/master/100-narray-exercises.ipynb)).
+For more examples, check out this [narray version of 100 numpy exercises](https://github.com/ruby-numo/numo-narray/wiki/100-narray-exercises) (and the [IRuby Notebook](https://github.com/ruby-numo/numo-narray/blob/master/100-narray-exercises.ipynb)).
+
+## Development
+
+### Build
+
+```shell
+ruby setup.rb
+```
+
+### Run tests
+
+```shell
+bundle install
+bundle exec rake test
+```
+
+Tips: You may run tests defined in a specified line as:
+
+```shell
+bundle exec ruby test/bit_test.rb --location 27
+```

data/Rakefile

@@ -62,5 +62,13 @@ namespace :release do
   end
 end
 
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.verbose = true
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
 rescue LoadError
 end

data/ext/numo/narray/array.c

@@ -435,7 +435,8 @@ na_composition3(VALUE obj, VALUE *ptype, VALUE *pshape, VALUE *pnary)
             *pnary = nary_new(dtype, ndim, na->shape);
         }
     } else {
-        rb_bug("invalid type for md-array: %s", rb_class2name(CLASS_OF(obj)));
+        rb_raise(rb_eTypeError,"invalid type for NArray: %s",
+                 rb_class2name(CLASS_OF(obj)));
     }
 }
 

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

@@ -4,11 +4,13 @@ thisdir = File.dirname(__FILE__)
 libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
 $LOAD_PATH.unshift libpath
 
-require_relative "./narray_def"
+require_relative "narray_def"
+
+$line_number = false
 
 while true
   if ARGV[0] == "-l"
-    require "erbpp/line_number"
+    $line_number = true
     ARGV.shift
   elsif ARGV[0] == "-o"
     ARGV.shift
@@ -33,6 +35,7 @@ erb_dir.unshift("tmpl_bit") if (type_name == "bit")
 erb_dir.map!{|d| File.join(thisdir,d)}
 
 code = DefLib.new do
+  set line_number: $line_number
   set erb_dir: erb_dir
   set erb_suffix: ".c"
   set ns_var: "mNumo"

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

@@ -0,0 +1,132 @@
+require 'erb'
+
+class ErbPP
+
+  class CountLnString < String
+
+    def initialize(filename)
+      @filename = filename
+      @lnchar = "\n"
+      @buf = ""
+      @str = ""
+      @countln = 1
+      @current = 1
+      super("\n"+report_line)
+    end
+
+    def report_line
+      "#line #{@current} \"#{@filename}\"\n"
+    end
+
+    def concat0(s)
+      ln(caller[0])
+      @buf.concat(s)
+      @str.concat(s)
+    end
+
+    def concat1(s)
+      ln(caller[0])
+      @buf.concat(s)
+    end
+
+    def ln(status=nil)
+      case status
+      when /:(\d+):/
+        n = $1.to_i
+      else
+        n = status.to_i
+      end
+      return if n == @current
+      if @current != @countln || @postpone
+        if /\A\s*\z/ =~ @str || /\A#line / =~ @buf
+          @postpone = true
+        elsif @in_comment
+          @postpone = false
+        else
+          if self[-1] != "\n"
+            concat("\n")
+          end
+          concat(report_line)
+          @postpone = false
+        end
+      end
+      concat(@buf)
+
+      b = @buf.gsub(/".*?(?<!\\)"/,'""')
+      /^.*(\/\*)(.*?)$/ =~ b
+      x = $2
+      /^.*(\*\/)(.*?)$/ =~ b
+      y = $2
+      if x
+        if y
+          if x.size < y.size
+            #:in_comment
+            @in_comment = true
+          else
+            #:out_comment
+            @in_comment = false
+          end
+        else
+          #:in_comment
+          @in_comment = true
+        end
+      else
+        if y
+          #:out_comment
+          @in_comment = false
+        else
+          #:keep
+        end
+      end
+
+      @countln = @current + @buf.count(@lnchar)
+      @current = n
+      @buf = ""
+      @str = ""
+    end
+
+    def d(s)
+      p [s, [x,y], r]
+      r
+    end
+
+    def final
+      ln(caller[0])
+      concat(@buf)
+    end
+
+  end
+
+  class ERBLN
+
+    def initialize(str, filename, trim_mode=nil, eoutvar='_erbout')
+      @filename = filename
+      compiler = ERB::Compiler.new(trim_mode)
+      set_eoutvar(compiler, eoutvar)
+      @src, @enc = *compiler.compile(str)
+    end
+
+    def set_eoutvar(compiler, eoutvar = '_erbout')
+      compiler.put_cmd = "#{eoutvar}.concat0"
+      compiler.insert_cmd = "#{eoutvar}.concat1"
+      compiler.pre_cmd = ["#{eoutvar} = CountLnString.new(#{@filename.inspect})"]
+      compiler.post_cmd = ["#{eoutvar}.final"]
+    end
+
+    def run(b)
+      print self.result(b)
+    end
+
+    def result(b)
+      #open("tmpout","a") do |f|
+      #  f.puts "\n#file:#{@filename}"
+      #  f.puts @src
+      #end
+      eval(@src, b, (@filename || '(erb)'), 0)
+    end
+
+    #require "fileutils"
+    #FileUtils.rm_f("tmpout")
+  end
+
+end

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

@@ -1,4 +1,5 @@
 require "erb"
+require_relative "erbln"
 
 class ErbPP
 
@@ -66,8 +67,12 @@ class ErbPP
       Dir.glob(x).each do |dir|
         path = File.join(dir,file)
         if File.exist?(path)
-          erb = ERB.new(File.read(path), safe_level, trim_mode)
-          erb.filename = path
+          if get(:line_number)
+            erb = ERBLN.new(File.read(path), path, trim_mode)
+          else
+            erb = ERB.new(File.read(path), safe_level, trim_mode)
+            erb.filename = path
+          end
           return erb
         end
       end
@@ -304,6 +309,20 @@ class DefConst < ErbPP
   end
 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,
+          **opts, &block)
+  end
+  def result
+    "static VALUE #{error_var};"
+  end
+  def init_def
+    "/*#{description}*/
+    #{error_var} = rb_define_class_under(#{ns_var},\"#{error_name}\",#{super_var});"
+  end
+end
+
 class DefStruct < ErbPP
   def method_code
     "static VALUE #{class_var};"

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

@@ -1,4 +1,4 @@
-require_relative './erbpp2'
+require_relative 'erbpp2'
 
 module NArrayMethod
 

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

@@ -23,6 +23,9 @@ if is_comparable && !is_object
   def_id "lt"
   def_id "le"
 end
+if is_comparable
+  def_id "nan"
+end
 if is_object
   def_id "bit_and"
   def_id "bit_or"
@@ -290,6 +293,8 @@ if is_comparable
   accum_index "max_index"
   accum_index "min_index"
   def_method "minmax"
+  def_module_function "maximum", "ewcomp", n_arg:2
+  def_module_function "minimum", "ewcomp", n_arg:2
 end
 
 if is_int && !is_object

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

@@ -23,8 +23,9 @@ void
     int nd, md;
 
     c = (size_t*)(lp->opt_ptr);
-    nd = lp->ndim - 1;
-    md = lp->ndim + 1;
+    nd = lp->ndim;
+    if (nd > 0) {nd--;}
+    md = nd + 2;
     a = ALLOCA_N(VALUE,md);
 
     INIT_COUNTER(lp, i);

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

@@ -0,0 +1,64 @@
+/*
+  Element-wise <%=name%> of two arrays.
+
+<% if is_float %>
+  @overload <%=name%>(a1, a2, nan:false)
+  @param [Numo::NArray,Numeric] a1  The array to be compared.
+  @param [Numo::NArray,Numeric] a2  The array to be compared.
+  @param [TrueClass] nan  If true, apply NaN-aware algorithm (return NaN if exist).
+<% else %>
+  @overload <%=name%>(a1, a2)
+  @param [Numo::NArray,Numeric] a1,a2  The arrays holding the elements to be compared.
+<% end %>
+  @return [Numo::<%=class_name%>]
+*/
+
+<% (is_float ? ["","_nan"] : [""]).each do |j| %>
+static void
+<%=c_iter%><%=j%>(na_loop_t *const lp)
+{
+    size_t   i, n;
+    char    *p1, *p2, *p3;
+    ssize_t  s1, s2, s3;
+
+    INIT_COUNTER(lp, n);
+    INIT_PTR(lp, 0, p1, s1);
+    INIT_PTR(lp, 1, p2, s2);
+    INIT_PTR(lp, 2, p3, s3);
+
+    for (i=0; i<n; i++) {
+        dtype x, y, z;
+        GET_DATA_STRIDE(p1,s1,dtype,x);
+        GET_DATA_STRIDE(p2,s2,dtype,y);
+        GET_DATA(p3,dtype,z);
+        z = f_<%=name%><%=j%>(x,y);
+        SET_DATA_STRIDE(p3,s3,dtype,z);
+    }
+}
+<% end %>
+
+static VALUE
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE mod)
+{
+    VALUE a1 = Qnil;
+    VALUE a2 = Qnil;
+    ndfunc_arg_in_t ain[2] = {{cT,0},{cT,0}};
+    ndfunc_arg_out_t aout[1] = {{cT,0}};
+    ndfunc_t ndf = { <%=c_iter%>, STRIDE_LOOP_NIP, 2, 1, ain, aout };
+
+    <% if is_float %>
+    VALUE kw_hash = Qnil;
+    ID kw_table[1] = {id_nan};
+    VALUE opts[1] = {Qundef};
+
+    rb_scan_args(argc, argv, "20:", &a1, &a2, &kw_hash);
+    rb_get_kwargs(kw_hash, kw_table, 0, 1, opts);
+    if (opts[0] != Qundef) {
+        ndf.func = <%=c_iter%>_nan;
+    }
+    <% else %>
+    rb_scan_args(argc, argv, "20", &a1, &a2);
+    <% end %>
+
+    return na_ndloop(&ndf, 2, a1, a2);
+}

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

@@ -25,8 +25,9 @@ void
     int nd, md;
 
     c = (size_t*)(lp->opt_ptr);
-    nd = lp->ndim - 1;
-    md = lp->ndim + 1;
+    nd = lp->ndim;
+    if (nd > 0) {nd--;}
+    md = nd + 2;
     a = ALLOCA_N(VALUE,md);
 
     INIT_COUNTER(lp, i);

data/ext/numo/narray/ndloop.c

@@ -1284,10 +1284,10 @@ ndloop_run(VALUE vlp)
     if (lp->loop_func == loop_narray) {
         loop_spec = ndloop_func_loop_spec(nf, lp->user.ndim);
         ndfunc_set_bufcp(lp, loop_spec);
-        if (na_debug_flag) {
-            printf("-- ndfunc_set_bufcp --\n");
-            print_ndloop(lp);
-        }
+    }
+    if (na_debug_flag) {
+        printf("-- ndfunc_set_bufcp --\n");
+        print_ndloop(lp);
     }
 
     // loop
@@ -1879,17 +1879,11 @@ loop_narray_with_index(ndfunc_t *nf, na_md_loop_t *lp)
     int i,j;
     int nd = lp->ndim;
 
-    // for zero-dimensional narray
-    if (nd==0) {
-        switch (lp->n[0]) {
-        case 0:
-            return;
-        case 1:
-            nd = 1;
-            break;
-        default:
-            rb_fatal("invalid narray");
-        }
+    if (nd < 0) {
+        rb_bug("bug? lp->ndim = %d\n", lp->ndim);
+    }
+    if (lp->n[0] == 0) { // empty array
+        return;
     }
 
     // pass total ndim to iterator