carray 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536e992ddb82a26f4e24f300892a303306bff88fcd1596b872f418a17879f84c
-  data.tar.gz: e41b0740aaf2319feea6c795a93b1e36c0f4138257429a224e33602c21175b99
+  metadata.gz: 172f193a4ae5241f1b91116374bb05bfa9c5ab184d8a72e7f3a1a564541eff1d
+  data.tar.gz: c6a650327904d42d22a56b148f6e381a1940a1d6d91099509e53080b857572c9
 SHA512:
-  metadata.gz: 2ec6a48b80522cd0e583ee0c7feeda490dab810c3c1a8670fd106c654b50c8af3595aaef9dc848082b8d0bd79ee250d7f39d363b123024e93894c385ed93cfd8
-  data.tar.gz: 59e38a1e1d8dc1030b1de81840c7c215df768f1ad15cdaa19e54015ffc6344fc6f2ac381d70509a2f74ba4f1d5dc9588b4b47340ca9e98b8cbb4456c51ce742e
+  metadata.gz: bf6e6cd9c71441d16f6342ff7cdef459a5fb9d229083650241035000ba2dfa0e313e0fab2fd47b0b401b7a4f82e92564d6aad97f975f6100063e17b8f7567dbb
+  data.tar.gz: 8fca46a6402dd6ad29841429551dafa128bf1146218eb527236aff2f5d8c29cb127b180c1b2c766b39dd8b26c69641d916d7570823a5e4fd590052c9f9bee411

data/NEWS.md

@@ -1,6 +1,12 @@
 ChangeLog of Ruby/CArray
 ========================
 
+1.5.8 -> 1.5.9
+--------------
+
+* [New] Add new method 'CArray#vectorized_find_linear_addr'
+* [Fix] Fixed invalid return value type in CArray##stddev 
+
 1.5.7 -> 1.5.8
 --------------
 
@@ -14,7 +20,7 @@ ChangeLog of Ruby/CArray
 --------------
 
 * [Mod] Modify the methods 'CArray#first' and 'CArray#last' to return nil when the number of elements is zero
-* [Fix] Added check of having ArithmeticSeuqence in ruby_carray.c
+* [Fix] Add check of having ArithmeticSeuqence in ruby_carray.c
 
 1.5.5 -> 1.5.6
 --------------

data/carray.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification::new do |s|
 
-  version = "1.5.8"
+  version = "1.5.9"
 
   files = Dir.glob("**/*") + [".yardopts"] -
                              [ 

data/ext/carray_order.c

@@ -1238,6 +1238,108 @@ rb_ca_fetch_linear_addr (volatile VALUE self, volatile VALUE vx)
 */
 
 
+static VALUE
+rb_ca_find_linear_addr_vectorized (volatile VALUE self, volatile VALUE vx)
+{
+  volatile VALUE out, out0;
+  CArray *ca, *sc, *cx, *co0, *co;
+  double *x;
+  double *px;
+  double *po;
+  ca_size_t nseri, nlist, nreq, xnseri;
+  ca_size_t i, k;
+  boolean8_t *mx, *mo;
+
+  Data_Get_Struct(self, CArray, ca);
+
+  if ( rb_ca_is_any_masked(self) ) {
+    rb_raise(rb_eRuntimeError, "self should not have any masked elements");
+  }
+
+  sc = ca_wrap_readonly(self, CA_FLOAT64);
+  cx = ca_wrap_readonly(vx, CA_FLOAT64);
+
+  if ( sc->ndim < 2 ) {
+    rb_raise(rb_eRuntimeError, "ndim of self should be larger than 2");
+  }
+
+  nseri = 1;
+  for (i=0; i<sc->ndim-1; i++) {
+		nseri *= sc->dim[i];
+	}
+	nlist = sc->dim[sc->ndim-1];
+
+  if ( cx->ndim < sc->ndim - 1 ) {
+    rb_raise(rb_eRuntimeError, "ndim of first argument should be larger than (ndim - 1) of self");  	
+  }
+
+	xnseri = 1;
+  for (i=0; i<sc->ndim-1; i++) {
+		xnseri *= cx->dim[i];
+	}
+	
+	if ( xnseri != nseri ) {
+    rb_raise(rb_eRuntimeError, "1st dimension should be same between self and 1st argument");  			
+	}
+
+	if ( cx->ndim == sc->ndim - 1 ) {
+		nreq = 1;
+	}
+	else {
+	  nreq = cx->dim[cx->ndim-1];
+	}
+
+  co0 = carray_new(ca->data_type, cx->ndim, cx->dim, 0, NULL);
+  out = out0 = ca_wrap_struct(co0);
+  co = ca_wrap_writable(out, CA_FLOAT64);
+
+  ca_attach_n(3, sc, cx, co);
+
+  x  = (double*) sc->ptr;
+  px = (double*) cx->ptr;
+  po = (double*) co->ptr;
+
+  ca_create_mask(co);
+  ca_update_mask(cx);
+
+  if ( cx->mask ) {
+    mx = (boolean8_t *) cx->mask->ptr;
+    mo = (boolean8_t *) co->mask->ptr;
+		for (k=0; k<nseri; k++) {
+	    for (i=0; i<nreq; i++) {
+	      if ( ! *mx ) {
+		      if ( linear_index(nlist, x, *px, po) ) {
+	        	*mo = 1;
+	        }
+	      }
+	      else {
+	        *mo = 1;
+	      }
+	      mx++; mo++; px++, po++;
+	    }
+			x += nlist;
+    }		
+  }
+  else {
+    mo = (boolean8_t *) co->mask->ptr;
+		for (k=0; k<nseri; k++) {
+	    for (i=0; i<nreq; i++) {
+	      if ( linear_index(nlist, x, *px, po) ) {
+        	*mo = 1;
+        }
+	      mo++; px++; po++; 
+	    }
+			x += nlist;
+		}
+  }
+
+  ca_sync(co);
+  ca_detach_n(3, sc, cx, co);
+
+  return out0;		
+}
+
+
 static VALUE
 rb_ca_fetch_linear_addr_vectorized (volatile VALUE self, volatile VALUE vx)
 {
@@ -1372,6 +1474,9 @@ Init_carray_order ()
   rb_define_method(rb_cCArray,  "fetch_linear_addr",
                                 rb_ca_fetch_linear_addr, 1);
 
+  rb_define_method(rb_cCArray,  "vectorized_find_linear_addr",
+                                rb_ca_find_linear_addr_vectorized, 1);
+
   rb_define_method(rb_cCArray,  "vectorized_fetch_linear_addr",
                                 rb_ca_fetch_linear_addr_vectorized, 1);
 

data/ext/carray_stat_proc.rb

@@ -745,7 +745,7 @@ static void
 ca_proc_stddev_<type> (ca_size_t elements, ca_size_t min_count,
                      boolean8_t *m, void *ptr, CAStatIterator *it,
                      int return_object, VALUE *retobj,
-                     boolean8_t *retmask, <atype> *retval)
+                     boolean8_t *retmask, float64_t *retval)
 {
   volatile <atype> sum = <azero>, sum2 = <azero>, ave, var, diff;
   <type> *p = (<type> *) ptr;
@@ -802,7 +802,7 @@ ca_proc_stddev_<type> (ca_size_t elements, ca_size_t min_count,
     if ( retmask ) {
       *retmask = ( count > min_count ) ? 1 : 0;
     }
-    *retval  = sqrt_<op_type>(var);
+    *retval  = <type2dbl>(sqrt_<op_type>(var));
   }
 }
 

data/ext/version.h

@@ -8,9 +8,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.5.8"
-#define CA_VERSION_CODE 158
+#define CA_VERSION "1.5.9"
+#define CA_VERSION_CODE 159
 #define CA_VERSION_MAJOR 1
 #define CA_VERSION_MINOR 5
-#define CA_VERSION_TEENY 8
-#define CA_VERSION_DATE "2023/01/13"
+#define CA_VERSION_TEENY 9
+#define CA_VERSION_DATE "2023/06/19"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Ruby/CArray is an extension library for the multi-dimensional numerical array