carray 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86cecb4433272ac917562bf243d29b1e8aa3a29b
-  data.tar.gz: 36bb32592e1397ad672a64ca422e6c5e061fda64
+  metadata.gz: a9d973497b72643e3eff0ba9fe6f27d1c1551b30
+  data.tar.gz: 4d498ed02138ef9003d36ffa9b22e1e1d970923b
 SHA512:
-  metadata.gz: 4ac1417a702843bc61302022870872bbb353e8f0cd3408cd3d152bbb77cd08d62f78566f28a1f7b1d589624eb539322d24d94222435dad3defd741ea9d2b39e8
-  data.tar.gz: ad3f7f25ff4b2bd8122b36ba97d93b0b09c82298b729aa83c8647fa3a90380ed7c8fe4566023849542acb0772bd105197117a9c15184dfee6dbe9161e87a0b61
+  metadata.gz: 79ed70d463d345e8ddec07d9742054bd85d9fcaf4645d4f9f40ee5f872ce85b99b5cc92e5743ca2b3949cf530497762d45d1651ba365e22024a64819ea102b83
+  data.tar.gz: de527fdb98be83795c552c69fe350581f0b4773bff013a5d68947c5fb46305a369d48cba9aedeaa76b426bb372c048f8433a6f4a2969bc7f0a99b9ef34371d75

data/Gemfile

@@ -4,6 +4,5 @@ source "https://rubygems.org"
 # gem "rails"
 gem "narray"
 gem "narray_miss"
-gem "axlsx"
 gem "spreadsheet"
 gem "sqlite3"

data/ca_iter_block.c

@@ -25,9 +25,9 @@ typedef struct {
   int8_t    data_type;
   int8_t    rank;
   int32_t   flags;
-  int32_t   bytes;
-  int32_t   elements;
-  int32_t  *dim;
+  ca_size_t   bytes;
+  ca_size_t   elements;
+  ca_size_t  *dim;
   char     *ptr;
   CArray   *mask;
   CArray   *parent;
@@ -35,24 +35,24 @@ typedef struct {
   uint8_t   nosync;
   // ---------- 
   int8_t    maxdim_index;
-  int32_t   maxdim_step;
-  int32_t   maxdim_step0;
-  int32_t   offset;
-  int32_t  *start;
-  int32_t  *step;
-  int32_t  *count;
-  int32_t  *size0;
+  ca_size_t   maxdim_step;
+  ca_size_t   maxdim_step0;
+  ca_size_t   offset;
+  ca_size_t  *start;
+  ca_size_t  *step;
+  ca_size_t  *count;
+  ca_size_t  *size0;
 } CABlock;                  // 68 + 20*(rank) (bytes) 
 */
 
 typedef struct {
   int8_t  rank;
-  int32_t dim[CA_RANK_MAX];
+  ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
-  CArray * (*kernel_at_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_at_index)(void *, int32_t *, CArray *);
-  CArray * (*kernel_move_to_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_move_to_index)(void *, int32_t *, CArray *);
+  CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_at_index)(void *, ca_size_t *, CArray *);
+  CArray * (*kernel_move_to_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_move_to_index)(void *, ca_size_t *, CArray *);
   /* ----------- */
   CABlock *kernel;
 } CABlockIterator;
@@ -60,11 +60,12 @@ typedef struct {
 /* ----------------------------------------------------------------- */
 
 static CArray *
-ca_bi_kernel_at_index (void *it, int32_t *idx, CArray *ref)
+ca_bi_kernel_at_index (void *it, ca_size_t *idx, CArray *ref)
 {
   CABlockIterator *bit = (CABlockIterator *) it;
   CABlock *kernel;
-  int32_t i, j;
+  int8_t  i;
+  ca_size_t j;
 
   if ( ref == bit->reference ) {
     kernel = (CABlock *)ca_clone(bit->kernel);
@@ -92,12 +93,12 @@ ca_bi_kernel_at_index (void *it, int32_t *idx, CArray *ref)
 }
 
 static CArray *
-ca_bi_kernel_at_addr (void *it, int32_t addr, CArray *ref)
+ca_bi_kernel_at_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CABlockIterator *bit = (CABlockIterator *) it;
-  int32_t *dim = bit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = bit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=bit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -107,11 +108,12 @@ ca_bi_kernel_at_addr (void *it, int32_t addr, CArray *ref)
 
 
 static CArray *
-ca_bi_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
+ca_bi_kernel_move_to_index (void *it, ca_size_t *idx, CArray *kern)
 {
   CABlockIterator *bit = (CABlockIterator *) it;
   CABlock *kernel = (CABlock *) kern;
-  int32_t i, j;
+  int8_t  i;
+  ca_size_t j;
 
   ca_update_mask(kernel);
 
@@ -128,12 +130,12 @@ ca_bi_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
 }
 
 static CArray *
-ca_bi_kernel_move_to_addr (void *it, int32_t addr, CArray *ref)
+ca_bi_kernel_move_to_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CABlockIterator *bit = (CABlockIterator *) it;
-  int32_t *dim = bit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = bit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=bit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -147,8 +149,8 @@ ca_bi_setup (VALUE self, VALUE rref, VALUE rker)
   CABlockIterator *it;
   CArray *ref;
   CABlock *ker;
-  int32_t dim[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t dim[CA_RANK_MAX];
+  int8_t i;
 
   rker = rb_obj_clone(rker);
 
@@ -173,7 +175,7 @@ ca_bi_setup (VALUE self, VALUE rref, VALUE rker)
   }
 
   it->rank      = ref->rank;
-  memcpy(it->dim, dim, it->rank * sizeof(int32_t));
+  memcpy(it->dim, dim, it->rank * sizeof(ca_size_t));
   it->reference = ref;
   it->kernel    = ker;
   it->kernel_at_addr  = ca_bi_kernel_at_addr;

data/ca_iter_dimension.c

@@ -22,12 +22,12 @@ VALUE rb_cCADimIterator;
 
 typedef struct {
   int8_t  rank;
-  int32_t dim[CA_RANK_MAX];
+  ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
-  CArray * (*kernel_at_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_at_index)(void *, int32_t *, CArray *);
-  CArray * (*kernel_move_to_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_move_to_index)(void *, int32_t *, CArray *);
+  CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_at_index)(void *, ca_size_t *, CArray *);
+  CArray * (*kernel_move_to_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_move_to_index)(void *, ca_size_t *, CArray *);
   /* ----------- */
   CArray  *kernel;
   int8_t   symflag[CA_RANK_MAX];
@@ -37,11 +37,12 @@ typedef struct {
 /* -------------------------------------------------------------------- */
 
 static CArray *
-ca_di_kernel_at_index (void *it, int32_t *idx, CArray *ref)
+ca_di_kernel_at_index (void *it, ca_size_t *idx, CArray *ref)
 {
   CADimIterator *dit = (CADimIterator *)it;
   CABlock *kernel;
-  int32_t i, val;
+  int8_t i;
+  ca_size_t val;
 
   if ( ref == dit->reference ) {
     kernel = ca_clone(dit->kernel);
@@ -70,12 +71,12 @@ ca_di_kernel_at_index (void *it, int32_t *idx, CArray *ref)
 }
 
 static CArray *
-ca_di_kernel_at_addr (void *it, int32_t addr, CArray *ref)
+ca_di_kernel_at_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CADimIterator *dit = (CADimIterator *) it;
-  int32_t *dim = dit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = dit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=dit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -84,11 +85,12 @@ ca_di_kernel_at_addr (void *it, int32_t addr, CArray *ref)
 }
 
 static CArray *
-ca_di_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
+ca_di_kernel_move_to_index (void *it, ca_size_t *idx, CArray *kern)
 {
   CADimIterator *dit = (CADimIterator *)it;
   CABlock *kernel = (CABlock *) kern;
-  int32_t i, val;
+  int8_t i;
+  ca_size_t val;
 
   ca_update_mask(kernel);
 
@@ -106,12 +108,12 @@ ca_di_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
 }
 
 static CArray *
-ca_di_kernel_move_to_addr (void *it, int32_t addr, CArray *ref)
+ca_di_kernel_move_to_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CADimIterator *dit = (CADimIterator *) it;
-  int32_t *dim = dit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = dit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=dit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -157,11 +159,11 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
 
   for (i=0; i<info->rank; i++) {
     if ( info->index_type[i] == CA_IDX_SCALAR ) {
-      rb_ary_store(rindex, i, INT2NUM(info->index[i].scalar));
+      rb_ary_store(rindex, i, SIZE2NUM(info->index[i].scalar));
       continue; /* escape from j++ */
     }
     else if ( info->index_type[i] == CA_IDX_SYMBOL ) {
-      rb_ary_store(rindex, i, rb_ary_new3(1,INT2NUM(0)));
+      rb_ary_store(rindex, i, rb_ary_new3(1, SIZE2NUM(0)));
       it->symflag[j]       = 1;
       it->symindex[rank] = j;
       rank++;
@@ -172,9 +174,9 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
     }
     else if ( info->index_type[i] == CA_IDX_BLOCK ) {
       rb_ary_store(rindex, i,
-                   rb_ary_new3(3, INT2NUM(0),
-                               INT2NUM(info->index[i].block.count),
-                               INT2NUM(1)));
+                   rb_ary_new3(3, SIZE2NUM(0),
+                               SIZE2NUM(info->index[i].block.count),
+                               SIZE2NUM(1)));
       it->symflag[j] = 0;
     }
     j++;

data/ca_iter_window.c

@@ -14,15 +14,15 @@
 
 typedef struct {
   int8_t  rank;
-  int32_t dim[CA_RANK_MAX];
+  ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
-  CArray * (*kernel_at_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_at_index)(void *, int32_t *, CArray *);
-  CArray * (*kernel_move_to_addr)(void *, int32_t, CArray *);
-  CArray * (*kernel_move_to_index)(void *, int32_t *, CArray *);
+  CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_at_index)(void *, ca_size_t *, CArray *);
+  CArray * (*kernel_move_to_addr)(void *, ca_size_t, CArray *);
+  CArray * (*kernel_move_to_index)(void *, ca_size_t *, CArray *);
   /* ----------- */
   CArray *kernel;
-  int32_t offset[CA_RANK_MAX];
+  ca_size_t offset[CA_RANK_MAX];
 } CAWindowIterator;
 
 VALUE rb_cCAWindowIterator;
@@ -38,15 +38,16 @@ extern int8_t CA_OBJ_WINDOW;
 
 CAWindow *
 ca_window_new (CArray *carray,
-             int32_t *start, int32_t *count, int8_t bounds, char *fill);
+             ca_size_t *start, ca_size_t *count, int8_t bounds, char *fill);
 
 
 static CArray *
-ca_vi_kernel_at_index (void *it, int32_t *idx, CArray *ref)
+ca_vi_kernel_at_index (void *it, ca_size_t *idx, CArray *ref)
 {
   CAWindowIterator *vit = (CAWindowIterator *) it;
   CAWindow *kernel;
-  int32_t i, j;
+  int8_t  i;
+  ca_size_t j;
 
   if ( ref == vit->reference ) {
     kernel = (CAWindow *)ca_clone(vit->kernel);
@@ -71,12 +72,12 @@ ca_vi_kernel_at_index (void *it, int32_t *idx, CArray *ref)
 }
 
 static CArray *
-ca_vi_kernel_at_addr (void *it, int32_t addr, CArray *ref)
+ca_vi_kernel_at_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CAWindowIterator *vit = (CAWindowIterator *) it;
-  int32_t *dim = vit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = vit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=vit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -85,13 +86,14 @@ ca_vi_kernel_at_addr (void *it, int32_t addr, CArray *ref)
 }
 
 static CArray *
-ca_vi_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
+ca_vi_kernel_move_to_index (void *it, ca_size_t *idx, CArray *kern)
 {
   CAWindowIterator *vit = (CAWindowIterator *) it;
   CAWindow *kernel = (CAWindow *) kern;
-  int32_t *dim    = vit->dim;
-  int32_t *offset = vit->offset;
-  int32_t i, j;
+  ca_size_t *dim    = vit->dim;
+  ca_size_t *offset = vit->offset;
+  int8_t  i;
+  ca_size_t j;
 
   ca_update_mask(kernel);
 
@@ -108,12 +110,12 @@ ca_vi_kernel_move_to_index (void *it, int32_t *idx, CArray *kern)
 }
 
 static CArray *
-ca_vi_kernel_move_to_addr (void *it, int32_t addr, CArray *ref)
+ca_vi_kernel_move_to_addr (void *it, ca_size_t addr, CArray *ref)
 {
   CAWindowIterator *vit = (CAWindowIterator *) it;
-  int32_t *dim = vit->dim;
-  int32_t idx[CA_RANK_MAX];
-  int32_t i;
+  ca_size_t *dim = vit->dim;
+  ca_size_t idx[CA_RANK_MAX];
+  int8_t i;
   for (i=vit->rank-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
@@ -126,7 +128,7 @@ ca_vi_setup (VALUE self, VALUE rref, VALUE rker)
 {
   CAWindowIterator *it;
   CArray *ref, *ker;
-  int32_t i;
+  int8_t i;
 
   rker = rb_obj_clone(rker);
 
@@ -139,7 +141,7 @@ ca_vi_setup (VALUE self, VALUE rref, VALUE rker)
   }
 
   it->rank      = ref->rank;
-  memcpy(it->dim, ref->dim, it->rank * sizeof(int32_t));
+  memcpy(it->dim, ref->dim, it->rank * sizeof(ca_size_t));
   it->reference = ref;
   it->kernel    = ker;
   it->kernel_at_addr  = ca_vi_kernel_at_addr;

data/ca_obj_array.c

@@ -15,8 +15,6 @@
 #include "rubysig.h"
 #endif
 
-
-
 /* ------------------------------------------------------------------- */
 
 VALUE rb_cCArray, rb_cCAWrap, rb_cCScalar, rb_cCAVirtual;
@@ -119,12 +117,13 @@ rb_ca_reset_gc_interval (VALUE self)
 
 static int
 carray_setup_i (CArray *ca,
-                int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+                int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                 CArray *mask, int allocate, int use_calloc)
 {
-  int32_t elements;
+  ca_size_t elements;
   double  length;
-  int32_t i;
+  int8_t i;
+  ca_size_t k;
 
   /* check arguments */
   CA_CHECK_DATA_TYPE(data_type);
@@ -157,8 +156,8 @@ carray_setup_i (CArray *ca,
   ca->rank      = rank;
   ca->bytes     = bytes;
   ca->elements  = elements;
-  ca->dim       = ALLOC_N(int32_t, rank);
-  memcpy(ca->dim, dim, rank*sizeof(int32_t));
+  ca->dim       = ALLOC_N(ca_size_t, rank);
+  memcpy(ca->dim, dim, rank*sizeof(ca_size_t));
 
   if ( allocate ) {                                      /* allocate == true */
 
@@ -178,9 +177,9 @@ carray_setup_i (CArray *ca,
 
     /* initialize elements with Qnil for CA_OBJECT data_type */
     if ( allocate && data_type == CA_OBJECT ) {
-      volatile VALUE zero = INT2FIX(0);
+      volatile VALUE zero = SIZE2NUM(0);
       VALUE *p = (VALUE *) ca->ptr;
-      for (i=0; i<elements; i++) {
+      for (k=0; k<elements; k++) {
         *p++ = zero;
       }
     }
@@ -202,21 +201,21 @@ carray_setup_i (CArray *ca,
 
 int
 carray_setup (CArray *ca,
-  int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes, CArray *mask)
+  int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *mask)
 {
   return carray_setup_i(ca, data_type, rank, dim, bytes, mask, 1, 0);
 }
 
 int
 carray_safe_setup (CArray *ca,
-  int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes, CArray *mask)
+  int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes, CArray *mask)
 {
   return carray_setup_i(ca, data_type, rank, dim, bytes, mask, 1, 1);
 }
 
 int
 ca_wrap_setup (CArray *ca,
-               int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+               int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                CArray *mask, char *ptr)
 {
   int ret;
@@ -231,7 +230,7 @@ ca_wrap_setup (CArray *ca,
 
 int
 ca_wrap_setup_null (CArray *ca,
-                    int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+                    int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                     CArray *mask)
 {
   int ret;
@@ -242,7 +241,7 @@ ca_wrap_setup_null (CArray *ca,
 }
 
 CArray *
-carray_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+carray_new (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
             CArray *mask)
 {
   CArray *ca  = ALLOC(CArray);
@@ -251,7 +250,7 @@ carray_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
 }
 
 CArray *
-carray_new_safe (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+carray_new_safe (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
             CArray *mask)
 {
   CArray *ca  = ALLOC(CArray);
@@ -260,7 +259,7 @@ carray_new_safe (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
 }
 
 CAWrap *
-ca_wrap_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+ca_wrap_new (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
             CArray *mask, char *ptr)
 {
   CAWrap *ca  = ALLOC(CAWrap);
@@ -269,7 +268,7 @@ ca_wrap_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
 }
 
 CAWrap *
-ca_wrap_new_null (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+ca_wrap_new_null (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                   CArray *mask)
 {
   CAWrap *ca  = ALLOC(CAWrap);
@@ -306,7 +305,7 @@ free_ca_wrap (void *ap)
 
 static int
 cscalar_setup (CScalar *ca,
-               int8_t data_type, int32_t bytes, CArray *mask)
+               int8_t data_type, ca_size_t bytes, CArray *mask)
 {
   CA_CHECK_DATA_TYPE(data_type);
   CA_CHECK_BYTES(data_type, bytes);
@@ -326,7 +325,7 @@ cscalar_setup (CScalar *ca,
   ca_mem_usage += (double)(ca->bytes);
 
   if ( data_type == CA_OBJECT ) {
-    *((VALUE*) ca->ptr) = INT2FIX(0);
+    *((VALUE*) ca->ptr) = SIZE2NUM(0);
   }
   else {
     MEMZERO(ca->ptr, char, ca->bytes);
@@ -346,7 +345,7 @@ cscalar_setup (CScalar *ca,
  */
 
 CScalar *
-cscalar_new (int8_t data_type, int32_t bytes, CArray *mask)
+cscalar_new (int8_t data_type, ca_size_t bytes, CArray *mask)
 {
   CScalar *ca = ALLOC(CScalar);
   cscalar_setup(ca, data_type, bytes, mask);
@@ -358,7 +357,7 @@ cscalar_new (int8_t data_type, int32_t bytes, CArray *mask)
  */
 
 CScalar *
-cscalar_new2 (int8_t data_type, int32_t bytes, char *val)
+cscalar_new2 (int8_t data_type, ca_size_t bytes, char *val)
 {
   CScalar *ca = ALLOC(CScalar);
   cscalar_setup(ca, data_type, bytes, NULL);
@@ -395,18 +394,19 @@ ca_array_func_clone (void *ap)
 }
 
 char *
-ca_array_func_ptr_at_addr (void *ap, int32_t addr)
+ca_array_func_ptr_at_addr (void *ap, ca_size_t addr)
 {
   CArray *ca = (CArray *) ap;
   return ca->ptr + ca->bytes * addr;
 }
 
 char *
-ca_array_func_ptr_at_index (void *ap, int32_t *idx)
+ca_array_func_ptr_at_index (void *ap, ca_size_t *idx)
 {
   CArray  *ca  = (CArray *) ap;
-  int32_t *dim = ca->dim;
-  int32_t  n, i;
+  ca_size_t *dim = ca->dim;
+  int8_t     i;
+  ca_size_t  n;
   n = idx[0];                  /* n = idx[0]*dim[1]*dim[2]*...*dim[rank-1] */
   for (i=1; i<ca->rank; i++) { /*    + idx[1]*dim[1]*dim[2]*...*dim[rank-1] */
     n = dim[i]*n+idx[i];       /*    ... + idx[rank-2]*dim[1] + idx[rank-1] */
@@ -415,18 +415,19 @@ ca_array_func_ptr_at_index (void *ap, int32_t *idx)
 }
 
 void
-ca_array_func_fetch_addr (void *ap, int32_t addr, void *ptr)
+ca_array_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
 {
   CArray  *ca  = (CArray *) ap;
   memcpy(ptr, ca->ptr + ca->bytes * addr, ca->bytes);
 }
 
 void
-ca_array_func_fetch_index (void *ap, int32_t *idx, void *ptr)
+ca_array_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
 {
   CArray  *ca  = (CArray *) ap;
-  int32_t *dim = ca->dim;
-  int32_t  n, i;
+  ca_size_t *dim = ca->dim;
+  int8_t     i;
+  ca_size_t  n;
   n = idx[0];
   for (i=1; i<ca->rank; i++) {
     n = dim[i]*n+idx[i];
@@ -435,18 +436,19 @@ ca_array_func_fetch_index (void *ap, int32_t *idx, void *ptr)
 }
 
 void
-ca_array_func_store_addr (void *ap, int32_t addr, void *ptr)
+ca_array_func_store_addr (void *ap, ca_size_t addr, void *ptr)
 {
   CArray  *ca  = (CArray *) ap;
   memcpy(ca->ptr + ca->bytes * addr, ptr, ca->bytes);
 }
 
 void
-ca_array_func_store_index (void *ap, int32_t *idx, void *ptr)
+ca_array_func_store_index (void *ap, ca_size_t *idx, void *ptr)
 {
   CArray  *ca  = (CArray *) ap;
-  int32_t *dim = ca->dim;
-  int32_t  n, i;
+  ca_size_t *dim = ca->dim;
+  int8_t     i;
+  ca_size_t  n;
   n = idx[0];
   for (i=1; i<ca->rank; i++) {
     n = dim[i]*n+idx[i];
@@ -495,8 +497,8 @@ ca_array_func_sync_data (void *ap, void *ptr)
 
 #define proc_fill_bang_fixlen()                 \
   {                                             \
-    int32_t i;                                  \
-    int32_t bytes = ca->bytes;                  \
+    ca_size_t i;                                  \
+    ca_size_t bytes = ca->bytes;                  \
     char *p = ca->ptr;                          \
     for (i=ca->elements; i; i--, p+=bytes) {    \
       memcpy(p, val, bytes);                    \
@@ -505,7 +507,7 @@ ca_array_func_sync_data (void *ap, void *ptr)
 
 #define proc_fill_bang(type)                    \
   {                                             \
-    int32_t i;                                  \
+    ca_size_t i;                                  \
     type *p = (type *)ca->ptr;                  \
     type  v = *(type *)val;                     \
     for (i=ca->elements; i; i--, p++) {         \
@@ -604,14 +606,14 @@ ca_scalar_func_clone (void *ap)
 }
 
 char *
-ca_scalar_func_ptr_at_addr (void *ap, int32_t addr)
+ca_scalar_func_ptr_at_addr (void *ap, ca_size_t addr)
 {
   CArray *ca = (CArray *) ap;
   return ca->ptr;
 }
 
 char *
-ca_scalar_func_ptr_at_index (void *ap, int32_t *idx)
+ca_scalar_func_ptr_at_index (void *ap, ca_size_t *idx)
 {
   CArray  *ca  = (CArray *) ap;
   return ca->ptr;
@@ -652,7 +654,7 @@ ca_operation_function_t ca_scalar_func = {
 /* ------------------------------------------------------------------- */
 
 VALUE
-rb_carray_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+rb_carray_new (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                CArray *mask)
 {
   CArray *ca = carray_new(data_type, rank, dim, bytes, mask);
@@ -660,7 +662,7 @@ rb_carray_new (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
 }
 
 VALUE
-rb_carray_new_safe (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
+rb_carray_new_safe (int8_t data_type, int8_t rank, ca_size_t *dim, ca_size_t bytes,
                     CArray *mask)
 {
   CArray *ca = carray_new_safe(data_type, rank, dim, bytes, mask);
@@ -668,14 +670,14 @@ rb_carray_new_safe (int8_t data_type, int8_t rank, int32_t *dim, int32_t bytes,
 }
 
 VALUE
-rb_cscalar_new (int8_t data_type, int32_t bytes, CArray *mask)
+rb_cscalar_new (int8_t data_type, ca_size_t bytes, CArray *mask)
 {
   CScalar *ca = cscalar_new(data_type, bytes, mask);
   return ca_wrap_struct(ca);
 }
 
 VALUE
-rb_cscalar_new_with_value (int8_t data_type, int32_t bytes, VALUE rval)
+rb_cscalar_new_with_value (int8_t data_type, ca_size_t bytes, VALUE rval)
 {
   volatile VALUE obj;
   obj = rb_cscalar_new(data_type, bytes, NULL);
@@ -719,11 +721,11 @@ rb_ca_initialize (int argc, VALUE *argv, VALUE self)
   volatile VALUE rtype, rdim, ropt, rbytes = Qnil;
   CArray *ca;
   int8_t data_type, rank;
-  int32_t dim[CA_RANK_MAX];
-  int32_t bytes;
-  int32_t i;
+  ca_size_t dim[CA_RANK_MAX];
+  ca_size_t bytes;
+  int8_t i;
 
-  rb_scan_args(argc, argv, "21", &rtype, &rdim, &ropt);
+  rb_scan_args(argc, argv, "21", (VALUE *)&rtype, (VALUE *) &rdim, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
@@ -732,7 +734,7 @@ rb_ca_initialize (int argc, VALUE *argv, VALUE self)
   Check_Type(rdim, T_ARRAY);
   rank = RARRAY_LEN(rdim);
   for (i=0; i<rank; i++) {
-    dim[i] = NUM2INT(rb_ary_entry(rdim, i));
+    dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
   }
 
   Data_Get_Struct(self, CArray, ca);
@@ -836,11 +838,11 @@ rb_ca_s_wrap (int argc, VALUE *argv, VALUE self)
   volatile VALUE obj, target, rtype, rdim, ropt, rbytes = Qnil;
   CArray *ca;
   int8_t data_type, rank;
-  int32_t dim[CA_RANK_MAX];
-  int32_t bytes;
-  int32_t i;
+  ca_size_t dim[CA_RANK_MAX];
+  ca_size_t bytes;
+  int8_t i;
 
-  rb_scan_args(argc, argv, "21", &rtype, &rdim, &ropt);
+  rb_scan_args(argc, argv, "21", (VALUE *) &rtype, (VALUE *) &rdim, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);
@@ -848,7 +850,7 @@ rb_ca_s_wrap (int argc, VALUE *argv, VALUE self)
   Check_Type(rdim, T_ARRAY);
   rank = RARRAY_LEN(rdim);
   for (i=0; i<rank; i++) {
-    dim[i] = NUM2INT(rb_ary_entry(rdim, i));
+    dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
   }
 
   target = rb_yield_values(0);
@@ -863,8 +865,8 @@ rb_ca_s_wrap (int argc, VALUE *argv, VALUE self)
 }
 
 VALUE
-rb_carray_wrap_ptr (int8_t data_type, int8_t rank, int32_t *dim,
-        int32_t bytes, CArray *mask, char *ptr, VALUE refer)
+rb_carray_wrap_ptr (int8_t data_type, int8_t rank, ca_size_t *dim,
+        ca_size_t bytes, CArray *mask, char *ptr, VALUE refer)
 {
   volatile VALUE obj;
   CArray *ca;
@@ -906,9 +908,9 @@ rb_cs_initialize (int argc, VALUE *argv, VALUE self)
   volatile VALUE rtype, ropt, rbytes = Qnil;
   CScalar *ca;
   int8_t data_type;
-  int32_t bytes;
+  ca_size_t bytes;
 
-  rb_scan_args(argc, argv, "11", &rtype, &ropt);
+  rb_scan_args(argc, argv, "11", (VALUE *) &rtype, (VALUE *) &ropt);
   rb_scan_options(ropt, "bytes", &rbytes);
 
   rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);