carray 1.3.7 → 1.5.4

data/{ca_obj_fake.c → ext/ca_obj_fake.c}

@@ -3,10 +3,8 @@
   ca_obj_fake.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -15,7 +13,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -31,7 +29,7 @@ static int8_t CA_OBJ_FAKE;
 
 static VALUE rb_cCAFake;
 
-/* rdoc: 
+/* yard: 
   class CAFake < CAVirtual # :nodoc:
   end
 */
@@ -41,7 +39,7 @@ static VALUE rb_cCAFake;
 int
 ca_fake_setup (CAFake *ca, CArray *parent, int8_t data_type, ca_size_t bytes)
 {
-  int8_t rank;
+  int8_t ndim;
   ca_size_t *dim, elements;
 
   /* check arguments */
@@ -49,25 +47,25 @@ ca_fake_setup (CAFake *ca, CArray *parent, int8_t data_type, ca_size_t bytes)
   CA_CHECK_DATA_TYPE(data_type);
   CA_CHECK_BYTES(data_type, bytes);
 
-  rank     = parent->rank;
+  ndim     = parent->ndim;
   dim      = parent->dim;
   elements = parent->elements;
 
   ca->obj_type  = CA_OBJ_FAKE;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
   ca->nosync    = 0;
 
-  memcpy(ca->dim, dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, dim, ndim * sizeof(ca_size_t));
 
   if ( ca_has_mask(parent) ) {
     ca_create_mask(ca);
@@ -288,7 +286,7 @@ ca_fake_func_create_mask (void *ap)
   }
   ca->mask =
     (CArray *) ca_refer_new(ca->parent->mask,
-                            CA_BOOLEAN, ca->rank, ca->dim, 0, 0);
+                            CA_BOOLEAN, ca->ndim, ca->dim, 0, 0);
 }
 
 ca_operation_function_t ca_fake_func = {
@@ -328,7 +326,7 @@ rb_ca_fake_new (VALUE cary, int8_t data_type, ca_size_t bytes)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def fake (data_type, options={:bytes=>0})
     end

data/{ca_obj_farray.c → ext/ca_obj_farray.c}

@@ -3,10 +3,8 @@
   ca_obj_farray.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -15,7 +13,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -33,7 +31,7 @@ static int8_t CA_OBJ_FARRAY;
 
 static VALUE rb_cCAFarray;
 
-/* rdoc:
+/* yard:
   class CAFArray < CAVirtual # :nodoc:
   end
 */
@@ -43,14 +41,14 @@ static VALUE rb_cCAFarray;
 int
 ca_farray_setup (CAFarray *ca, CArray *parent)
 {
-  int8_t rank, data_type;
+  int8_t ndim, data_type;
   ca_size_t *dim, elements, bytes;
   int i;
 
   /* check arguments */
 
   data_type = parent->data_type;
-  rank      = parent->rank;
+  ndim      = parent->ndim;
   dim       = parent->dim;
   bytes     = parent->bytes;
   elements  = parent->elements;
@@ -58,23 +56,23 @@ ca_farray_setup (CAFarray *ca, CArray *parent)
   ca->obj_type  = CA_OBJ_FARRAY;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
   ca->nosync    = 0;
 
-  for (i=0; i<rank; i++) {
-    ca->dim[i] = dim[rank-1-i];
+  for (i=0; i<ndim; i++) {
+    ca->dim[i] = dim[ndim-1-i];
   }
 
   ca->step = 1;
-  for (i=1; i<rank; i++) {
+  for (i=1; i<ndim; i++) {
     ca->step *= dim[i];
   }
 
@@ -124,11 +122,11 @@ static void
 ca_farray_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
 {
   CAFarray *ca = (CAFarray *) ap;
-  int8_t  rank = ca->rank;
+  int8_t  ndim = ca->ndim;
   ca_size_t idx0[CA_RANK_MAX];
   int i;
-  for (i=0; i<rank; i++) {
-    idx0[i] = idx[rank-1-i];
+  for (i=0; i<ndim; i++) {
+    idx0[i] = idx[ndim-1-i];
   }
   ca_fetch_index(ca->parent, idx0, ptr);
 }
@@ -137,11 +135,11 @@ static void
 ca_farray_func_store_index (void *ap, ca_size_t *idx, void *ptr)
 {
   CAFarray *ca = (CAFarray *) ap;
-  int8_t  rank = ca->rank;
+  int8_t  ndim = ca->ndim;
   ca_size_t idx0[CA_RANK_MAX];
   int i;
-  for (i=0; i<rank; i++) {
-    idx0[i] = idx[rank-1-i];
+  for (i=0; i<ndim; i++) {
+    idx0[i] = idx[ndim-1-i];
   }
   ca_store_index(ca->parent, idx0, ptr);
 }
@@ -258,7 +256,7 @@ ca_fa_attach_loop (CAFarray *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0)
   ca_size_t step = ca->step;
   ca_size_t dim = ca->dim[level];
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = 0;
     idx0[0]    = 0;
     switch ( ca->bytes ) {
@@ -315,7 +313,7 @@ ca_fa_attach_loop (CAFarray *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0)
     }
   }
   else {
-    int level0 = ca->rank - 1 - level;
+    int level0 = ca->ndim - 1 - level;
     for (i=0; i<dim; i++) {
       idx[level]  = i;
       idx0[level0] = i;
@@ -339,7 +337,7 @@ ca_fa_sync_loop (CAFarray *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0)
   ca_size_t dim  = ca->dim[level];
   ca_size_t i;
 
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = 0;
     idx0[0] = 0;
     switch ( ca->bytes ) {
@@ -398,7 +396,7 @@ ca_fa_sync_loop (CAFarray *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0)
   else {
     for (i=0; i<dim; i++) {
       idx[level]  = i;
-      idx0[ca->rank - 1 - level] = i;
+      idx0[ca->ndim - 1 - level] = i;
       ca_fa_sync_loop(ca, level+1, idx, idx0);
     }
   }
@@ -429,7 +427,7 @@ rb_ca_farray_new (VALUE cary)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     # create the virtual transposed array which dimension order is reversed.
     def t

data/{ca_obj_field.c → ext/ca_obj_field.c}

@@ -3,10 +3,8 @@
   ca_obj_field.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -15,7 +13,7 @@
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -33,7 +31,7 @@ static int8_t CA_OBJ_FIELD;
 
 static VALUE rb_cCAField;
 
-/* rdoc:
+/* yard:
   class CAField < CAVirtual # :nodoc:
   end
 */
@@ -44,7 +42,7 @@ int
 ca_field_setup (CAField *ca, CArray *parent,
                 ca_size_t offset, int8_t data_type, ca_size_t bytes)
 {
-  int8_t rank;
+  int8_t ndim;
   ca_size_t elements;
 
   /* check arguments */
@@ -64,25 +62,25 @@ ca_field_setup (CAField *ca, CArray *parent,
     rb_raise(rb_eRuntimeError, "offset or bytes out of range");
   }
 
-  rank     = parent->rank;
+  ndim     = parent->ndim;
   elements = parent->elements;
 
   ca->obj_type  = CA_OBJ_FIELD;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->rank      = rank;
+  ca->ndim      = ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, rank);
+  ca->dim       = ALLOC_N(ca_size_t, ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
   ca->nosync    = 0;
   ca->offset    = offset;
 
-  memcpy(ca->dim, parent->dim, rank * sizeof(ca_size_t));
+  memcpy(ca->dim, parent->dim, ndim * sizeof(ca_size_t));
 
   if ( ca_has_mask(parent) ) {
     ca_create_mask(ca);
@@ -149,13 +147,13 @@ ca_field_func_ptr_at_index (void *ap, ca_size_t *idx)
     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] */
+    n = idx[0];                  /* n = idx[0]*dim[1]*dim[2]*...*dim[ndim-1] */
+    for (i=1; i<ca->ndim; i++) { /*    + idx[1]*dim[1]*dim[2]*...*dim[ndim-1] */
+      n = dim[i]*n+idx[i];       /*    ... + idx[ndim-2]*dim[1] + idx[ndim-1] */
     }
 
     if ( ca->parent->ptr == NULL ) {
-      return ca_ptr_at_addr(ca->parent, n) + ca->offset;
+      return (void *)((char *) ca_ptr_at_addr(ca->parent, n) + ca->offset);
     }
     else {
       return ca->parent->ptr + ca->parent->bytes * n + ca->offset;
@@ -285,7 +283,7 @@ ca_field_func_create_mask (void *ap)
   }
   ca->mask =
     (CArray *) ca_refer_new(ca->parent->mask,
-                            CA_BOOLEAN, ca->rank, ca->dim, 0, 0);
+                            CA_BOOLEAN, ca->ndim, ca->dim, 0, 0);
 }
 
 ca_operation_function_t ca_field_func = {
@@ -324,7 +322,7 @@ ca_field_attach (CAField *ca)
   case CA_UINT8:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *q;
         p += 1; q += pbytes;
@@ -335,7 +333,7 @@ ca_field_attach (CAField *ca)
   case CA_UINT16:
     {
       int16_t *p = (int16_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(int16_t*) q;
         p += 1; q += pbytes;
@@ -347,7 +345,7 @@ ca_field_attach (CAField *ca)
   case CA_FLOAT32:
     {
       int32_t *p = (int32_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(int32_t*) q;
         p += 1; q += pbytes;
@@ -359,7 +357,7 @@ ca_field_attach (CAField *ca)
   case CA_FLOAT64:
     {
       float64_t *p = (float64_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *p = *(float64_t*) q;
         p += 1; q += pbytes;
@@ -369,7 +367,7 @@ ca_field_attach (CAField *ca)
   default:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         memcpy(p, q, ca->bytes);
         p += bytes; q += pbytes;
@@ -391,7 +389,7 @@ ca_field_sync (CAField *ca)
   case CA_UINT8:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *q = *p;
         p += 1; q += pbytes;
@@ -402,7 +400,7 @@ ca_field_sync (CAField *ca)
   case CA_UINT16:
     {
       int16_t *p = (int16_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(int16_t*) q = *p;
         p += 1; q += pbytes;
@@ -414,7 +412,7 @@ ca_field_sync (CAField *ca)
   case CA_FLOAT32:
     {
       int32_t *p = (int32_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(int32_t*) q = *p;
         p += 1; q += pbytes;
@@ -426,7 +424,7 @@ ca_field_sync (CAField *ca)
   case CA_FLOAT64:
     {
       float64_t *p = (float64_t*) ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         *(float64_t*) q = *p;
         p += 1; q += pbytes;
@@ -436,7 +434,7 @@ ca_field_sync (CAField *ca)
   default:
     {
       char *p = ca_ptr_at_addr(ca, 0);
-      char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+      char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
       while ( n-- ) {
         memcpy(q, p, ca->bytes);
         p += bytes; q += pbytes;
@@ -450,7 +448,7 @@ ca_field_fill (CAField *ca, char *ptr)
 {
   ca_size_t pbytes = ca->parent->bytes;
   ca_size_t n = ca->elements;
-  char *q = ca_ptr_at_addr(ca->parent, 0) + ca->offset;
+  char *q = (char *) ca_ptr_at_addr(ca->parent, 0) + ca->offset;
 
   switch ( ca->data_type ) {
   case CA_BOOLEAN:
@@ -545,7 +543,7 @@ rb_ca_field_initialize_copy (VALUE self, VALUE other)
 
 /* ----------------------------------------------------------------------- */
 
-/* rdoc:
+/* yard:
   class CArray
     # call-seq:
     #    CArray#field(offset, data_type[, :bytes=>bytes]) 
@@ -583,21 +581,21 @@ rb_ca_field (int argc, VALUE *argv, VALUE self)
   if ( rb_obj_is_carray(rtype) ) {
     CArray *ct;
     ca_size_t dim[CA_RANK_MAX];
-    int8_t rank;
+    int8_t ndim;
     int8_t i, j;
     Data_Get_Struct(rtype, CArray, ct);
     data_type = CA_FIXLEN;
     bytes     = ct->bytes * ct->elements;
     obj = rb_ca_field_new(self, offset, data_type, bytes);
     rb_ca_data_type_inherit(obj, rtype);
-    rank = ca->rank + ct->rank;
-    for (i=0; i<ca->rank; i++) {
+    ndim = ca->ndim + ct->ndim;
+    for (i=0; i<ca->ndim; i++) {
       dim[i] = ca->dim[i];
     }
-    for (j=0; j<ct->rank; j++, i++) {
+    for (j=0; j<ct->ndim; j++, i++) {
       dim[i] = ct->dim[j];
     }
-    obj = rb_ca_refer_new(obj, ct->data_type, rank, dim, ct->bytes, 0);
+    obj = rb_ca_refer_new(obj, ct->data_type, ndim, dim, ct->bytes, 0);
   }
   else {
     rb_ca_guess_type_and_bytes(rtype, rbytes, &data_type, &bytes);