numo-narray 0.9.0.3 → 0.9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f41e5ff035eb49ec0110722546783161a6fe34
-  data.tar.gz: 33bbc3eb268834b15aaa646ca2973efe7061da14
+  metadata.gz: 344742df38a815d85e70962da4cdb85969d816a2
+  data.tar.gz: 6da0a54faee1813628901213587213618ce696bc
 SHA512:
-  metadata.gz: 360c0c2e95a630ff7fd73adc08df094fe4d3d19072a98fc42cc1e781a1453eaf1c6d5c405db283d0dc744904407fe1e34e3fe97cf133468f751797c69f512133
-  data.tar.gz: 9025c1c48a50ddde9fd7bd8d86491165c9cf7cb373efeedf000799a2cf56e24ab21dfe6e4fa0d649fdd35c677c0de725fcf9b4588d8db6dac6a535c0b699e9c7
+  metadata.gz: 908a26721c4d03e7af632747cce53ba41465d6e2917dbb97505a04ab9d8008c6764889bc669d79d83952b36a21467f7d8c8913046cc46ebf8cda23e792d62f9f
+  data.tar.gz: caa3d25b088c2ab5376ee64daf88581e9eeb64a9febd6456a3780ce05b0535c065867a6f9a64913db96cf422a38843c1d1800f3d53bcb5417f773af42ca123fe

data/README.md

@@ -3,6 +3,14 @@
 [![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)
 
+[GitHub](https://github.com/ruby-numo/narray)
+ | [RubyGems](https://rubygems.org/gems/numo-narray)
+
+Numo::NArray is an Numerical N-dimensional Array class
+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
 
 ## Related Projects
@@ -12,13 +20,11 @@ under development
 * [Numo::Gnuplot](https://github.com/ruby-numo/gnuplot) - Simple and easy-to-use Gnuplot interface.
 
 ## Installation
-### Ubuntu, Debian
+### Ubuntu, Debian, Bash on Windows
 ```shell
 apt install -y git ruby gcc ruby-dev rake make
-git clone git://github.com/ruby-numo/narray
-cd narray
-gem build numo-narray.gemspec
-gem install numo-narray-0.9.0.2.gem
+gem install specific_install
+gem specific_install https://github.com/ruby-numo/narray.git
 ```
 
 ## Quick start
@@ -40,7 +46,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/narray/wiki/100-narray-exercises).
+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)).
 
 ## Documentation
 

data/Rakefile

@@ -22,8 +22,6 @@ namespace :build do
 
   desc "Build gems for Windows into the pkg directory"
   task :windows => pkg_dir do
-    ruby_versions = "2.1.6:2.2.2:2.3.0"
-
     build_dir = "tmp/windows"
     rm_rf build_dir
     mkdir_p build_dir
@@ -32,7 +30,7 @@ namespace :build do
       ["git", "clone", "file://#{Dir.pwd}/.git", build_dir],
       ["cd", build_dir],
       ["bundle"],
-      ["rake", "cross", "native", "gem", "RUBY_CC_VERSION=#{ruby_versions}"],
+      ["rake", "cross", "native", "gem"],
     ]
     raw_commands = commands.collect do |command|
       Shellwords.join(command)
@@ -44,16 +42,10 @@ namespace :build do
     cp(Dir.glob("#{build_dir}/#{pkg_dir}/*.gem"),
        "#{pkg_dir}/")
   end
-
-  windows_gem_paths.each do |path|
-    file path do
-      Rake::Task["build:windows"].invoke
-    end
-  end
 end
 
 namespace :release do
-  task :windows => windows_gem_paths do
+  task :windows => "build:windows" do
     windows_gem_paths.each do |path|
       ruby("-S", "gem", "push", path)
     end

data/ext/numo/narray/array.c

@@ -2,11 +2,6 @@
   array.c
   Numerical Array Extension for Ruby
     (C) Copyright 1999-2016 by Masahiro TANAKA
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
 */
 #include <ruby.h>
 #include "numo/narray.h"
@@ -120,7 +115,7 @@ void na_mdai_object_type(na_mdai_t *mdai, VALUE v)
 	if (NIL_P(mdai->na_type)) {
 	    mdai->na_type = CLASS_OF(v);
 	} else {
-            mdai->na_type = na_upcast(CLASS_OF(v), CLASS_OF(mdai->na_type));
+            mdai->na_type = na_upcast(CLASS_OF(v), mdai->na_type);
 	}
     } else if (rb_obj_is_kind_of(v, rb_cRange)) {
         MDAI_ATTR_TYPE(mdai->type,v,"begin");

data/ext/numo/narray/data.c

@@ -2,11 +2,6 @@
   data.c
   Numerical Array Extension for Ruby
     (C) Copyright 1999-2016 by Masahiro TANAKA
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
 */
 
 #include <ruby.h>
@@ -119,7 +114,7 @@ nary_swap_byte(VALUE self)
     if (self!=v) {
         na_copy_flags(self, v);
     }
-    REVERSE_BYTE_SWAPPED(v);
+    REVERSE_ENDIAN(v);
     return v;
 }
 
@@ -127,7 +122,7 @@ nary_swap_byte(VALUE self)
 static VALUE
 nary_to_network(VALUE self)
 {
-    if (TEST_NETWORK_ORDER(self)) {
+    if (TEST_BIG_ENDIAN(self)) {
         return self;
     }
     return rb_funcall(self, rb_intern("swap_byte"), 0);
@@ -136,7 +131,7 @@ nary_to_network(VALUE self)
 static VALUE
 nary_to_vacs(VALUE self)
 {
-    if (TEST_VACS_ORDER(self)) {
+    if (TEST_LITTLE_ENDIAN(self)) {
         return self;
     }
     return rb_funcall(self, rb_intern("swap_byte"), 0);
@@ -906,7 +901,6 @@ Init_nary_data()
 #else
 #ifdef WORDS_BIGENDIAN
 #else // LITTLE_ENDIAN
-    rb_define_alias(cNArray, "hton", "swap_byte");
     rb_define_alias(cNArray, "hton", "swap_byte");
     rb_define_alias(cNArray, "network_order?", "byte_swapped?");
     rb_define_alias(cNArray, "little_endian?", "host_order?");

data/ext/numo/narray/depend.erb

@@ -13,7 +13,7 @@ TAGS : $(TAGSRC)
 doc :
 	yard doc *.c types/*.c
 
-C_TMPL = <%=Dir.glob("#{__dir__}/gen/tmpl/*.c").join(" ")%>
+C_TMPL = <%=Dir.glob("#{__dir__}/gen/tmpl*/*.c").join(" ")%>
 
 COGEN = <%= __dir__ %>/gen/cogen.rb
 DTYPE = <%= __dir__ %>/gen/dtype.erb.c

data/ext/numo/narray/extconf.rb

@@ -79,7 +79,6 @@ end
 have_func("exp10")
 
 have_var("rb_cComplex")
-have_var("rb_cFixnum")
 
 $objs = srcs.collect{|i| i+".o"}
 

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

@@ -6,11 +6,13 @@ template_dir  "tmpl_bit"
 has_math      false
 is_bit        true
 is_int        false
+is_unsigned   true
 is_float      false
 is_complex    false
 is_object     false
 is_real       false
 is_comparable false
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -7,11 +7,13 @@ real_ctype      "double"
 has_math      true
 is_bit        false
 is_int        false
+is_unsigned   false
 is_float      true
 is_real       false
 is_complex    true
 is_object     false
 is_comparable false
+is_double_precision true
 
 upcast_rb "Integer"
 upcast_rb "Float"

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

@@ -5,11 +5,13 @@ ctype           "double"
 has_math      true
 is_bit        false
 is_int        false
+is_unsigned   false
 is_float      true
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision true
 
 upcast_rb "Integer"
 upcast_rb "Float"

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

@@ -4,11 +4,13 @@ ctype         "int16_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   false
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "int32_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   false
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "int64_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   false
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "int8_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   false
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -6,11 +6,13 @@ real_ctype      "VALUE"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   false
 is_float      true
 is_real       true
 is_complex    false
 is_object     true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float"

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

@@ -7,11 +7,13 @@ real_ctype      "float"
 has_math      true
 is_bit        false
 is_int        false
+is_unsigned   false
 is_float      true
 is_real       false
 is_complex    true
 is_object     false
 is_comparable false
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float"

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

@@ -5,11 +5,13 @@ ctype           "float"
 has_math      true
 is_bit        false
 is_int        false
+is_unsigned   false
 is_float      true
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float"

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

@@ -4,11 +4,13 @@ ctype         "u_int16_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   true
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "u_int32_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   true
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "u_int64_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   true
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

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

@@ -4,11 +4,13 @@ ctype         "u_int8_t"
 has_math      false
 is_bit        false
 is_int        true
+is_unsigned   true
 is_float      false
 is_complex    false
 is_object     false
 is_real       true
 is_comparable true
+is_double_precision false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/dtype.erb.c

@@ -2,11 +2,6 @@
   <%=type_name%>.c
   Numerical Array Extension for Ruby
     (C) Copyright 1999-2011,2013-2016 by Masahiro TANAKA
-
-  This program is free software.
-  You can distribute/modify this program
-  under the same terms as Ruby itself.
-  NO WARRANTY.
 */
 
 #include <ruby.h>
@@ -65,8 +60,13 @@ Init_nary_<%=tp%>()
     rb_define_singleton_method(cT, "[]", <%=cast_func%>, -2);
 
     <% if is_object %>
-    rb_undef_method(rb_singleton_class(cT),"from_string");
-    rb_undef_method(cT,"to_string");
+    rb_undef_method(rb_singleton_class(cT),"from_binary");
+    rb_undef_method(cT,"to_binary");
+    rb_undef_method(cT,"swap_byte");
+    rb_undef_method(cT,"to_network");
+    rb_undef_method(cT,"to_vacs");
+    rb_undef_method(cT,"to_host");
+    rb_undef_method(cT,"to_swapped");
     <% end %>
 
     <% Function.definitions.each do |x| %>

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

@@ -13,6 +13,7 @@ else
 end
 if is_float
   def_id "nearly_eq"
+  def_id "copysign"
 end
 if is_comparable
   def_id "gt"
@@ -36,6 +37,8 @@ if is_object
   def_id "nan?"
   def_id "infinite?"
   def_id "finite?"
+  def_id "==","op_eq"
+  def_id "!=","op_ne"
   def_id ">" ,"op_gt"
   def_id ">=","op_ge"
   def_id "<" ,"op_lt"
@@ -43,6 +46,10 @@ if is_object
   def_id "<=>","op_ufo"
 end
 
+if is_int && !is_object
+  def_id "minlength" # for bincount
+end
+
 # Allocation
 
 if is_object
@@ -54,8 +61,6 @@ def_method "allocate", 0
 
 def_method "extract", 0
 store_numeric
-cast_array
-store_array
 store_bit "Bit"
 if is_complex
   store_from "DComplex","dcomplex","m_from_dcomplex"
@@ -72,6 +77,11 @@ store_from "UInt32","u_int32_t","m_from_real"
 store_from "UInt16","u_int16_t","m_from_real"
 store_from "UInt8", "u_int8_t", "m_from_real"
 
+store_from "RObject", "VALUE",  "m_num_to_data"
+
+store_array
+cast_array
+
 def_method "store", 1
 def_singleton "cast", 1
 
@@ -101,6 +111,7 @@ if is_bit
   binary "eq"
   bit_count "count_true"
   def_alias "count_1","count_true"
+  def_alias "count","count_true"
   bit_count "count_false"
   def_alias "count_0","count_false"
   bit_reduce "all?", 1
@@ -187,6 +198,7 @@ if is_float
   unary "trunc"
   if !is_object
     unary "rint"
+    binary "copysign"
   end
 end
 
@@ -211,6 +223,9 @@ end
 
 accum "sum","dtype","cT"
 accum "prod","dtype","cT"
+if is_double_precision
+  accum "kahan_sum","dtype","cT"
+end
 
 if is_float
   accum "mean","dtype","cT"
@@ -227,6 +242,10 @@ if is_comparable
   def_method "minmax",-1
 end
 
+if is_int && !is_object
+  def_method "bincount",-1
+end
+
 cum "cumsum","add"
 cum "cumprod","mul"
 
@@ -247,6 +266,9 @@ def_method "eye",-1
 def_alias  "indgen", "seq"
 
 def_method "rand", -1
+if is_float && !is_object
+  def_method "rand_norm", -1
+end
 
 # y = a[0] + a[1]*x + a[2]*x^2 + a[3]*x^3 + ... + a[n]*x^n
 def_method "poly",-2