numo-narray 0.9.1.5 → 0.9.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2723cec3e04deedc561c54a0d4f6af799dd93fc8a32079d06a074f00f07f466c
-  data.tar.gz: 5548cfa23b0ac7227b62ab8edd00ba040805c0563befeb32591179dc090eff66
+  metadata.gz: a2232329c5ed735d60a1b661d6a0db1b9522cc9cad8f98eb8fc1c6db9026b2cb
+  data.tar.gz: ef322c74597e29f8e10c62887feceedc400bbadaa6858ffe80f60949ca31f56d
 SHA512:
-  metadata.gz: 19a91712b943da6f57f2cda4fa178adcb5a0c845c2b0ce8190f46c5c1a0d83a331fd32d71e9b2b85c960222f4a01940926bacba63eb882ea1b27aebb7a09c7a3
-  data.tar.gz: 4ee3a88369439ccf964fd23358a84530973c5355d4c71b35eda516bd655966ce127d494159c942bf0a82045b3f05a6be7ed16f4d9d30b96916df651c9a5ec0cb
+  metadata.gz: 9a745b45d333641210bd942a39609b32df1a18638fdbe03c50fd884c5b31c186816019e2a02532ed23b719b24869054434ea227c0a0a9254155d0dc4d9fd1be4
+  data.tar.gz: 288ea51ef740d909a6f66f5506de47112071d7d6fb7fe6e9bf6e2c04f470ac397cfc3b1edd8da1fd1228ffc5b3ef31eecc6f7265867ec51d03f40ebe88c2d35d

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"

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

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/tmpl/alloc_func.c

@@ -29,7 +29,9 @@ static void
     assert(na->base.type == NARRAY_DATA_T);
 
     if (na->ptr != NULL) {
-        xfree(na->ptr);
+        if (na->owned) {
+            xfree(na->ptr);
+        }
         na->ptr = NULL;
     }
     if (na->base.size > 0) {
@@ -103,5 +105,6 @@ static VALUE
     na->base.shape = NULL;
     na->base.reduce = INT2FIX(0);
     na->ptr = NULL;
+    na->owned = FALSE;
     return TypedData_Wrap_Struct(klass, &<%=type_name%>_data_type, (void*)na);
 }

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

@@ -20,6 +20,7 @@ static VALUE
             }
             <% end %>
             NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case NARRAY_VIEW_T:

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

@@ -12,6 +12,7 @@ static VALUE
         if (na->size > 0 && ptr == NULL) {
             ptr = xmalloc(((na->size-1)/8/sizeof(BIT_DIGIT)+1)*sizeof(BIT_DIGIT));
             NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = TRUE;
         }
         break;
     case NARRAY_VIEW_T:

data/ext/numo/narray/index.c

@@ -1050,11 +1050,8 @@ static VALUE na_slice(int argc, VALUE *argv, VALUE self)
       #  [10, 11, 99, 13, 14],
       #  [15, 16, 99, 18, 19]]
  */
-static VALUE na_aref(int argc, VALUE *argv, VALUE self)
-{
-    // implemented in subclasses
-    return rb_f_notimplement(argc,argv,self);
-}
+// implemented in subclasses
+#define na_aref rb_f_notimplement
 
 /*
   Multi-dimensional element assignment.
@@ -1094,11 +1091,8 @@ static VALUE na_aref(int argc, VALUE *argv, VALUE self)
       #  [8, 9, 10, 11]]
 
 */
-static VALUE na_aset(int argc, VALUE *argv, VALUE self)
-{
-    // implemented in subclasses
-    return rb_f_notimplement(argc,argv,self);
-}
+// implemented in subclasses
+#define na_aset rb_f_notimplement
 
 /*
   Multi-dimensional array indexing.

data/ext/numo/narray/narray.c

@@ -34,6 +34,7 @@ static ID id_count_false;
 static ID id_axis;
 static ID id_nan;
 static ID id_keepdims;
+static ID id_source;
 
 VALUE cPointer;
 
@@ -605,6 +606,87 @@ na_s_eye(int argc, VALUE *argv, VALUE klass)
 #define READ 1
 #define WRITE 2
 
+static void
+na_set_pointer(VALUE self, char *ptr, size_t byte_size)
+{
+    VALUE obj;
+    narray_t *na;
+
+    if (OBJ_FROZEN(self)) {
+        rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+    }
+
+    GetNArray(self,na);
+
+    switch(NA_TYPE(na)) {
+    case NARRAY_DATA_T:
+        if (NA_SIZE(na) > 0) {
+            if (NA_DATA_PTR(na) != NULL && NA_DATA_OWNED(na)) {
+                xfree(NA_DATA_PTR(na));
+            }
+            NA_DATA_PTR(na) = ptr;
+            NA_DATA_OWNED(na) = FALSE;
+        }
+        return;
+    case NARRAY_VIEW_T:
+        obj = NA_VIEW_DATA(na);
+        if (OBJ_FROZEN(obj)) {
+            rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
+        }
+        GetNArray(obj,na);
+        switch(NA_TYPE(na)) {
+        case NARRAY_DATA_T:
+            if (NA_SIZE(na) > 0) {
+                if (NA_DATA_PTR(na) != NULL && NA_DATA_OWNED(na)) {
+                    xfree(NA_DATA_PTR(na));
+                }
+                NA_DATA_PTR(na) = ptr;
+                NA_DATA_OWNED(na) = FALSE;
+            }
+            return;
+        default:
+            rb_raise(rb_eRuntimeError,"invalid NA_TYPE of view: %d",NA_TYPE(na));
+        }
+    default:
+        rb_raise(rb_eRuntimeError,"invalid NA_TYPE: %d",NA_TYPE(na));
+    }
+}
+
+static void
+na_pointer_copy_on_write(VALUE self)
+{
+    narray_t *na;
+    void *ptr;
+    VALUE velmsz;
+    size_t byte_size;
+
+    GetNArray(self,na);
+    if (NA_TYPE(na) == NARRAY_VIEW_T) {
+        self = NA_VIEW_DATA(na);
+        GetNArray(self,na);
+    }
+
+    ptr = NA_DATA_PTR(na);
+    if (ptr == NULL) {
+        return;
+    }
+
+    if (NA_DATA_OWNED(na)) {
+        return;
+    }
+
+    velmsz = rb_const_get(rb_obj_class(self), id_element_byte_size);
+    if (FIXNUM_P(velmsz)) {
+        byte_size = NA_SIZE(na) * NUM2SIZET(velmsz);
+    } else {
+        byte_size = ceil(NA_SIZE(na) * NUM2DBL(velmsz));
+    }
+    NA_DATA_PTR(na) = NULL;
+    rb_funcall(self, id_allocate, 0);
+    memcpy(NA_DATA_PTR(na), ptr, byte_size);
+    rb_ivar_set(self, id_source, Qnil);
+}
+
 static char *
 na_get_pointer_for_rw(VALUE self, int flag)
 {
@@ -620,6 +702,9 @@ na_get_pointer_for_rw(VALUE self, int flag)
 
     switch(NA_TYPE(na)) {
     case NARRAY_DATA_T:
+        if (flag & WRITE) {
+            na_pointer_copy_on_write(self);
+        }
         ptr = NA_DATA_PTR(na);
         if (NA_SIZE(na) > 0 && ptr == NULL) {
             if (flag & READ) {
@@ -636,6 +721,9 @@ na_get_pointer_for_rw(VALUE self, int flag)
         if ((flag & WRITE) && OBJ_FROZEN(obj)) {
             rb_raise(rb_eRuntimeError, "cannot write to frozen NArray.");
         }
+        if (flag & WRITE) {
+            na_pointer_copy_on_write(self);
+        }
         GetNArray(obj,na);
         switch(NA_TYPE(na)) {
         case NARRAY_DATA_T:
@@ -1260,7 +1348,6 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
 {
     size_t len, str_len, byte_size;
     size_t *shape;
-    char *ptr;
     int   i, nd, narg;
     VALUE vstr, vshape, vna;
     VALUE velmsz;
@@ -1315,9 +1402,13 @@ nary_s_from_binary(int argc, VALUE *argv, VALUE type)
     }
 
     vna = nary_new(type, nd, shape);
-    ptr = na_get_pointer_for_write(vna);
-
-    memcpy(ptr, RSTRING_PTR(vstr), byte_size);
+    if (OBJ_FROZEN(vstr)) {
+        na_set_pointer(vna, RSTRING_PTR(vstr), byte_size);
+        rb_ivar_set(vna, id_source, vstr);
+    } else {
+        void *ptr = na_get_pointer_for_write(vna);
+        memcpy(ptr, RSTRING_PTR(vstr), byte_size);
+    }
 
     return vna;
 }
@@ -1333,7 +1424,6 @@ static VALUE
 nary_store_binary(int argc, VALUE *argv, VALUE self)
 {
     size_t size, str_len, byte_size, offset;
-    char *ptr;
     int   narg;
     VALUE vstr, voffset;
     VALUE velmsz;
@@ -1363,8 +1453,13 @@ nary_store_binary(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "string is too short to store");
     }
 
-    ptr = na_get_pointer_for_write(self);
-    memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    if (OBJ_FROZEN(vstr)) {
+        na_set_pointer(self, RSTRING_PTR(vstr)+offset, byte_size);
+        rb_ivar_set(self, id_source, vstr);
+    } else {
+        void *ptr = na_get_pointer_for_write(self);
+        memcpy(ptr, RSTRING_PTR(vstr)+offset, byte_size);
+    }
 
     return SIZET2NUM(byte_size);
 }
@@ -1470,6 +1565,7 @@ nary_marshal_load(VALUE self, VALUE a)
         ptr = na_get_pointer_for_write(self);
         memcpy(ptr, RARRAY_PTR(v), NA_SIZE(na)*sizeof(VALUE));
     } else {
+        rb_str_freeze(v);
         nary_store_binary(1,&v,self);
         if (TEST_BYTE_SWAPPED(self)) {
             rb_funcall(na_inplace(self),id_to_host,0);
@@ -2009,6 +2105,7 @@ Init_narray()
     id_axis        = rb_intern("axis");
     id_nan         = rb_intern("nan");
     id_keepdims    = rb_intern("keepdims");
+    id_source      = rb_intern("source");
 
     sym_reduce   = ID2SYM(rb_intern("reduce"));
     sym_option   = ID2SYM(rb_intern("option"));

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

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.5"
-#define NARRAY_VERSION_CODE 915
+#define NARRAY_VERSION "0.9.1.6"
+#define NARRAY_VERSION_CODE 916
 
 #include <math.h>
 #include "numo/compat.h"
@@ -81,6 +81,8 @@ extern "C" {
 # ifndef PRIu64
 #  define PRIu64 "llu"
 # endif
+#else
+# error ---->> numo/narray requires 8-byte integer. <<----
 #endif
 
 #if   SIZEOF_LONG==4
@@ -96,22 +98,22 @@ extern "C" {
 # endif
 #elif SIZEOF_INT==4
 # define NUM2INT32(x) NUM2INT(x)
-# define INT322NUM(x) INT2NUM(x)
 # define NUM2UINT32(x) NUM2UINT(x)
-# define UINT322NUM(x) UINT2NUM(x)
+# if SIZEOF_LONG > 4
+#  define INT322NUM(x) INT2FIX(x)
+#  define UINT322NUM(x) INT2FIX(x)
+# else
+#  define INT322NUM(x) INT2NUM(x)
+#  define UINT322NUM(x) UINT2NUM(x)
+# endif
 # ifndef PRId32
 #  define PRId32 "d"
 # endif
 # ifndef PRIu32
 #  define PRIu32 "u"
 # endif
-#endif
-
-#if SIZEOF_VALUE > 4
-# undef INT322NUM
-# undef UINT322NUM
-# define INT322NUM(x) INT2FIX(x)
-# define UINT322NUM(x) INT2FIX(x)
+#else
+# error ---->> numo/narray requires 4-byte integer. <<----
 #endif
 
 #ifndef HAVE_TYPE_BOOL
@@ -195,6 +197,7 @@ typedef struct RNArray {
 typedef struct RNArrayData {
     narray_t base;
     char    *ptr;
+    bool     owned;
 } narray_data_t;
 
 
@@ -323,6 +326,7 @@ _na_get_narray_t(VALUE obj, unsigned char na_type)
 #define NA_DATA(na)             ((narray_data_t*)(na))
 #define NA_VIEW(na)             ((narray_view_t*)(na))
 #define NA_DATA_PTR(na)         (NA_DATA(na)->ptr)
+#define NA_DATA_OWNED(na)       (NA_DATA(na)->owned)
 #define NA_VIEW_DATA(na)        (NA_VIEW(na)->data)
 #define NA_VIEW_OFFSET(na)      (NA_VIEW(na)->offset)
 #define NA_VIEW_STRIDX(na)      (NA_VIEW(na)->stridx)

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

@@ -4,8 +4,11 @@ typedef int16_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2INT(x))
-#define m_data_to_num(x) INT2NUM((int)(x))
-#define m_extract(x)     INT2NUM((int)*(dtype*)(x))
+#if SIZEOF_INT > 2
+#define m_data_to_num(x) INT2FIX(x)
+#else
+#define m_data_to_num(x) INT2NUM(x)
+#endif
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
 
 #ifndef INT16_MIN

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

@@ -5,7 +5,6 @@ typedef int32_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2INT32(x))
 #define m_data_to_num(x) INT322NUM((int32_t)(x))
-#define m_extract(x)     INT322NUM((int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId32,(int32_t)(x))
 
 #ifndef INT32_MIN

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

@@ -5,7 +5,6 @@ typedef int64_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2INT64(x))
 #define m_data_to_num(x) INT642NUM((int64_t)(x))
-#define m_extract(x)     INT642NUM((int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId64,(int64_t)(x))
 
 #ifndef INT64_MIN

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

@@ -4,8 +4,7 @@ typedef int8_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2INT(x))
-#define m_data_to_num(x) INT2NUM((int)(x))
-#define m_extract(x)     INT2NUM((int)*(dtype*)(x))
+#define m_data_to_num(x) INT2FIX(x)
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
 
 #ifndef INT8_MIN

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

@@ -4,8 +4,11 @@ typedef u_int16_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2UINT(x))
-#define m_data_to_num(x) UINT2NUM((unsigned int)(x))
-#define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
+#if SIZEOF_INT > 2
+#define m_data_to_num(x) INT2FIX(x)
+#else
+#define m_data_to_num(x) UINT2NUM(x)
+#endif
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
 
 #ifndef UINT16_MAX

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

@@ -5,7 +5,6 @@ typedef u_int32_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2UINT32(x))
 #define m_data_to_num(x) UINT322NUM((u_int32_t)(x))
-#define m_extract(x)     UINT322NUM((u_int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu32,(u_int32_t)(x))
 
 #ifndef UINT32_MAX

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

@@ -5,7 +5,6 @@ typedef u_int64_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2UINT64(x))
 #define m_data_to_num(x) UINT642NUM((u_int64_t)(x))
-#define m_extract(x)     UINT642NUM((u_int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu64,(u_int64_t)(x))
 
 #ifndef UINT64_MAX

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

@@ -4,8 +4,7 @@ typedef u_int8_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2UINT(x))
-#define m_data_to_num(x) UINT2NUM((unsigned int)(x))
-#define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
+#define m_data_to_num(x) INT2FIX(x)
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
 
 #ifndef UINT8_MAX

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

@@ -1,6 +1,8 @@
 #define m_zero 0
 #define m_one  1
 
+#define m_extract(x)    m_data_to_num(*(dtype*)(x))
+
 #define m_from_double(x) (x)
 #define m_from_real(x) (x)
 #define m_from_sint(x) (x)

data/lib/numo/narray.rb

@@ -1,8 +1,2 @@
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/numo/narray.so"
-rescue LoadError
-  require "numo/narray.so"
-end
-
+require "numo/narray.so"
 require "numo/narray/extra"

data/numo-narray.gemspec

@@ -39,6 +39,4 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "rake", "~> 10.0"
   end
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_development_dependency 'rake-compiler', "~> 1.0", ">= 1.0.1"
-  spec.add_development_dependency "rake-compiler-dock", "~> 0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.5
+  version: 0.9.1.6
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,40 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 description: Numo::NArray - New NArray class library in Ruby/Numo.
 email:
 - masa16.tanaka@gmail.com
@@ -265,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical