numo-narray 0.9.1.5 → 0.9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2723cec3e04deedc561c54a0d4f6af799dd93fc8a32079d06a074f00f07f466c
-  data.tar.gz: 5548cfa23b0ac7227b62ab8edd00ba040805c0563befeb32591179dc090eff66
+  metadata.gz: 5a1e49e2dfd16c57254defdd6ccf5548d676f5c7238341fca70f841d14931e30
+  data.tar.gz: c2bdd3b1131d58ab462d1259ccdbff2664040c5cacd4f5ef2fcc314046a78bd2
 SHA512:
-  metadata.gz: 19a91712b943da6f57f2cda4fa178adcb5a0c845c2b0ce8190f46c5c1a0d83a331fd32d71e9b2b85c960222f4a01940926bacba63eb882ea1b27aebb7a09c7a3
-  data.tar.gz: 4ee3a88369439ccf964fd23358a84530973c5355d4c71b35eda516bd655966ce127d494159c942bf0a82045b3f05a6be7ed16f4d9d30b96916df651c9a5ec0cb
+  metadata.gz: 6906c6bff6eac4969dc653c17bbe6cfc7eaffd3415c65e56e2f09bd6575b18f5495eedf2f4baf3062e6501a9b177b88d900aec8c49bdd060495975342b951344
+  data.tar.gz: ae33fa09e06cedc0032c6689e3e8da4a53991deb0c04e8019aeee30c58617af7bd356f916464eb0ece80ea8063ce575e71facc50b1e06108bb45579e5d4e8891

data/README.md

@@ -1,7 +1,7 @@
-# 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)
+[![Build Status](https://github.com/ruby-numo/numo-narray/workflows/build/badge.svg)](https://github.com/ruby-numo/numo-narray/actions)
 
 [GitHub](https://github.com/ruby-numo/numo-narray)
  | [RubyGems](https://rubygems.org/gems/numo-narray)
@@ -18,7 +18,7 @@ All documents are primitive.
 * [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
 
@@ -71,13 +71,15 @@ For more examples, check out this [narray version of 100 numpy exercises](https:
 ### Build
 
 ```shell
-ruby setup.rb
+git clone https://github.com/ruby-numo/numo-narray
+cd numo-narray
+bundle install
+bundle exec rake compile
 ```
 
 ### Run tests
 
 ```shell
-bundle install
 bundle exec rake test
 ```
 

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
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    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:
@@ -649,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
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    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;
 
@@ -921,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);
@@ -983,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");
 }

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
@@ -89,14 +93,12 @@ 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)

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"