carray 1.5.2 → 1.5.3

data/ext/carray_math.rb

@@ -155,6 +155,10 @@ monfunc("exp", "exp",
       FLOAT_TYPES => "(#2) = exp(#1);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cexp(#1);" : nil,
       OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("exp"), 0);')
+monfunc("exp2", "exp2",
+      FLOAT_TYPES => "(#2) = exp2(#1);",
+      CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cpow(2, (#1));" : nil,
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("exp2"), 0);')
 monfunc("exp10", "exp10",
       FLOAT_TYPES => "(#2) = pow(10, (#1));",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = cpow(10, (#1));" : nil,
@@ -166,6 +170,12 @@ monfunc("log", "log",
 monfunc("log10", "log10",
       FLOAT_TYPES => "(#2) = log10(#1);",
       OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("log10"), 0);')
+monfunc("log2", "log2",
+      FLOAT_TYPES => "(#2) = log2(#1);",
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("log2"), 0);')
+monfunc("logb", "logb",
+      FLOAT_TYPES => "(#2) = logb(#1);",
+      OBJ_TYPES   => '(#2) = rb_funcall((#1), rb_intern("logb"), 0);')
 monfunc("sin", "sin",
       FLOAT_TYPES => "(#2) = sin(#1);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#2) = csin(#1);" : nil,
@@ -217,12 +227,14 @@ monfunc("atanh", "atanh",
 
 
 binop("pmax", "pmax",
-      ALL_TYPES =>"(#3) = (#1) > (#2) ? (#1) : (#2);",
+      INT_TYPES =>"(#3) = (#1) > (#2) ? (#1) : (#2);",
+      FLOAT_TYPES =>"(#3) = fmax(#1, #2);",
       CMPLX_TYPES => nil,
       OBJ_TYPES =>'(#3) = rb_funcall(rb_assoc_new((#1),(#2)), rb_intern("max"), 0);')
 
 binop("pmin", "pmin",
-      ALL_TYPES =>"(#3) = (#1) < (#2) ? (#1) : (#2);",
+      INT_TYPES =>"(#3) = (#1) < (#2) ? (#1) : (#2);",
+      FLOAT_TYPES =>"(#3) = fmin(#1, #2);",
       CMPLX_TYPES => nil,
       OBJ_TYPES =>'(#3) = rb_funcall(rb_assoc_new((#1),(#2)), rb_intern("min"), 0);')
 
@@ -258,6 +270,12 @@ binop("rcp_mul", "rcp_mul",
 
 binop("%", "mod",
       INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) % (#2);",
+      FLOAT_TYPES => "(#3) = fmod(#1, #2);",
+      OBJ_TYPES => '(#3) = rb_funcall((#1), id_percent, 1, (#2));')
+
+binop("reminder", "reminder",
+      INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) % (#2);",
+      FLOAT_TYPES => "(#3) = remainder(#1, #2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_percent, 1, (#2));')
 
 binop("&", "bit_and_i",

data/ext/carray_numeric.c

@@ -11,11 +11,6 @@
 #include "ruby.h"
 #include "carray.h"
 
-#if RUBY_VERSION_CODE >= 240
-# define rb_cFixnum rb_cInteger
-# define rb_cBignum rb_cInteger
-#endif
-
 VALUE CA_NAN, CA_INF;
 
 static ID id___or__;
@@ -24,24 +19,18 @@ static ID id___xor__;
 static ID id___rshift__;
 static ID id___lshift__;
 
-VALUE
-rb_num_nan (VALUE self)
-{
-  return CA_NAN;
-}
-
-VALUE
-rb_num_inf (VALUE self)
-{
-  return CA_INF;
-}
+static ID id_bit_or;
+static ID id_bit_and;
+static ID id_bit_xor;
+static ID id_lshift;
+static ID id_rshift;
 
 static VALUE
 rb_hack_or(VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_or"), 1, x);
+      return rb_funcall(y, id_bit_or, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -61,7 +50,7 @@ rb_hack_and (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_and"), 1, x);
+      return rb_funcall(y, id_bit_and, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -81,7 +70,7 @@ rb_hack_xor (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
     if ( rb_ca_is_boolean_type(y) ) {
-      return rb_funcall(y, rb_intern("bit_xor"), 1, x);
+      return rb_funcall(y, id_bit_xor, 1, x);
     }
     else {
 #if RUBY_VERSION_CODE >= 190
@@ -101,7 +90,7 @@ rb_hack_lshift (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
 #if RUBY_VERSION_CODE >= 190
-      return rb_num_coerce_bin(x, y, rb_intern("<<"));
+      return rb_num_coerce_bin(x, y, id_lshift);
 #else
       return rb_num_coerce_bin(x, y);
 #endif
@@ -116,7 +105,7 @@ rb_hack_rshift (VALUE x, VALUE y)
 {
   if ( rb_obj_is_carray(y) ) {
 #if RUBY_VERSION_CODE >= 190
-      return rb_num_coerce_bin(x, y, rb_intern(">>"));
+      return rb_num_coerce_bin(x, y, id_rshift);
 #else
       return rb_num_coerce_bin(x, y);
 #endif
@@ -126,12 +115,6 @@ rb_hack_rshift (VALUE x, VALUE y)
   }
 }
 
-static VALUE
-rb_hack_star (VALUE x, VALUE y)
-{
-  return rb_funcall(y, rb_intern("*"), 1, x);
-}
-
 /* ------------------------------------------------------------------- */
 
 #ifdef HAVE_COMPLEX_H
@@ -197,35 +180,51 @@ Init_carray_numeric ()
 {
   /* hack Fixnum and Bignum's "|", "&", "^", "<<", ">>" */
 
-  id___or__ = rb_intern("__or__");
-  id___and__ = rb_intern("__and__");
-  id___xor__ = rb_intern("__xor__");
+  id___or__     = rb_intern("__or__");
+  id___and__    = rb_intern("__and__");
+  id___xor__    = rb_intern("__xor__");
   id___rshift__ = rb_intern("__rshift__");
   id___lshift__ = rb_intern("__lshift__");
 
+  id_bit_or     = rb_intern("bit_or");
+  id_bit_and    = rb_intern("bit_and");
+  id_bit_xor    = rb_intern("bit_xor");
+  id_lshift     = rb_intern("<<");
+  id_rshift     = rb_intern(">>");
+
   CA_NAN = rb_float_new(0.0/0.0);
   CA_INF = rb_float_new(1.0/0.0);
   rb_define_const(rb_cObject, "CA_NAN", CA_NAN);
   rb_define_const(rb_cObject, "CA_INF", CA_INF);
-  rb_define_global_function("nan", rb_num_nan, 0);
-  rb_define_global_function("inf", rb_num_inf, 0);
 
   rb_define_alias(rb_cTrueClass, "__or__", "|");
   rb_define_alias(rb_cTrueClass, "__and__", "&");
   rb_define_alias(rb_cTrueClass, "__xor__", "^");
 
+  rb_define_method(rb_cTrueClass, "|", rb_hack_or, 1);
+  rb_define_method(rb_cTrueClass, "&", rb_hack_and, 1);
+  rb_define_method(rb_cTrueClass, "^", rb_hack_xor, 1);
+
   rb_define_alias(rb_cFalseClass, "__or__", "|");
   rb_define_alias(rb_cFalseClass, "__and__", "&");
   rb_define_alias(rb_cFalseClass, "__xor__", "^");
 
-#if RUBY_VERSION_CODE >= 240
+  rb_define_method(rb_cFalseClass, "|", rb_hack_or, 1);
+  rb_define_method(rb_cFalseClass, "&", rb_hack_and, 1);
+  rb_define_method(rb_cFalseClass, "^", rb_hack_xor, 1);
 
+#if RUBY_VERSION_CODE >= 240
   rb_define_alias(rb_cInteger, "__or__", "|");
   rb_define_alias(rb_cInteger, "__and__", "&");
   rb_define_alias(rb_cInteger, "__xor__", "^");
   rb_define_alias(rb_cInteger, "__lshift__", "<<");
   rb_define_alias(rb_cInteger, "__rshift__", ">>");
 
+  rb_define_method(rb_cInteger, "|", rb_hack_or, 1);
+  rb_define_method(rb_cInteger, "&", rb_hack_and, 1);
+  rb_define_method(rb_cInteger, "^", rb_hack_xor, 1);
+  rb_define_method(rb_cInteger, "<<", rb_hack_lshift, 1);
+  rb_define_method(rb_cInteger, ">>", rb_hack_rshift, 1);
 #else
   rb_define_alias(rb_cFixnum, "__or__", "|");
   rb_define_alias(rb_cFixnum, "__and__", "&");
@@ -238,25 +237,7 @@ Init_carray_numeric ()
   rb_define_alias(rb_cBignum, "__xor__", "^");
   rb_define_alias(rb_cBignum, "__lshift__", "<<");
   rb_define_alias(rb_cBignum, "__rshift__", ">>");
-#endif
 
-  rb_define_method(rb_cTrueClass, "|", rb_hack_or, 1);
-  rb_define_method(rb_cTrueClass, "&", rb_hack_and, 1);
-  rb_define_method(rb_cTrueClass, "^", rb_hack_xor, 1);
-  rb_define_method(rb_cTrueClass, "*", rb_hack_star, 1);
-
-  rb_define_method(rb_cFalseClass, "|", rb_hack_or, 1);
-  rb_define_method(rb_cFalseClass, "&", rb_hack_and, 1);
-  rb_define_method(rb_cFalseClass, "^", rb_hack_xor, 1);
-  rb_define_method(rb_cFalseClass, "*", rb_hack_star, 1);
-
-#if RUBY_VERSION_CODE >= 240
-  rb_define_method(rb_cInteger, "|", rb_hack_or, 1);
-  rb_define_method(rb_cInteger, "&", rb_hack_and, 1);
-  rb_define_method(rb_cInteger, "^", rb_hack_xor, 1);
-  rb_define_method(rb_cInteger, "<<", rb_hack_lshift, 1);
-  rb_define_method(rb_cInteger, ">>", rb_hack_rshift, 1);
-#else
   rb_define_method(rb_cFixnum, "|", rb_hack_or, 1);
   rb_define_method(rb_cFixnum, "&", rb_hack_and, 1);
   rb_define_method(rb_cFixnum, "^", rb_hack_xor, 1);

data/ext/carray_test.c

@@ -216,6 +216,12 @@ rb_obj_is_data_class (VALUE rtype)
   return Qfalse;
 }
 
+static VALUE
+rb_ca_s_is_data_class (VALUE self, VALUE rklass)
+{
+  return rb_obj_is_data_class(rklass);
+}
+
 /* ------------------------------------------------------------- */
 
 /* @overload valid_index? (*idx)
@@ -598,4 +604,7 @@ Init_carray_test ()
   rb_define_method(rb_cCArray, "==", rb_ca_equal, 1);
   rb_define_alias(rb_cCArray, "eql?", "==");
   rb_define_method(rb_cCArray, "hash", rb_ca_hash, 0);
+
+  rb_define_singleton_method(rb_cCArray, "data_class?", rb_ca_s_is_data_class, 1);
+
 }

data/ext/carray_undef.c

@@ -41,12 +41,6 @@ static VALUE rb_ud_equal (VALUE self, VALUE other)
   return ( self == other ) ? Qtrue : Qfalse;
 }
 
-
-static VALUE rb_obj_is_undef (VALUE self)
-{
-  return ( self == CA_UNDEF ) ? Qtrue : Qfalse;
-}
-
 void
 Init_carray_undef ()
 {
@@ -61,7 +55,5 @@ Init_carray_undef ()
   CA_UNDEF  = rb_funcall(rb_cUNDEF, rb_intern("new"), 0);
   rb_undef_method(CLASS_OF(rb_cUNDEF), "new");
   rb_const_set(rb_cObject, rb_intern("UNDEF"), CA_UNDEF);
-
-  rb_define_method(rb_cObject, "undef?", rb_obj_is_undef, 0);
 }
 

data/ext/version.h

@@ -8,9 +8,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.5.2"
-#define CA_VERSION_CODE 152
+#define CA_VERSION "1.5.3"
+#define CA_VERSION_CODE 153
 #define CA_VERSION_MAJOR 1
 #define CA_VERSION_MINOR 5
-#define CA_VERSION_TEENY 2
-#define CA_VERSION_DATE "2020/07/22"
+#define CA_VERSION_TEENY 3
+#define CA_VERSION_DATE "2020/07/31"

data/lib/carray.rb

@@ -3,10 +3,8 @@
 #  lib/carray.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/autoload.rb

@@ -3,8 +3,6 @@
 #  carray/autoload.rb
 #
 #  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-2010  Hiroki Motoyoshi
 #

data/lib/carray/basic.rb

@@ -3,10 +3,8 @@
 #  carray/basic.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/broadcast.rb

@@ -1,45 +1,82 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/broadcast.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#
+#  Copyright (C) 2005-2020 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
 
 class CArray
-  def broadcast_to (*new_dim)
-    if new_dim.size < ndim
-      raise "can't broadcast to #{new_dim.inspect} because of mismatch in rank"
+
+  def broadcast_to (*newdim)
+    
+    if newdim.size < ndim
+      raise "(Broadcasting) can't broadcast to #{newdim.inspect} because too small rank is specified"
     end
-    flag_unbound_repeat = false
-    sdim = []
-    ([1]*(new_dim.size-ndim) + dim).each_with_index do |d, k|
-      if new_dim[k] == 1
-        sdim << 1
-      elsif d == 1
-        flag_unbound_repeat = true
-        sdim << :*
-      elsif d != new_dim[k]
-        raise "can't broadcast to #{new_dim.inspect} because of mismatch in #{d} for #{new_dim[k]} in #{k}th dim"
+
+    #
+    # Try to build unbound repeat index (includes :*)
+    #                     with broadcasting rule in Numpy.
+    #
+    repdim = []
+    shape  = []
+
+    srcdim = dim.dup 
+    dstdim = newdim.dup
+    sd = srcdim.pop
+    dd = dstdim.pop
+    while dd
+      if sd == dd
+        repdim.unshift nil
+        shape.unshift(dd)
+        sd = srcdim.pop
+      elsif dd == 1
+        repdim.unshift :*
+      elsif sd == 1 
+        repdim.unshift :*
+        sd = srcdim.pop
       else
-        sdim << nil
+        raise "(Broadcasting) can't broadcast to #{newdim.inspect} " 
       end
+      dd = dstdim.pop
     end
-    return self[*sdim].bind(*new_dim) if flag_unbound_repeat
-    return self
+
+    #
+    # Call Unbound repeat's bind
+    #
+    return self.reshape(*shape)[*repdim].bind(*newdim) if repdim.include?(:*)
+    
+    self
   end
+
 end
 
 class CScalar
-  def broadcast_to (*new_dim)
-    return self
+  
+  def broadcast_to (*newdim)
+    self
   end
+
 end
 
 class CAUnboundRepeat
+
   alias broadcast_to bind
+
 end
 
 def CArray.broadcast (*argv)
-  sel = argv.select {|arg| arg.is_a?(CArray) }
+  sel = argv.select { |arg| arg.is_a?(CArray) }
   return argv if sel.empty?
+  
   dim = []
   ndim = sel.map(&:ndim).max
   ndim.times do |k|
-    dim[k] = sel.map{|arg| arg.dim[k] || 1 }.max
+    dim[k] = sel.map { |arg| arg.dim[k] || 1 }.max
   end
-  return argv.map{|arg| arg.is_a?(CArray) ? arg.broadcast_to(*dim) : arg }
+
+  argv.map { |arg| arg.is_a?(CArray) ? arg.broadcast_to(*dim) : arg }
 end
+

data/lib/carray/compose.rb

@@ -3,10 +3,8 @@
 #  carray/composition.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 
@@ -34,6 +32,7 @@ class CArray
       end
     end
     out = CArray.new(data_type, newdim, &block)
+    out.data_class = data_class if has_data_class?
     if out.has_mask?
       out.mask.paste(offset, self.false)
     end
@@ -63,6 +62,7 @@ class CArray
       grids[i][offset[i]..-1].seq!(offset[i]+bsize[i])
     end
     out = CArray.new(data_type, newdim)
+    out.data_class = data_class if has_data_class?
     if block_given?
       sel = out.true
       sel[*grids] = 0
@@ -114,7 +114,14 @@ class CArray
     return self[*grids].to_ca
   end
   
-  def self.combine (data_type, tdim, list, at = 0)
+  def self.combine (data_type, tdim, list, at = 0, bytes: nil)
+    if CArray.data_class?(data_type)
+      data_class = data_type
+      data_type  = :fixlen
+      bytes = data_class::DATA_SIZE
+    else
+      data_class = nil
+    end
     has_fill_value = false
     if block_given?
       fill_value = yield
@@ -168,6 +175,7 @@ class CArray
     else      
       obj = CArray.new(data_type, newdim)
     end
+    out.data_class = data_class if data_class
     idx = newdim.map{0}
     block.each_with_index do |item, tidx|
       (at...at+tndim).each_with_index do |d,i|
@@ -178,11 +186,18 @@ class CArray
     obj
   end
 
-  def self.bind (data_type, list, at = 0)
-    return CArray.combine(data_type, [list.size], list, at)
+  def self.bind (data_type, list, at = 0, bytes: nil)
+    return CArray.combine(data_type, [list.size], list, at, bytes: bytes)
   end
 
-  def self.composite (data_type, tdim, list, at = 0)
+  def self.composite (data_type, tdim, list, at = 0, bytes: nil)
+    if CArray.data_class?(data_type)
+      data_class = data_type
+      data_type  = :fixlen
+      bytes = data_class::DATA_SIZE
+    else
+      data_class = nil
+    end
     if not tdim.is_a?(Array) or tdim.size == 0
       raise "invalid tiling dimension"
     end
@@ -213,7 +228,8 @@ class CArray
     end
     newdim = dim.clone
     newdim[at,0] = tdim
-    obj = CArray.new(data_type, newdim)
+    obj = CArray.new(data_type, newdim, bytes: bytes)
+    out.data_class = data_class if data_class
     idx = Array.new(ndim+tndim) { nil }
     CArray.each_index(*tdim) do |*tidx|
       idx[at,tndim] = tidx
@@ -222,13 +238,21 @@ class CArray
     obj
   end
 
-  def self.merge (data_type, list, at = -1)
-    return CArray.composite(data_type, [list.size], list, at)
+  def self.merge (data_type, list, at = -1, bytes: nil)
+    return CArray.composite(data_type, [list.size], list, at, bytes: bytes)
   end
   
   def self.join (*argv)
     # get options
     case argv.first
+    when Class
+      if CArray.data_class?(argv.first)
+        data_class = argv.shift
+        data_type = "fixlen"
+        bytes = data_class::DATA_SIZE
+      else
+        raise "#{argv.first} can not to be a data_class for CArray"
+      end
     when Integer, Symbol, String
       type, = *CArray.guess_type_and_bytes(argv.shift, 0)
     else