numo-narray 0.9.1.8 → 0.9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 596c9ece21d3e9d75cf78a7b6d60b3fbda065a23718763bb3632cc8cae45fab6
-  data.tar.gz: bf03dd10e983d362a233bab2ec356e6a68e9dc3e27edccdf40018e661a15fe87
+  metadata.gz: 8fa143017e2eef49ea51ac9ce4c71ec9fee0c1e09cce0f815fd169f66d1e8459
+  data.tar.gz: 53f301c9d8f89952519737493395335bfdfebfa59bc58f30d6cb123c1e107f05
 SHA512:
-  metadata.gz: 58ef93f8200db87e99012b56bd7f8ccf22cb97abc77b1596e16a855f509fab498e33859b78f6b9626347ed83769eeb9011a7d59a93b3a8527131cad657b58d17
-  data.tar.gz: ac72e280b35ee08eb3b9faf5880355ccdeb4f39d521ba3f9d6067e96102e55561433eff16ed0b0b512da63057dca18d8eb6d72a4687a6d75321e5c29068c70fd
+  metadata.gz: da177dd756e6ad67ee4ef6ed9a25fcd6eff0f05e49bae4420415fc9ea898d3e79a80bf961ab89827a477870d2b6b2366a92ef84c0214a9368adc2791a998bbde
+  data.tar.gz: 81da9f43ba39fa0593a32117b8a2fc1fef861b7af197fb7783bf33b4dc16bbae15986e06a9448b3dfd5830b35cfbbe6442d8023d405049c227765e3dc2d0848e

data/README.md

@@ -1,7 +1,6 @@
 # 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)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ruby-numo/numo-narray/HEAD?filepath=100-narray-exercises.ipynb)
+[![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)
@@ -64,20 +63,24 @@ An example
 => 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)).
+For more examples, check out the **narray version of 100 numpy exercises**.
+  - [Wiki version](https://github.com/ruby-numo/numo-narray/wiki/100-narray-exercises) of the 100 exercises
+  - [Reproducible version](https://mybinder.org/v2/gh/ruby-numo/numo-narray/HEAD?filepath=100-narray-exercises.ipynb) of the 100 exercises (With this, you can try narray without creating an environment locally.)
 
 ## Development
 
 ### 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

@@ -17,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

@@ -358,7 +358,7 @@ na_composition3_ary(VALUE ary, VALUE *ptype, VALUE *pshape, VALUE *pnary)
     VALUE dtype, dshape;
 
     mdai = na_mdai_alloc(ary);
-    vmdai = TypedData_Wrap_Struct(rb_cData, &mdai_data_type, (void*)mdai);
+    vmdai = TypedData_Wrap_Struct(rb_cObject, &mdai_data_type, (void*)mdai);
     if ( na_mdai_investigate(mdai, 1) ) {
         // empty
         dtype = update_type(ptype, numo_cInt32);
@@ -606,7 +606,7 @@ na_ary_composition_for_struct(VALUE nstruct, VALUE ary)
 
     mdai = na_mdai_alloc(ary);
     mdai->na_type = nstruct;
-    vmdai = TypedData_Wrap_Struct(rb_cData, &mdai_data_type, (void*)mdai);
+    vmdai = TypedData_Wrap_Struct(rb_cObject, &mdai_data_type, (void*)mdai);
     na_mdai_for_struct(mdai, 0);
     nc = na_compose_alloc();
     vnc = WrapCompose(nc);

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

@@ -6,17 +6,17 @@ set class_alias:         nil
 set class_var:           "cT"
 set ctype:               "BIT_DIGIT"
 
-set has_math:      false
-set is_bit:        true
-set is_int:        false
-set is_unsigned:   true
-set is_float:      false
-set is_complex:    false
-set is_object:     false
-set is_real:       false
-set is_comparable: false
+set has_math:            false
+set is_bit:              true
+set is_int:              false
+set is_unsigned:         true
+set is_float:            false
+set is_complex:          false
+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/numo/narray/gen/spec.rb

@@ -1,7 +1,4 @@
 def_id "cast"
-def_id "eq"
-def_id "ne"
-def_id "pow"
 def_id "mulsum"
 def_id "to_a"
 if is_complex
@@ -33,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"
@@ -43,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"
@@ -50,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
@@ -180,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"
@@ -274,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"

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

@@ -94,7 +94,11 @@ static VALUE
         return <%=c_func%>_self(argc, argv, self);
     } else {
         v = rb_funcall(klass, id_cast, 1, self);
+        //<% if Gem::Version.create(RUBY_VERSION) < Gem::Version.create('2.7.0') %>
         return rb_funcall2(v, rb_intern("<%=name%>"), argc, argv);
+        //<% else %>
+        return rb_funcallv_kw(v, rb_intern("<%=name%>"), argc, argv, RB_PASS_CALLED_KEYWORDS);
+        //<% end %>
     }
     //<% end %>
 }

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

@@ -87,7 +87,7 @@ static const rb_data_type_t <%=type_name%>_data_type = {
     {0, <%=type_name%>_free, <%=type_name%>_memsize,},
     &na_data_type,
     &<%=type_name%>_info,
-    0, // flags
+    RUBY_TYPED_FROZEN_SHAREABLE, // flags
 };
 
 <% end %>

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

@@ -14,6 +14,7 @@
     rb_hash_aset(hCast, rb_cArray,   cT);
     <% for x in upcast %>
     <%= x %><% end %>
+    rb_obj_freeze(hCast);
 
     <% @children.each do |m| %>
     <%= m.init_def %><% end %>

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

@@ -30,15 +30,6 @@ static VALUE
         }
     }
 
-    if (rb_respond_to(obj,id_to_a)) {
-        obj = rb_funcall(obj,id_to_a,0);
-        if (TYPE(obj)!=T_ARRAY) {
-            rb_raise(rb_eTypeError, "`to_a' did not return Array");
-        }
-        <%=store_array.c_func%>(self,obj);
-        return self;
-    }
-
     <% if is_object %>
     robject_store_numeric(self,obj);
     <% else %>

data/ext/numo/narray/gen/tmpl_bit/binary.c

@@ -21,6 +21,12 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a2 += p2/NB;
+        p2 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         o2 =  p2-p3;
         l1 =  NB+o1;

data/ext/numo/narray/gen/tmpl_bit/store_bit.c

@@ -2,7 +2,7 @@ static void
 <%=c_iter%>(na_loop_t *const lp)
 {
     size_t  n;
-    size_t  p1, p3;
+    ssize_t p1, p3;
     ssize_t s1, s3;
     size_t *idx1, *idx3;
     int     o1, l1, r1, len;
@@ -18,6 +18,10 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;
@@ -26,7 +30,7 @@ static void
             if ((int)n<len) len=n;
             if (o1>=0) x = *a1>>o1;
             else       x = *a1<<-o1;
-            if (p1+len>NB)  x |= *(a1+1)<<r1;
+            if (p1+len>(ssize_t)NB)  x |= *(a1+1)<<r1;
             a1++;
             *a3 = (x & (SLB(len)<<p3)) | (*a3 & ~(SLB(len)<<p3));
             a3++;

data/ext/numo/narray/gen/tmpl_bit/unary.c

@@ -20,6 +20,10 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, y);
         }
     } else {
+        a1 += p1/NB;
+        p1 %= NB;
+        a3 += p3/NB;
+        p3 %= NB;
         o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;

data/ext/numo/narray/narray.c

@@ -1365,8 +1365,8 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
             break;
         case T_ARRAY:
             nd = RARRAY_LEN(vshape);
-            if (nd == 0 || nd > NA_MAX_DIMENSION) {
-                rb_raise(nary_eDimensionError,"too long or empty shape (%d)", nd);
+            if (nd > NA_MAX_DIMENSION) {
+              rb_raise(nary_eDimensionError,"shape exceeds max dimension");
             }
             shape = ALLOCA_N(size_t,nd);
             len = 1;
@@ -1531,7 +1531,7 @@ static VALUE na_inplace( VALUE self );
 /*
   Load marshal data.
   @overload marshal_load(data)
-  @params [Array] Array containing marshal data.
+  @param [Array] Array containing marshal data.
   @return [nil]
  */
 static VALUE
@@ -1989,6 +1989,10 @@ na_equal(VALUE self, volatile VALUE other)
 void
 Init_narray()
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     mNumo = rb_define_module("Numo");
 
     /*

data/ext/numo/narray/ndloop.c

@@ -164,7 +164,7 @@ print_ndloop(na_md_loop_t *lp) {
             for (i=0; i<lp->user.ndim; i++) {
                 printf(" &user.args[%d].iter[%d] = 0x%"SZF"x\n", j,i, (size_t)&lp->user.args[j].iter[i]);
                 printf("  user.args[%d].iter[%d].pos = %"SZF"u\n", j,i, lp->user.args[j].iter[i].pos);
-                printf("  user.args[%d].iter[%d].step = %"SZF"u\n", j,i, lp->user.args[j].iter[i].step);
+                printf("  user.args[%d].iter[%d].step = %"SZF"d\n", j,i, lp->user.args[j].iter[i].step);
                 printf("  user.args[%d].iter[%d].idx = 0x%"SZF"x\n", j,i, (size_t)lp->user.args[j].iter[i].idx);
             }
         }
@@ -174,7 +174,7 @@ print_ndloop(na_md_loop_t *lp) {
         for (i=0; i<=nd; i++) {
             printf(" &xargs[%d].iter[%d] = 0x%"SZF"x\n", j,i, (size_t)&LITER(lp,i,j));
             printf("  xargs[%d].iter[%d].pos = %"SZF"u\n", j,i, LITER(lp,i,j).pos);
-            printf("  xargs[%d].iter[%d].step = %"SZF"u\n", j,i, LITER(lp,i,j).step);
+            printf("  xargs[%d].iter[%d].step = %"SZF"d\n", j,i, LITER(lp,i,j).step);
             printf("  xargs[%d].iter[%d].idx = 0x%"SZF"x\n", j,i, (size_t)LITER(lp,i,j).idx);
         }
         printf("  xargs[%d].bufcp = 0x%"SZF"x\n", j, (size_t)lp->xargs[j].bufcp);

data/ext/numo/narray/numo/narray.h

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.8"
-#define NARRAY_VERSION_CODE 918
+#define NARRAY_VERSION "0.9.2.1"
+#define NARRAY_VERSION_CODE 921
 
 #include <math.h>
 #include "numo/compat.h"
@@ -450,6 +450,12 @@ typedef unsigned int BIT_DIGIT;
 #include "numo/ndloop.h"
 #include "numo/intern.h"
 
+// for Ractor support code
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#   undef RUBY_TYPED_FROZEN_SHAREABLE
+#   define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/ext/numo/narray/numo/template.h

@@ -36,19 +36,17 @@
 
 #define INIT_PTR_BIT( lp, i, ad, ps, st )               \
     {                                                   \
-        ps = ((lp)->args[i].iter[0]).pos;                       \
-        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr) + ps/NB; \
-        ps %= NB;                                       \
-        st = ((lp)->args[i].iter[0]).step;                      \
+        ps = ((lp)->args[i].iter[0]).pos;               \
+        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr);         \
+        st = ((lp)->args[i].iter[0]).step;              \
     }
 
 #define INIT_PTR_BIT_IDX( lp, i, ad, ps, st, id )       \
     {                                                   \
-        ps = ((lp)->args[i].iter[0]).pos;                       \
-        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr) + ps/NB; \
-        ps %= NB;                                       \
-        st = ((lp)->args[i].iter[0]).step;                      \
-        id = ((lp)->args[i].iter[0]).idx;                       \
+        ps = ((lp)->args[i].iter[0]).pos;               \
+        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr);         \
+        st = ((lp)->args[i].iter[0]).step;              \
+        id = ((lp)->args[i].iter[0]).idx;               \
     }
 
 #define GET_DATA( ptr, type, val )                 \

data/ext/numo/narray/numo/types/complex_macro.h

@@ -117,7 +117,7 @@ static inline dtype c_from_dcomplex(dcomplex x) {
 #define m_acosh(x)   c_acosh(x)
 #define m_atanh(x)   c_atanh(x)
 #define m_hypot(x,y) c_hypot(x,y)
-#define m_sinc(x)    c_div(c_sin(x),x)
+#define m_sinc(x)    ((REAL(x)==0 && IMAG(x)==0) ? (c_new(1,0)):(c_div(c_sin(x),x)))
 
 #define m_sum_init INT2FIX(0)
 #define m_mulsum_init INT2FIX(0)

data/ext/numo/narray/numo/types/float_macro.h

@@ -110,7 +110,7 @@ extern double pow(double, double);
 #define m_atanh(x)   atanh(x)
 #define m_atan2(x,y) atan2(x,y)
 #define m_hypot(x,y) hypot(x,y)
-#define m_sinc(x)    (sin(x)/(x))
+#define m_sinc(x)    (((x)==0) ? 1.0:(sin(x)/(x)))
 
 #define m_erf(x)     erf(x)
 #define m_erfc(x)    erfc(x)

data/ext/numo/narray/struct.c

@@ -813,7 +813,7 @@ nst_s_add_type(int argc, VALUE *argv, VALUE mod)
 
 #define NST_TYPEDEF(tpname,tpclass)                 \
 static VALUE                                        \
-nst_s_##tpname(VALUE argc, VALUE *argv, VALUE mod)  \
+nst_s_##tpname(int argc, VALUE *argv, VALUE mod)    \
 {   nstruct_add_type(tpclass,argc,argv,mod);        \
     return Qnil;                                    \
 }

data/lib/numo/narray/extra.rb

@@ -106,7 +106,19 @@ module Numo
 
     # Convert the argument to an narray if not an narray.
     def self.cast(a)
-      a.kind_of?(NArray) ? a : NArray.array_type(a).cast(a)
+      case a
+      when NArray
+        a
+      when Array,Numeric
+        NArray.array_type(a).cast(a)
+      else
+        if a.respond_to?(:to_a)
+          a = a.to_a
+          NArray.array_type(a).cast(a)
+        else
+          raise TypeError,"invalid type for NArray"
+        end
+      end
     end
 
     def self.asarray(a)

data/lib/numo/narray.rb

@@ -1,2 +1,2 @@
-require "numo/narray.so"
+require "numo/narray.#{RUBY_PLATFORM.include?('darwin') ? 'bundle' : 'so'}"
 require "numo/narray/extra"

data/numo-narray.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical MOdule)}
   spec.homepage      = "https://github.com/ruby-numo/numo-narray"
   spec.license       = "BSD-3-Clause"
-  spec.required_ruby_version = '~> 2.2'
+  spec.required_ruby_version = '>= 2.2'
 
   spec.files         = `git ls-files Gemfile README.md Rakefile lib ext numo-narray.gemspec spec`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/numo/narray/extconf.rb"]
 
   if RUBY_VERSION < '2.3' # Ruby 2.2.x
-    spec.add_development_dependency "bundler", "~> 1.3"
+    spec.add_development_dependency "bundler", "~> 1.3", "< 1.14.0"
   else
-    spec.add_development_dependency "bundler", "~> 2.0"
+    spec.add_development_dependency "bundler", ">= 2.2.33"
   end
   spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "rake-compiler", "~> 1.1"
+  spec.add_development_dependency "test-unit"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.8
+  version: 0.9.2.1
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Numo::NArray - New NArray class library in Ruby/Numo.
 email:
 - masa16.tanaka@gmail.com
@@ -222,7 +236,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement