numo-narray 0.9.1.7 → 0.9.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13fa1238cfb0a52ebd9c7f067e43660316027ecf0c9f03c387f0022c0ba4dace
-  data.tar.gz: bc4bbdb7664ae87f1be7ed302dcae63d852f09ed05dcd5a30a8f6e8368bdd2de
+  metadata.gz: 596c9ece21d3e9d75cf78a7b6d60b3fbda065a23718763bb3632cc8cae45fab6
+  data.tar.gz: bf03dd10e983d362a233bab2ec356e6a68e9dc3e27edccdf40018e661a15fe87
 SHA512:
-  metadata.gz: bd834ddb4e45505e61d6bf81b7d4b8147228d12c3321d9fb3cc2fc8a3f51fe40e885010fc59e0a44b1f0d4b11780b2744f2b36236446dab178f91a1fb633d096
-  data.tar.gz: 0d75394f0ce6c63329de7c8549644fa8c3c5d5ada1883a8f48175c6683cb573b507006302b64ca31e4c12d58577f1a47ff9ca3ae4237e72dac76d52be4f3d1d8
+  metadata.gz: 58ef93f8200db87e99012b56bd7f8ccf22cb97abc77b1596e16a855f509fab498e33859b78f6b9626347ed83769eeb9011a7d59a93b3a8527131cad657b58d17
+  data.tar.gz: ac72e280b35ee08eb3b9faf5880355ccdeb4f39d521ba3f9d6067e96102e55561433eff16ed0b0b512da63057dca18d8eb6d72a4687a6d75321e5c29068c70fd

data/ext/numo/narray/array.c

@@ -30,6 +30,9 @@ 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;
@@ -45,7 +48,7 @@ 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;
@@ -61,12 +64,11 @@ static VALUE
             }
         }
         return type;
-
-#elif SIZEOF_LONG == 8
+#else
     case T_FIXNUM:
         if (type<NA_INT64) {
             long x = NUM2LONG(v);
-            if (x<=2147483647 && x>=-2147483648) {
+            if (x<=2147483647L && x>=-2147483648L) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -78,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) {
-            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 {
-                return NA_INT64;
-            }
-        }
-        return type;
 #endif
 
     case T_FLOAT:
@@ -645,6 +634,9 @@ 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);

data/ext/numo/narray/data.c

@@ -8,9 +8,7 @@
 #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/numo/narray.h

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.7"
-#define NARRAY_VERSION_CODE 917
+#define NARRAY_VERSION "0.9.1.8"
+#define NARRAY_VERSION_CODE 918
 
 #include <math.h>
 #include "numo/compat.h"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.7
+  version: 0.9.1.8
 platform: ruby
 authors:
 - Masahiro TANAKA