numo-narray 0.9.1.4 → 0.9.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba2ab60aae2fbf24973f75a9b17c9f35bd7fec15c58e110b6711a62773b2de0
-  data.tar.gz: feae74cc5b9d5dfbe238f78f60b22f017a4558b241fe772b0615ac3fa0c80b68
+  metadata.gz: 2de0f542db4df78b97eecd077130fb8f3146191a229698512d487916a8a57ce0
+  data.tar.gz: 1452f989e4dc615c0e4f4b4891c9f44072431f9face27a602ce9b91286909cbf
 SHA512:
-  metadata.gz: f7af93ba0ac1b6732fa9bbe22f72572ecdd8c9142861c0a12ca9124eb2094fef512923ce6040a52576c835ebde4b9a697af973e68c97a9703430f92ad5d6442b
-  data.tar.gz: b413079a3a924e698b074183d462397bd306bad255e619d1e58b52c623c175d93ca5ad72dbf17a84becc21172f10cc0cba4ea6c5d8c291cc706e20e0ff867d2e
+  metadata.gz: 23e67c8a70a95d69d25ad78561286eb56db63a0aa6465903ebbed1e076dfef6c4df4aa1ccd1d2f5ec40f4d02307c82c51b47c0da4cb48415c93bfdc6adaf4f27
+  data.tar.gz: 63847fb7e9173d0be70dc63be57ebbcb52a0dc6f52e613b7c9c69fab33f83920ba6b4b478156a18fa1fac0f6e08718713449441485149a6d9f178af7f2d87bdd

data/README.md

@@ -1,4 +1,4 @@
-# Numo::NArray - New NArray class library for Ruby/Numo (NUmerical MOdule)
+# 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)
@@ -11,17 +11,17 @@ for fast processing and easy manipulation of multi-dimensional numerical data,
 similar to numpy.ndaray.
 This project is the successor to [Ruby/NArray](http://masa16.github.io/narray/).
 
-under development
-
 ## Documentation
+
 All documents are primitive.
 
-* [Numo::NArray API Doc](http://ruby-numo.github.io/narray/narray/frames.html)
+* [Numo::NArray API Doc](http://ruby-numo.github.io/numo-narray/yard/index.html)
 * [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)
+* [Numo::NArray Overview](https://github.com/ruby-numo/numo-narray/wiki/Numo::NArray-Overview-(Japanese)) (in Japanese)
 
 ## Related Projects
+
 * [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/).
@@ -29,10 +29,13 @@ All documents are primitive.
 * [Numo::Gnuplot](https://github.com/ruby-numo/numo-gnuplot) - Simple and easy-to-use Gnuplot interface.
 
 ## Installation
+
 ### Requirement
-Ruby ver 2.1 and later.
+
+Ruby ver 2.2 and later.
 
 ### Ubuntu, Debian, Bash on Windows
+
 ```shell
 apt install -y git ruby gcc ruby-dev rake make
 gem install specific_install
@@ -40,7 +43,9 @@ gem specific_install https://github.com/ruby-numo/numo-narray.git
 ```
 
 ## Quick start
+
 An example
+
 ```ruby
 [1] pry(main)> require "numo/narray"
 => true
@@ -58,6 +63,7 @@ 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/numo-narray/wiki/100-narray-exercises) (and the [IRuby Notebook](https://github.com/ruby-numo/numo-narray/blob/master/100-narray-exercises.ipynb)).
 
 ## Development

data/Rakefile

@@ -1,76 +1,14 @@
 require "bundler/gem_tasks"
-begin
 
 task :doc do
   dir = "ext/numo/narray"
   src = %w[array.c data.c index.c math.c narray.c rand.c struct.c].
     map{|s| File.join(dir,s)} +
-    [File.join(dir,"types/*.c"), "lib/numo/narray/extra.rb"]
+    [File.join(dir,"t_*.c"), "lib/numo/narray/extra.rb"]
   sh "cd ext/numo/narray; ruby extconf.rb; make src"
   sh "rm -rf yard .yardoc; yard doc -o yard -m markdown -r README.md #{src.join(' ')}"
 end
 
-require "rake/extensiontask"
-require "rake_compiler_dock"
-require "shellwords"
-
-spec = Bundler::GemHelper.gemspec
-
-cross_platforms = ["x86-mingw32", "x64-mingw32"]
-Rake::ExtensionTask.new("numo/narray", spec) do |ext|
-  ext.cross_compile = true
-  ext.cross_platform = cross_platforms
-end
-
-pkg_dir = "pkg"
-windows_gem_paths = cross_platforms.collect do |platform|
-  File.join(pkg_dir, "#{spec.full_name}-#{platform}.gem")
-end
-
-namespace :build do
-  directory pkg_dir
-
-  desc "Build gems for Windows into the pkg directory"
-  task :windows => pkg_dir do
-    build_dir = "tmp/windows"
-    rm_rf build_dir
-    mkdir_p build_dir
-
-    commands = [
-      ["git", "clone", "file://#{Dir.pwd}/.git", build_dir],
-      ["cd", build_dir],
-      ["bundle"],
-      [
-        "rake",
-        "RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6",
-        "cross",
-        "native",
-        "gem",
-      ],
-    ]
-    raw_commands = commands.collect do |command|
-      Shellwords.join(command)
-    end
-    raw_command_line = raw_commands.join(" && ")
-
-    RakeCompilerDock.sh(raw_command_line)
-
-    cp(Dir.glob("#{build_dir}/#{pkg_dir}/*.gem"),
-       "#{pkg_dir}/")
-  end
-end
-
-namespace :release do
-  task :windows => "build:windows" do
-    windows_gem_paths.each do |path|
-      ruby("-S", "gem", "push", path)
-    end
-  end
-end
-
-rescue LoadError
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -79,3 +17,6 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
   t.test_files = FileList['test/**/*_test.rb']
 end
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new('numo/narray')

data/ext/numo/narray/array.c

@@ -1,7 +1,7 @@
 /*
   array.c
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #include <ruby.h>
 #include "numo/narray.h"
@@ -30,16 +30,16 @@ static ID id_step;
 static ID id_abs;
 static ID id_cast;
 static ID id_le;
+#if SIZEOF_LONG <= 4
+static ID id_ge;
+#endif
 static ID id_Complex;
-
+static VALUE int32_max = Qnil;
+static VALUE int32_min = Qnil;
 
 static VALUE
  na_object_type(int type, VALUE v)
 {
-    static VALUE int32_max = Qnil;
-    if (NIL_P(int32_max))
-        int32_max = ULONG2NUM(2147483647);
-
     switch(TYPE(v)) {
 
     case T_TRUE:
@@ -48,15 +48,15 @@ static VALUE
             return NA_BIT;
         return type;
 
-#if SIZEOF_LONG == 4
+#if SIZEOF_LONG <= 4
     case T_FIXNUM:
         if (type<NA_INT32)
             return NA_INT32;
         return type;
     case T_BIGNUM:
         if (type<NA_INT64) {
-            v = rb_funcall(v,id_abs,0);
-            if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
+            if (RTEST(rb_funcall(v,id_le,1,int32_max)) &&
+                RTEST(rb_funcall(v,id_ge,1,int32_min))) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -64,13 +64,11 @@ static VALUE
             }
         }
         return type;
-
-#elif SIZEOF_LONG == 8
+#else
     case T_FIXNUM:
         if (type<NA_INT64) {
             long x = NUM2LONG(v);
-            if (x<0) x=-x;
-            if (x<=2147483647) {
+            if (x<=2147483647L && x>=-2147483648L) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -82,19 +80,6 @@ static VALUE
         if (type<NA_INT64)
             return NA_INT64;
         return type;
-#else
-    case T_FIXNUM:
-    case T_BIGNUM:
-        if (type<NA_INT64) {
-            v = rb_funcall(v,id_abs,0);
-            if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
-                if (type<NA_INT32)
-                    return NA_INT32;
-            } else {
-                return NA_INT64;
-            }
-        }
-        return type;
 #endif
 
     case T_FLOAT:
@@ -122,10 +107,12 @@ static int na_mdai_object_type(int type, VALUE v)
     if (rb_obj_is_kind_of(v, rb_cRange)) {
         MDAI_ATTR_TYPE(type,v,begin);
         MDAI_ATTR_TYPE(type,v,end);
-    } else if (rb_obj_is_kind_of(v, na_cStep)) {
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+    } else if (rb_obj_is_kind_of(v, rb_cArithSeq)) {
         MDAI_ATTR_TYPE(type,v,begin);
         MDAI_ATTR_TYPE(type,v,end);
         MDAI_ATTR_TYPE(type,v,step);
+#endif
     } else {
         type = na_object_type(type,v);
     }
@@ -210,7 +197,13 @@ na_mdai_investigate(na_mdai_t *mdai, int ndim)
             }
         }
         else
-        if (rb_obj_is_kind_of(v, rb_cRange) || rb_obj_is_kind_of(v, na_cStep)) {
+        if (rb_obj_is_kind_of(v, rb_cRange)
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+            || rb_obj_is_kind_of(v, rb_cArithSeq)
+#else
+            || rb_obj_is_kind_of(v, rb_cEnumerator)
+#endif
+            ) {
             nary_step_sequence(v,&length,&dbeg,&dstep);
             len += length-1;
             mdai->type = na_mdai_object_type(mdai->type, v);
@@ -465,11 +458,13 @@ na_s_array_shape(VALUE mod, VALUE ary)
   @return [Numo::NArray]
   @example
     Numo::NArray.new_like([[1,2,3],[4,5,6]])
-    => Numo::Int32#shape=[2,3](empty)
+    # => Numo::Int32#shape=[2,3](empty)
+
     Numo::DFloat.new_like([[1,2],[3,4]])
-    => Numo::DFloat#shape=[2,2](empty)
+    # => Numo::DFloat#shape=[2,2](empty)
+
     Numo::NArray.new_like([1,2i,3])
-    => Numo::DComplex#shape=[3](empty)
+    # => Numo::DComplex#shape=[3](empty)
 */
 VALUE
 na_s_new_like(VALUE type, VALUE obj)
@@ -639,5 +634,13 @@ Init_nary_array()
     id_cast    = rb_intern("cast");
     id_abs     = rb_intern("abs");
     id_le      = rb_intern("<=");
+#if SIZEOF_LONG <= 4
+    id_ge      = rb_intern(">=");
+#endif
     id_Complex = rb_intern("Complex");
+
+    rb_global_variable(&int32_max);
+    int32_max = INT2NUM(2147483647);
+    rb_global_variable(&int32_min);
+    int32_min = INT2NUM(-2147483648);
 }

data/ext/numo/narray/data.c

@@ -1,16 +1,14 @@
 /*
   data.c
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2017 by Masahiro TANAKA
+  Ruby/Numo::NArray - Numerical Array class for Ruby
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 
 #include <ruby.h>
 #include "numo/narray.h"
 #include "numo/template.h"
 
-static VALUE sym_mulsum;
 static ID id_mulsum;
-static ID id_respond_to_p;
 static ID id_store;
 static ID id_swap_byte;
 
@@ -186,21 +184,21 @@ check_axis(int axis, int ndim)
   @example
     x = Numo::Int32[[1,2,3]]
 
-    p x.swapaxes(0,1)
-    # Numo::Int32(view)#shape=[3,1]
+    x.swapaxes(0,1)
+    # => Numo::Int32(view)#shape=[3,1]
     # [[1],
     #  [2],
     #  [3]]
 
-    p x = Numo::Int32[[[0,1],[2,3]],[[4,5],[6,7]]]
-    # Numo::Int32#shape=[2,2,2]
+    x = Numo::Int32[[[0,1],[2,3]],[[4,5],[6,7]]]
+    # => Numo::Int32#shape=[2,2,2]
     # [[[0, 1],
     #   [2, 3]],
     #  [[4, 5],
     #   [6, 7]]]
 
-    p x.swapaxes(0,2)
-    # Numo::Int32(view)#shape=[2,2,2]
+    x.swapaxes(0,2)
+    # => Numo::Int32(view)#shape=[2,2,2]
     # [[[0, 4],
     #   [2, 6]],
     #  [[1, 5],
@@ -457,7 +455,7 @@ VALUE
 na_flatten_dim(VALUE self, int sd)
 {
     int i, nd, fd;
-    size_t j;
+    size_t j, ofs;
     size_t *c, *pos, *idx1, *idx2;
     size_t stride;
     size_t  *shape, size;
@@ -501,7 +499,6 @@ na_flatten_dim(VALUE self, int sd)
     case NARRAY_FILEMAP_T:
         stride = nary_element_stride(self);
         for (i=sd+1; i--; ) {
-            //printf("data: i=%d shpae[i]=%ld stride=%ld\n",i,shape[i],stride);
             SDX_SET_STRIDE(na2->stridx[i],stride);
             stride *= shape[i];
         }
@@ -522,32 +519,35 @@ na_flatten_dim(VALUE self, int sd)
                 SDX_SET_INDEX(na2->stridx[i],idx2);
             } else {
                 na2->stridx[i] = na1->stridx[i];
-                //printf("view: i=%d stridx=%d\n",i,SDX_GET_STRIDE(sdx));
             }
         }
         // flat dimenion == last dimension
         if (RTEST(na_check_ladder(self,sd))) {
-        //if (0) {
             na2->stridx[sd] = na1->stridx[nd-1];
         } else {
             // set index
-            idx2 = ALLOC_N(size_t, shape[sd]);
+            idx2 = ALLOC_N(size_t, (shape[sd]==0) ? 1 : shape[sd]);
             SDX_SET_INDEX(na2->stridx[sd],idx2);
             // init for md-loop
             fd = nd-sd;
-            c = ALLOC_N(size_t, fd);
+            c = ALLOCA_N(size_t, fd);
             for (i=0; i<fd; i++) c[i]=0;
-            pos = ALLOC_N(size_t, fd+1);
+            pos = ALLOCA_N(size_t, fd+1);
             pos[0] = 0;
             // md-loop
             for (i=j=0;;) {
                 for (; i<fd; i++) {
                     sdx = na1->stridx[i+sd];
                     if (SDX_IS_INDEX(sdx)) {
-                        pos[i+1] = pos[i] + SDX_GET_INDEX(sdx)[c[i]];
+                        if (SDX_GET_INDEX(sdx)) {
+                            ofs = SDX_GET_INDEX(sdx)[c[i]];
+                        } else {
+                            ofs = 0;
+                        }
                     } else {
-                        pos[i+1] = pos[i] + SDX_GET_STRIDE(sdx)*c[i];
+                        ofs = SDX_GET_STRIDE(sdx)*c[i];
                     }
+                    pos[i+1] = pos[i] + ofs;
                 }
                 idx2[j++] = pos[i];
                 for (;;) {
@@ -559,8 +559,7 @@ na_flatten_dim(VALUE self, int sd)
                 }
             }
         loop_end:
-            xfree(pos);
-            xfree(c);
+            ;
         }
         break;
     }
@@ -589,28 +588,30 @@ na_flatten(VALUE self)
   @return [Numo::NArray]  diagonal view of NArray.
   @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]]
+    # => 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]]
     b = a.diagonal(1)
-    => Numo::DFloat(view)#shape=[4]
-    [1, 7, 13, 19]
+    # => Numo::DFloat(view)#shape=[4]
+    # [1, 7, 13, 19]
+
     b.store(0)
     a
-    => Numo::DFloat#shape=[4,5]
-    [[0, 0, 2, 3, 4],
-     [5, 6, 0, 8, 9],
-     [10, 11, 12, 0, 14],
-     [15, 16, 17, 18, 0]]
+    # => Numo::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
-    => Numo::DFloat#shape=[4,5]
-    [[0, 1, 2, 3, 4],
-     [5, 6, 2, 8, 9],
-     [10, 11, 12, 3, 14],
-     [15, 16, 17, 18, 4]]
+    # => Numo::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
 na_diagonal(int argc, VALUE *argv, VALUE self)
@@ -918,12 +919,10 @@ na_new_dimension_for_dot(VALUE self, int pos, int len, bool transpose)
 static VALUE
 numo_na_dot(VALUE self, VALUE other)
 {
-    VALUE test;
     volatile VALUE a1=self, a2=other;
     narray_t *na1, *na2;
 
-    test = rb_funcall(a1, id_respond_to_p, 1, sym_mulsum);
-    if (!RTEST(test)) {
+    if (!rb_respond_to(a1, id_mulsum)) {
         rb_raise(rb_eNoMethodError,"requires mulsum method for dot method");
     }
     GetNArray(a1,na1);
@@ -980,8 +979,6 @@ Init_nary_data()
     //rb_define_method(cNArray, "dot", numo_na_dot, 1);
 
     id_mulsum       = rb_intern("mulsum");
-    sym_mulsum      = ID2SYM(id_mulsum);
-    id_respond_to_p = rb_intern("respond_to?");
     id_store        = rb_intern("store");
     id_swap_byte    = rb_intern("swap_byte");
 }