carray 1.2.0 → 1.3.0

data/carray_iterator.c

@@ -31,7 +31,7 @@ ca_iter_rank (VALUE self)
 }
 
 void
-ca_iter_dim (VALUE self, int32_t *dim)
+ca_iter_dim (VALUE self, ca_size_t *dim)
 {
   int i;
   if ( TYPE(self) == T_DATA ) {
@@ -44,15 +44,15 @@ ca_iter_dim (VALUE self, int32_t *dim)
   else {
     VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
-    int rank;
-    rank = NUM2LONG(rrank);
+    int8_t rank;
+    rank = (int8_t) NUM2INT(rrank);
     for (i=0; i<rank; i++) {
-      dim[i] = NUM2LONG(rb_ary_entry(rdim, i));
+      dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
     }
   }
 }
 
-int32_t
+ca_size_t
 ca_iter_elements (VALUE self)
 {
   int i, elements;
@@ -67,10 +67,10 @@ ca_iter_elements (VALUE self)
   else {
     VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
-    int rank = NUM2LONG(rrank);
+    int8_t rank = (int8_t) NUM2INT(rrank);
     elements = 1;
     for (i=0; i<rank; i++) {
-      elements *= NUM2LONG(rb_ary_entry(rdim, i));
+      elements *= NUM2SIZE(rb_ary_entry(rdim, i));
     }
   }
   return elements;
@@ -83,7 +83,7 @@ ca_iter_reference (VALUE self)
 }
 
 VALUE
-ca_iter_kernel_at_addr (VALUE self, int32_t addr, VALUE rref)
+ca_iter_kernel_at_addr (VALUE self, ca_size_t addr, VALUE rref)
 {
   volatile VALUE rker;
   if ( TYPE(self) == T_DATA ) {
@@ -98,13 +98,13 @@ ca_iter_kernel_at_addr (VALUE self, int32_t addr, VALUE rref)
   }
   else {
     rker = rb_funcall(self, rb_intern("kernel_at_addr"), 2,
-                      INT2NUM(addr), rref);
+                      SIZE2NUM(addr), rref);
   }
   return rker;
 }
 
 VALUE
-ca_iter_kernel_at_index (VALUE self, int32_t *idx, VALUE rref)
+ca_iter_kernel_at_index (VALUE self, ca_size_t *idx, VALUE rref)
 {
   VALUE rker;
   if ( TYPE(self) == T_DATA ) {
@@ -123,7 +123,7 @@ ca_iter_kernel_at_index (VALUE self, int32_t *idx, VALUE rref)
     int i;
     vidx = rb_ary_new2(rank);
     for (i=0; i<rank; i++) {
-      rb_ary_store(vidx, i, INT2NUM(idx[i]));
+      rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
     }
     rker = rb_funcall(self, rb_intern("kernel_at_index"), 2,
                       vidx, rref);
@@ -132,7 +132,7 @@ ca_iter_kernel_at_index (VALUE self, int32_t *idx, VALUE rref)
 }
 
 VALUE
-ca_iter_kernel_move_to_addr (VALUE self, int32_t addr, VALUE rref)
+ca_iter_kernel_move_to_addr (VALUE self, ca_size_t addr, VALUE rref)
 {
   if ( TYPE(self) == T_DATA ) {
     CAIterator *it;
@@ -143,13 +143,13 @@ ca_iter_kernel_move_to_addr (VALUE self, int32_t addr, VALUE rref)
   }
   else {
     rb_funcall(self, rb_intern("kernel_move_to_addr"), 2,
-                      INT2NUM(addr), rref);
+                      SIZE2NUM(addr), rref);
   }
   return rref;
 }
 
 VALUE
-ca_iter_kernel_move_to_index (VALUE self, int32_t *idx, VALUE rref)
+ca_iter_kernel_move_to_index (VALUE self, ca_size_t *idx, VALUE rref)
 {
   VALUE rker;
   if ( TYPE(self) == T_DATA ) {
@@ -165,7 +165,7 @@ ca_iter_kernel_move_to_index (VALUE self, int32_t *idx, VALUE rref)
     int i;
     vidx = rb_ary_new2(rank);
     for (i=0; i<rank; i++) {
-      rb_ary_store(vidx, i, INT2NUM(idx[i]));
+      rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
     }
     rker = rb_funcall(self, rb_intern("kernel_move_to_index"), 2,
                       vidx, rref);
@@ -180,7 +180,7 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
   volatile VALUE obj;
   CArray *co;
   int8_t data_type;
-  int32_t bytes;
+  ca_size_t bytes;
   int i;
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
@@ -194,9 +194,9 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
     VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
     int8_t rank = NUM2LONG(rrank);
-    int32_t dim[CA_RANK_MAX];
+    ca_size_t dim[CA_RANK_MAX];
     for (i=0; i<rank; i++) {
-      dim[i] = NUM2LONG(rb_ary_entry(rdim, i));
+      dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
     }
     co = carray_new_safe(data_type, rank, dim, bytes, NULL);
   }
@@ -216,6 +216,7 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
   end
 */
 
+
 VALUE
 rb_ca_iter_rank (VALUE self)
 {
@@ -233,13 +234,13 @@ VALUE
 rb_ca_iter_dim (VALUE self)
 {
   VALUE rdim;
-  int32_t dim[CA_RANK_MAX];
+  ca_size_t dim[CA_RANK_MAX];
   int8_t rank = ca_iter_rank(self);
   int i;
   ca_iter_dim(self, dim);
   rdim = rb_ary_new2(rank);
   for (i=0; i<rank; i++) {
-    rb_ary_store(rdim, i, INT2NUM(dim[i]));
+    rb_ary_store(rdim, i, SIZE2NUM(dim[i]));
   }
   return rdim;
 }
@@ -254,7 +255,7 @@ rb_ca_iter_dim (VALUE self)
 VALUE
 rb_ca_iter_elements (VALUE self)
 {
-  return LONG2NUM(ca_iter_elements(self));
+  return SIZE2NUM(ca_iter_elements(self));
 }
 
 /* rdoc:
@@ -281,11 +282,11 @@ VALUE
 rb_ca_iter_kernel_at_addr (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE raddr, rcarray;
-  rb_scan_args(argc, argv, "11", &raddr, &rcarray);
+  rb_scan_args(argc, argv, "11", (VALUE *) &raddr, (VALUE *) &rcarray);
   if ( NIL_P(rcarray) ) {
     rcarray = rb_ca_iter_reference(self);
   }
-  return ca_iter_kernel_at_addr(self, NUM2LONG(raddr), rcarray);
+  return ca_iter_kernel_at_addr(self, NUM2SIZE(raddr), rcarray);
 }
 
 /* rdoc:
@@ -299,18 +300,18 @@ VALUE
 rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rindex, rcarray;
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   int8_t  rank = ca_iter_rank(self);
   int i;
 
-  rb_scan_args(argc, argv, "11", &rindex, &rcarray);
+  rb_scan_args(argc, argv, "11", (VALUE *) &rindex, (VALUE *) &rcarray);
 
   if ( NIL_P(rcarray) ) {
     rcarray = rb_ca_iter_reference(self);
   }
 
   for (i=0; i<rank; i++) {
-    idx[i] = NUM2LONG(rb_ary_entry(rindex, i));
+    idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
   }
 
   return ca_iter_kernel_at_index(self, idx, rcarray);
@@ -326,7 +327,7 @@ rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
 VALUE
 rb_ca_iter_kernel_move_to_addr (VALUE self, VALUE raddr, VALUE rker)
 {
-  return ca_iter_kernel_move_to_addr(self, NUM2LONG(raddr), rker);
+  return ca_iter_kernel_move_to_addr(self, NUM2SIZE(raddr), rker);
 }
 
 /* rdoc:
@@ -339,12 +340,12 @@ rb_ca_iter_kernel_move_to_addr (VALUE self, VALUE raddr, VALUE rker)
 VALUE
 rb_ca_iter_kernel_move_to_index (VALUE self, VALUE rindex, VALUE rker)
 {
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   int8_t  rank = ca_iter_rank(self);
   int i;
 
   for (i=0; i<rank; i++) {
-    idx[i] = NUM2LONG(rb_ary_entry(rindex, i));
+    idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
   }
 
   return ca_iter_kernel_move_to_index(self, idx, rker);
@@ -382,9 +383,9 @@ rb_ca_iter_calculate (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rtype, rbytes, routput, rref, rker, rout;
   CArray *co, *cr, *ck;
-  int32_t elements;
+  ca_size_t elements;
   int8_t data_type;
-  int32_t bytes;
+  ca_size_t bytes;
   int i;
 
   if ( argc < 1 ) {
@@ -398,12 +399,12 @@ rb_ca_iter_calculate (int argc, VALUE *argv, VALUE self)
   
   if ( NIL_P(argv[0]) ) {
     rtype = INT2NUM(cr->data_type);
-    rbytes = INT2NUM(cr->bytes);
+    rbytes = SIZE2NUM(cr->bytes);
   }
   else {
     rb_ca_guess_type_and_bytes(argv[0], Qnil, &data_type, &bytes);
     rtype = INT2NUM(data_type);
-    rbytes = INT2NUM(bytes);
+    rbytes = SIZE2NUM(bytes);
   }
   argc--;
   argv++;
@@ -481,7 +482,7 @@ rb_ca_iter_filter (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE routput, rref, rker, rout;
   CArray *co, *cr, *ck, *cq;
-  int32_t elements;
+  ca_size_t elements;
   int8_t data_type;
   int i;
 
@@ -558,7 +559,7 @@ rb_ca_iter_evaluate (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rref, rker;
   CArray *cr, *ck;
-  int32_t elements;
+  ca_size_t elements;
   int i;
 
   elements = ca_iter_elements(self);

data/carray_loop.c

@@ -17,7 +17,7 @@ rb_ca_s_each_index_internal (int rank, VALUE *dim, uint8_t irank, VALUE ridx)
 {
   volatile VALUE ret = Qnil;
   int32_t is_leaf = (irank == rank - 1);
-  int32_t i;
+  ca_size_t i;
 
   if ( NIL_P(dim[irank]) ) {
     rb_ary_store(ridx, irank, Qnil);
@@ -29,8 +29,8 @@ rb_ca_s_each_index_internal (int rank, VALUE *dim, uint8_t irank, VALUE ridx)
     }
   }
   else {
-    for (i=0; i<NUM2LONG(dim[irank]); i++) {
-      rb_ary_store(ridx, irank, INT2NUM(i));
+    for (i=0; i<NUM2SIZE(dim[irank]); i++) {
+      rb_ary_store(ridx, irank, SIZE2NUM(i));
       if ( is_leaf ) {
         ret = rb_yield_splat(rb_obj_clone(ridx));
       }
@@ -81,8 +81,8 @@ static VALUE
 rb_ca_each (VALUE self)
 {
   volatile VALUE ret = Qnil;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
@@ -104,13 +104,13 @@ static VALUE
 rb_ca_each_with_addr (VALUE self)
 {
   volatile VALUE ret = Qnil;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
   for (i=0; i<elements; i++) {
-    ret = rb_yield_values(2, rb_ca_fetch_addr(self, i), INT2NUM(i));
+    ret = rb_yield_values(2, rb_ca_fetch_addr(self, i), SIZE2NUM(i));
   }
   return ret;
 }
@@ -127,13 +127,13 @@ static VALUE
 rb_ca_each_addr (VALUE self)
 {
   volatile VALUE ret = Qnil;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
   for (i=0; i<elements; i++) {
-    ret = rb_yield(LONG2NUM(i));
+    ret = rb_yield(SIZE2NUM(i));
   }
   return ret;
 }
@@ -143,17 +143,17 @@ rb_ca_each_index_internal (VALUE self, int8_t level, VALUE ridx)
 {
   volatile VALUE ret = Qnil;
   CArray *ca;
-  int32_t i;
+  ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
   if ( level == ca->rank - 1 ) {
     for (i=0; i<ca->dim[level]; i++) {
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       ret = rb_yield_splat(rb_obj_clone(ridx));
     }
   }
   else {
     for (i=0; i<ca->dim[level]; i++) {
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       ret = rb_ca_each_index_internal(self, level+1, ridx);
     }
   }
@@ -200,8 +200,8 @@ rb_ca_map_bang (VALUE self)
 {
   volatile VALUE obj;
   CArray *ca;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
@@ -219,16 +219,16 @@ rb_ca_map_bang (VALUE self)
 
 static VALUE
 rb_ca_each_with_index_internal (VALUE self,
-                                int8_t level, int32_t *idx, VALUE ridx)
+                                int8_t level, ca_size_t *idx, VALUE ridx)
 {
   volatile VALUE ret = Qnil;
   CArray *ca;
-  int32_t i;
+  ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
   if ( level == ca->rank - 1 ) {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       ret = rb_yield_values(2, rb_ca_fetch_index(self, idx),
                                rb_obj_clone(ridx));
     }
@@ -236,7 +236,7 @@ rb_ca_each_with_index_internal (VALUE self,
   else {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       ret = rb_ca_each_with_index_internal(self, level+1, idx, ridx);
     }
   }
@@ -255,7 +255,7 @@ static VALUE
 rb_ca_each_with_index (VALUE self)
 {
   volatile VALUE ridx, ret;
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   int8_t  rank = NUM2INT(rb_ca_rank(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
@@ -269,16 +269,16 @@ rb_ca_each_with_index (VALUE self)
 
 static void
 rb_ca_map_with_index_bang_internal (VALUE self,
-                                    int8_t level, int32_t *idx, VALUE ridx)
+                                    int8_t level, ca_size_t *idx, VALUE ridx)
 {
   CArray *ca;
-  int32_t i;
+  ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
   if ( level == ca->rank - 1 ) {
     volatile VALUE obj;
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       obj = rb_yield_values(2, rb_ca_fetch_index(self, idx),
                                rb_obj_clone(ridx));
       rb_ca_store_index(self, idx, obj);
@@ -287,7 +287,7 @@ rb_ca_map_with_index_bang_internal (VALUE self,
   else {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       rb_ca_map_with_index_bang_internal(self, level+1, idx, ridx);
     }
   }
@@ -306,7 +306,7 @@ rb_ca_map_with_index_bang (VALUE self)
 {
   volatile VALUE ridx;
   CArray *ca;
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   int8_t  rank = NUM2INT(rb_ca_rank(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
@@ -324,16 +324,16 @@ rb_ca_map_with_index_bang (VALUE self)
 
 static void
 rb_ca_map_index_bang_internal (VALUE self,
-                               int8_t level, int32_t *idx, VALUE ridx)
+                               int8_t level, ca_size_t *idx, VALUE ridx)
 {
   CArray *ca;
-  int32_t i;
+  ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
   if ( level == ca->rank - 1 ) {
     volatile VALUE obj;
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       obj = rb_yield_splat(rb_obj_clone(ridx));
       rb_ca_store_index(self, idx, obj);
     }
@@ -341,7 +341,7 @@ rb_ca_map_index_bang_internal (VALUE self,
   else {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
-      rb_ary_store(ridx, level, INT2NUM(i));
+      rb_ary_store(ridx, level, SIZE2NUM(i));
       rb_ca_map_index_bang_internal(self, level+1, idx, ridx);
     }
   }
@@ -360,7 +360,7 @@ rb_ca_map_index_bang (VALUE self)
 {
   volatile VALUE ridx;
   CArray *ca;
-  int32_t idx[CA_RANK_MAX];
+  ca_size_t idx[CA_RANK_MAX];
   int8_t  rank = NUM2INT(rb_ca_rank(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
@@ -388,8 +388,8 @@ rb_ca_map_with_addr_bang (VALUE self)
 {
   volatile VALUE obj;
   CArray *ca;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
@@ -397,7 +397,7 @@ rb_ca_map_with_addr_bang (VALUE self)
   Data_Get_Struct(self, CArray, ca);
   ca_attach(ca);
   for (i=0; i<elements; i++) {
-    obj = rb_yield_values(2, rb_ca_fetch_addr(self, i), LONG2NUM(i));
+    obj = rb_yield_values(2, rb_ca_fetch_addr(self, i), SIZE2NUM(i));
     rb_ca_store_addr(self, i, obj);
   }
   ca_sync(ca);
@@ -419,8 +419,8 @@ rb_ca_map_addr_bang (VALUE self)
 {
   volatile VALUE obj;
   CArray *ca;
-  int32_t elements = NUM2LONG(rb_ca_elements(self));
-  int32_t i;
+  ca_size_t elements = NUM2SIZE(rb_ca_elements(self));
+  ca_size_t i;
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
@@ -428,7 +428,7 @@ rb_ca_map_addr_bang (VALUE self)
   Data_Get_Struct(self, CArray, ca);
   ca_attach(ca);
   for (i=0; i<elements; i++) {
-    obj = rb_yield(LONG2NUM(i));
+    obj = rb_yield(SIZE2NUM(i));
     rb_ca_store_addr(self, i, obj);
   }
   ca_sync(ca);