carray 1.4.0 → 1.5.1

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

@@ -51,20 +51,20 @@ rb_ca_data_type (VALUE self)
 /* rdoc
   class CArray
 		# use CArray#ndims instead of this methods after carray-1.3.0
-    def rank
+    def ndim
     end
-    # returns the rank (e.g. 1 for 1D array, 3 for 3D array, ...).
+    # returns the ndim (e.g. 1 for 1D array, 3 for 3D array, ...).
     def ndims
     end
   end
 */
 
 VALUE
-rb_ca_rank (VALUE self)
+rb_ca_ndim (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return INT2NUM(ca->rank);
+  return INT2NUM(ca->ndim);
 }
 
 /* rdoc
@@ -147,8 +147,8 @@ rb_ca_dim (VALUE self)
   CArray *ca;
   int i;
   Data_Get_Struct(self, CArray, ca);
-  dim = rb_ary_new2(ca->rank);
-  for (i=0; i<ca->rank; i++) {
+  dim = rb_ary_new2(ca->ndim);
+  for (i=0; i<ca->ndim; i++) {
     rb_ary_store(dim, i, SIZE2NUM(ca->dim[i]));
   }
   return dim;
@@ -167,7 +167,7 @@ rb_ca_dim1 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 2 ) ? SIZE2NUM(ca->dim[1]) : Qnil;
+  return ( ca->ndim >= 2 ) ? SIZE2NUM(ca->dim[1]) : Qnil;
 }
 
 VALUE
@@ -175,7 +175,7 @@ rb_ca_dim2 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 3 ) ? SIZE2NUM(ca->dim[2]) : Qnil;
+  return ( ca->ndim >= 3 ) ? SIZE2NUM(ca->dim[2]) : Qnil;
 }
 
 VALUE
@@ -183,7 +183,7 @@ rb_ca_dim3 (VALUE self)
 {
   CArray *ca;
   Data_Get_Struct(self, CArray, ca);
-  return ( ca->rank >= 4 ) ? SIZE2NUM(ca->dim[3]) : Qnil;
+  return ( ca->ndim >= 4 ) ? SIZE2NUM(ca->dim[3]) : Qnil;
 }
 
 /* rdoc:
@@ -868,9 +868,9 @@ Init_carray_attribute ()
   rb_define_method(rb_cCArray, "obj_type", rb_ca_obj_type, 0);
   rb_define_method(rb_cCArray, "data_type", rb_ca_data_type, 0);
   rb_define_method(rb_cCArray, "bytes", rb_ca_bytes, 0);
-  rb_define_method(rb_cCArray, "rank", rb_ca_rank, 0); 
-  rb_define_method(rb_cCArray, "ndim", rb_ca_rank, 0); /* after carray-1.3.0 */
-  rb_define_method(rb_cCArray, "shape", rb_ca_dim, 0); /* after carray-1.3.0 */
+  rb_define_method(rb_cCArray, "ndim", rb_ca_ndim, 0); 
+  rb_define_method(rb_cCArray, "rank", rb_ca_ndim, 0); /* after carray-1.5.0 */
+  rb_define_method(rb_cCArray, "shape", rb_ca_dim, 0); /* after carray-1.5.0 */
   rb_define_method(rb_cCArray, "dim", rb_ca_dim, 0);
   rb_define_method(rb_cCArray, "dim0", rb_ca_dim0, 0);
   rb_define_method(rb_cCArray, "dim1", rb_ca_dim1, 0);

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

@@ -240,7 +240,7 @@ rb_ca_data_class_to_object (VALUE self)
     obj = rb_cscalar_new(CA_OBJECT, 0, ca->mask);
   }
   else {
-    obj = rb_carray_new(CA_OBJECT, ca->rank, ca->dim, 0, ca->mask);
+    obj = rb_carray_new(CA_OBJECT, ca->ndim, ca->dim, 0, ca->mask);
   }
 
   for (i=0; i<ca->elements; i++) {
@@ -264,7 +264,7 @@ rb_ca_object_to_data_class (VALUE self, VALUE rtype, ca_size_t bytes)
     obj = rb_cscalar_new(CA_FIXLEN, bytes, ca->mask);
   }
   else {
-    obj = rb_carray_new(CA_FIXLEN, ca->rank, ca->dim, bytes, ca->mask);
+    obj = rb_carray_new(CA_FIXLEN, ca->ndim, ca->dim, bytes, ca->mask);
   }
   rb_ca_data_type_import(obj, rtype);
 
@@ -312,7 +312,7 @@ rb_ca_to_type_internal (int argc, VALUE *argv, VALUE self)
     obj = rb_cscalar_new(data_type, bytes, ca->mask);
   }
   else {
-    obj = rb_carray_new(data_type, ca->rank, ca->dim, bytes, ca->mask);
+    obj = rb_carray_new(data_type, ca->ndim, ca->dim, bytes, ca->mask);
   }
 
   rb_ca_data_type_import(obj, rtype);
@@ -1065,7 +1065,7 @@ rb_ca_cast_other (VALUE *self, volatile VALUE *other)
 */
 
 VALUE
-rb_ca_s_cast_other (VALUE klass, VALUE self, VALUE other)
+rb_ca_cast_with (VALUE self, VALUE other)
 {
   if ( rb_obj_is_carray(self) ) {
     rb_ca_cast_self_or_other(&self, &other);
@@ -1145,7 +1145,7 @@ Init_carray_cast ()
                              "cast", rb_ca_s_cast, 1);
   rb_define_singleton_method(rb_cCArray,
            "cast_self_or_other", rb_ca_s_cast_self_or_other, 2);
-  rb_define_singleton_method(rb_cCArray,
-           "cast_other", rb_ca_s_cast_other, 2);
+
+  rb_define_method(rb_cCArray, "cast_with", rb_ca_cast_with, 1);
 }
 

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

@@ -27,7 +27,7 @@ rb_ca_to_a_loop (VALUE self, int32_t level, ca_size_t *idx, VALUE ary)
 
   Data_Get_Struct(self, CArray, ca);
 
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
       rb_ary_store(ary, i, rb_ca_fetch_index(self, idx));
@@ -46,7 +46,7 @@ rb_ca_to_a_loop (VALUE self, int32_t level, ca_size_t *idx, VALUE ary)
 /* rdoc:
   class CArray
     # Converts the array to Ruby's array. For higher dimension, 
-    # the array is nested rank-1 times.
+    # the array is nested ndim-1 times.
     def to_a
     end
   end
@@ -149,7 +149,6 @@ rb_ca_dump_binary (int argc, VALUE *argv, VALUE self)
   case T_FILE: {
     volatile VALUE str;
     rb_io_t *iop;
-    rb_secure(4);
     GetOpenFile(io, iop);
     rb_io_check_writable(iop);
     ca_attach(ca);
@@ -162,7 +161,6 @@ rb_ca_dump_binary (int argc, VALUE *argv, VALUE self)
   case T_FILE: {
     OpenFile *iop;
     size_t total;
-    rb_secure(4);
     GetOpenFile(io, iop);
     rb_io_check_writable(iop);
     ca_attach(ca);
@@ -280,14 +278,14 @@ ca_to_cptr (void *ap)
     rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for detached array");
   }
   
-  if ( ca->rank == 1 ) {
-    rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for rank-1 array");
+  if ( ca->ndim == 1 ) {
+    rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for ndim-1 array");
   }
 
   offset[0] = 0;  
   count[0]  = ca->dim[0];
   ptr_num   = count[0];
-  for (i=1; i<ca->rank-1; i++) {
+  for (i=1; i<ca->ndim-1; i++) {
     offset[i] = ptr_num;
     count[i]  = count[i-1] * ca->dim[i];
     ptr_num  += count[i];
@@ -295,15 +293,15 @@ ca_to_cptr (void *ap)
 
   ptr = malloc(sizeof(void*)*ptr_num);
 
-  i = ca->rank-2;
+  i = ca->ndim-2;
   p = ptr + offset[i];
   q = (char *)ca->ptr;
   for (j=0; j<count[i]; j++) {
     *p = (void*)q;
-    p++; q += ca->dim[ca->rank-1] * ca->bytes;
+    p++; q += ca->dim[ca->ndim-1] * ca->bytes;
   }
 
-  for (i=ca->rank-3; i>=0; i--) {
+  for (i=ca->ndim-3; i>=0; i--) {
     p = ptr + offset[i];
     r = ptr + offset[i+1];
     for (j=0; j<count[i]; j++) {

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

@@ -25,7 +25,7 @@ ca_copy (void *ap)
     co = (CArray *) cscalar_new(ca->data_type, ca->bytes, 0);
   }
   else {                                /* create array without mask */
-    co = carray_new(ca->data_type, ca->rank, ca->dim, ca->bytes, 0);
+    co = carray_new(ca->data_type, ca->ndim, ca->dim, ca->bytes, 0);
   }
 
   if ( ca_is_attached(ca) ) {
@@ -72,7 +72,7 @@ ca_template (void *ap)
     return (CArray*) cscalar_new(ca->data_type, ca->bytes, NULL);
   }
   else {                       /* create array without mask */
-    return carray_new(ca->data_type, ca->rank, ca->dim, ca->bytes, NULL);
+    return carray_new(ca->data_type, ca->ndim, ca->dim, ca->bytes, NULL);
   }
 }
 
@@ -84,7 +84,7 @@ ca_template_safe (void *ap)
     return (CArray*) cscalar_new(ca->data_type, ca->bytes, NULL);
   }
   else {                       /* create array filled with 0, without mask */
-    return carray_new_safe(ca->data_type, ca->rank, ca->dim, ca->bytes, NULL);
+    return carray_new_safe(ca->data_type, ca->ndim, ca->dim, ca->bytes, NULL);
   }
 }
 
@@ -97,7 +97,7 @@ ca_template_safe2 (void *ap, int8_t data_type, ca_size_t bytes)
     return (CArray*) cscalar_new(data_type, bytes, NULL);
   }
   else {                   /* create array filled with 0, without mask */
-    return carray_new_safe(data_type, ca->rank, ca->dim, bytes, NULL);
+    return carray_new_safe(data_type, ca->ndim, ca->dim, bytes, NULL);
   }
 }
 
@@ -209,7 +209,7 @@ ca_paste_loop (CArray *ca, ca_size_t *offset, ca_size_t *offset0,
                int32_t level, ca_size_t *idx, ca_size_t *idx0)
 {
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = offset[level];
     idx0[level] = offset0[level];
     memcpy(ca_ptr_at_index(ca, idx), ca_ptr_at_index(cs, idx0), size[level]*ca->bytes);
@@ -240,9 +240,9 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
   int8_t i;
 
   ca_check_same_data_type(ca, cs);
-  ca_check_same_rank(ca, cs);
+  ca_check_same_ndim(ca, cs);
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( offset[i] >= 0 ) {
       if ( ca->dim[i] <= cs->dim[i] + offset[i] ) {
         size[i] = ca->dim[i] - offset[i];
@@ -264,7 +264,7 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
     }
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     CA_CHECK_INDEX(offset[i], ca->dim[i]);
   }
 
@@ -287,7 +287,7 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
 /* rdoc:
   class CArray
     # pastes `ary` to `self` at the index `idx`.
-    # `idx` should be Array object with the length same as `self.rank`.
+    # `idx` should be Array object with the length same as `self.ndim`.
     # `ary` should have same shape with `self`.
     def paste (idx, ary)
     end
@@ -307,12 +307,12 @@ rb_ca_paste (VALUE self, VALUE roffset, VALUE rsrc)
 
   Check_Type(roffset, T_ARRAY);
 
-  if ( RARRAY_LEN(roffset) != ca->rank ) {
+  if ( RARRAY_LEN(roffset) != ca->ndim ) {
     rb_raise(rb_eArgError,
-             "# of arguments should equal to the rank");
+             "# of arguments should equal to the ndim");
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     offset[i] = NUM2SIZE(rb_ary_entry(roffset,i));
   }
 
@@ -330,7 +330,7 @@ ca_clip_loop (CArray *ca, ca_size_t *offset, ca_size_t *offset0,
                int32_t level, ca_size_t *idx, ca_size_t *idx0)
 {
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = offset[level];
     idx0[level] = offset0[level];
     memcpy(ca_ptr_at_index(cs, idx0), ca_ptr_at_index(ca, idx), size[level]*ca->bytes);
@@ -358,9 +358,9 @@ ca_clip (void *ap, ca_size_t *offset, void *sp)
   int i;
 
   ca_check_same_data_type(ca, cs);
-  ca_check_same_rank(ca, cs);
+  ca_check_same_ndim(ca, cs);
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( offset[i] >= 0 ) {
       if ( ca->dim[i] <= cs->dim[i] + offset[i] ) {
         size[i] = ca->dim[i] - offset[i];
@@ -382,7 +382,7 @@ ca_clip (void *ap, ca_size_t *offset, void *sp)
     }
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     CA_CHECK_INDEX(offset[i], ca->dim[i]);
   }
 
@@ -421,12 +421,12 @@ rb_ca_clip (VALUE self, VALUE roffset, VALUE rsrc)
 
   Check_Type(roffset, T_ARRAY);
 
-  if ( RARRAY_LEN(roffset) != ca->rank ) {
+  if ( RARRAY_LEN(roffset) != ca->ndim ) {
     rb_raise(rb_eArgError,
-             "# of arguments should equal to the rank");
+             "# of arguments should equal to the ndim");
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     offset[i] = NUM2SIZE(rb_ary_entry(roffset, i));
   }
 

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

@@ -382,7 +382,7 @@ ca_addr2index (void *ap, ca_size_t addr, ca_size_t *idx)
   CArray *ca = (CArray *) ap;
   ca_size_t *dim = ca->dim;
   int8_t i;
-  for (i=ca->rank-1; i>=0; i--) {
+  for (i=ca->ndim-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
   }
@@ -398,7 +398,7 @@ ca_index2addr (void *ap, ca_size_t *idx)
   int8_t   i;
   ca_size_t  n;
   n = idx[0];
-  for (i=1; i<ca->rank; i++) {
+  for (i=1; i<ca->ndim; i++) {
     n = dim[i]*n+idx[i];
   }
   return n;

data/ext/carray_data_type.c

@@ -0,0 +1,66 @@
+#include "carray.h"
+
+VALUE rb_cCArrayBoolean;
+VALUE rb_cCArrayUInt8;
+VALUE rb_cCArrayUInt16;
+VALUE rb_cCArrayUInt32;
+VALUE rb_cCArrayUInt64;
+VALUE rb_cCArrayInt8;
+VALUE rb_cCArrayInt16;
+VALUE rb_cCArrayInt32;
+VALUE rb_cCArrayInt64;
+VALUE rb_cCArrayFloat32;
+VALUE rb_cCArrayFloat64;
+VALUE rb_cCArrayFloat128;
+VALUE rb_cCArrayCmplx64;
+VALUE rb_cCArrayCmplx128;
+VALUE rb_cCArrayCmplx256;
+VALUE rb_cCArrayObject;
+VALUE rb_cCArrayFixlen;
+
+VALUE
+ca_data_type_class (int8_t data_type)
+{
+  switch ( data_type ) {
+  case CA_BOOLEAN:  return rb_cCArrayBoolean; break;
+  case CA_INT8:     return rb_cCArrayInt8;  break;
+  case CA_UINT8:    return rb_cCArrayUInt8; break;
+  case CA_INT16:    return rb_cCArrayInt16;  break;
+  case CA_UINT16:   return rb_cCArrayUInt16; break;
+  case CA_INT32:    return rb_cCArrayInt32;  break;
+  case CA_UINT32:   return rb_cCArrayUInt32; break;
+  case CA_INT64:    return rb_cCArrayInt64;  break;
+  case CA_UINT64:   return rb_cCArrayUInt64; break;
+  case CA_FLOAT32:  return rb_cCArrayFloat32;  break;
+  case CA_FLOAT64:  return rb_cCArrayFloat64;  break;
+  case CA_FLOAT128: return rb_cCArrayFloat128;  break;
+  case CA_CMPLX64:  return rb_cCArrayCmplx64;  break;
+  case CA_CMPLX128: return rb_cCArrayCmplx128;  break;
+  case CA_CMPLX256: return rb_cCArrayCmplx256;  break;
+  case CA_OBJECT:   return rb_cCArrayObject;  break;
+  default: rb_raise(rb_eRuntimeError, "invalid data type");
+  }
+
+}
+
+void
+Init_carray_data_type ()
+{
+  rb_cCArrayBoolean  = rb_define_class_under(rb_cCArray, "Boolean", rb_cObject);
+  rb_cCArrayUInt8  = rb_define_class_under(rb_cCArray, "UInt8", rb_cObject);
+  rb_cCArrayUInt16 = rb_define_class_under(rb_cCArray, "UInt16", rb_cObject);
+  rb_cCArrayUInt32 = rb_define_class_under(rb_cCArray, "UInt32", rb_cObject);
+  rb_cCArrayUInt64 = rb_define_class_under(rb_cCArray, "UInt64", rb_cObject);
+  rb_cCArrayInt8  = rb_define_class_under(rb_cCArray, "Int8", rb_cObject);
+  rb_cCArrayInt16 = rb_define_class_under(rb_cCArray, "Int16", rb_cObject);
+  rb_cCArrayInt32 = rb_define_class_under(rb_cCArray, "Int32", rb_cObject);
+  rb_cCArrayInt64 = rb_define_class_under(rb_cCArray, "Int64", rb_cObject);
+  rb_cCArrayFloat32 = rb_define_class_under(rb_cCArray, "Float32", rb_cObject);
+  rb_cCArrayFloat64 = rb_define_class_under(rb_cCArray, "Float64", rb_cObject);
+  rb_cCArrayFloat128 = rb_define_class_under(rb_cCArray, "Float128", rb_cObject);
+  rb_cCArrayCmplx64 = rb_define_class_under(rb_cCArray, "Cmplx64", rb_cObject);
+  rb_cCArrayCmplx128 = rb_define_class_under(rb_cCArray, "Cmplx128", rb_cObject);
+  rb_cCArrayCmplx256 = rb_define_class_under(rb_cCArray, "Cmplx256", rb_cObject);
+  rb_cCArrayObject = rb_define_class_under(rb_cCArray, "Object", rb_cObject);
+  rb_cCArrayFixlen = rb_define_class_under(rb_cCArray, "Fixlen", rb_cObject);
+}

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

@@ -48,7 +48,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
   }
 
   if ( TYPE(ridx1) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
@@ -71,7 +71,7 @@ rb_ca_elem_swap (VALUE self, VALUE ridx1, VALUE ridx2)
   }
 
   if ( TYPE(ridx2) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx2, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx2[i] = k;
@@ -159,7 +159,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
   }
 
   if ( TYPE(ridx1) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
@@ -180,7 +180,7 @@ rb_ca_elem_copy (VALUE self, VALUE ridx1, VALUE ridx2)
   }
 
   if ( TYPE(ridx2) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx2, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx2[i] = k;
@@ -228,7 +228,7 @@ rb_ca_elem_store (VALUE self, VALUE ridx, VALUE obj)
   Data_Get_Struct(self, CArray, ca);
 
   if ( TYPE(ridx) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx[i] = k;
@@ -264,7 +264,7 @@ rb_ca_elem_fetch (VALUE self, VALUE ridx)
   Data_Get_Struct(self, CArray, ca);
 
   if ( TYPE(ridx) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx[i] = k;
@@ -314,7 +314,7 @@ rb_ca_elem_incr (VALUE self, VALUE ridx1)
   has_mask = ( ca->mask ) ? 1 : 0;
 
   if ( TYPE(ridx1) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
@@ -401,7 +401,7 @@ rb_ca_elem_decr (VALUE self, VALUE ridx1)
   has_mask = ( ca->mask ) ? 1 : 0;
 
   if ( TYPE(ridx1) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;
@@ -475,7 +475,7 @@ rb_ca_elem_test_masked (VALUE self, VALUE ridx1)
   ca_update_mask(ca);
 
   if ( TYPE(ridx1) == T_ARRAY ) {
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       k = NUM2SIZE(rb_ary_entry(ridx1, i));
       CA_CHECK_INDEX(k, ca->dim[i]);
       idx1[i] = k;