carray 1.5.1 → 1.5.6

data/ext/extconf.rb

@@ -135,11 +135,23 @@ end
 # --- check tgmath.h
 
 have_header("tgmath.h")
+have_func("atan2",  "math.h")
+have_func("hypot",  "math.h")
+have_func("lgamma", "math.h")
+have_func("expm1",  "math.h")
 
 # --- check mergesort routine
 
 have_func("mergesort", "stdlib.h")
 
+# --- check mergesort routine
+
+have_func("strptime", "time.h")
+
+# --- check raneg object
+
+have_func("rb_arithmetic_sequence_extract")
+
 # --- setup install files
 
 $INSTALLFILES = []
@@ -153,7 +165,7 @@ $INSTALLFILES << ['carray_config.h', '$(archdir)']
 #
 
 if /cygwin|mingw/ =~ RUBY_PLATFORM
-  sitearchdir = Config::CONFIG["sitearchdir"]
+  sitearchdir = RbConfig::CONFIG["sitearchdir"]
   $DLDFLAGS << " -L#{sitearchdir} -Wl,--out-implib=libcarray.a "
   unless File.exist? "libcarray.a"
     $TOUCHED_LIBCARRAY_A = true
@@ -219,7 +231,7 @@ carray_stat_proc.c: carray_stat_proc.rb
 carray_math.c: carray_math.rb
 	${RUBY} carray_math.rb
 
-rdoc:
+yard:
 	sh utils/create_rdoc.sh
 
 clean-generated:

data/ext/mkmath.rb

@@ -305,7 +305,7 @@ static VALUE rb_ca_#{name}_bang (VALUE self, VALUE other)
 }
   end
   METHODS     << %{
-  rb_define_method(rb_cCArray, "#{op}!", rb_ca_#{name}_bang, 1);
+  rb_define_method(rb_cCArray, "#{name}!", rb_ca_#{name}_bang, 1);
 }
 
 end
@@ -385,7 +385,7 @@ ca_moncmp_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1,
   io.puts "};"
   io.puts
   io.print %{
-static VALUE rb_ca_#{name} (VALUE self, VALUE other)
+static VALUE rb_ca_#{name} (VALUE self)
 { return rb_ca_call_moncmp(self, ca_moncmp_#{name}); }
   }
   DEFINITIONS << io.string

data/ext/ruby_carray.c

@@ -3,16 +3,16 @@
   ruby_carray.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
 
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
 #include "version.h"
 
+VALUE rb_cArithSeq;
+  
 VALUE rb_eCADataTypeError;
 VALUE rb_mCA;
 
@@ -72,13 +72,14 @@ void Init_ca_iter_window ();
 
 void Init_carray_mathfunc ();
 
-
 void
 Init_carray_ext ()
 {
 
   /* Classes and Modules */
 
+  rb_cArithSeq   = rb_const_get(rb_cEnumerator, rb_intern("ArithmeticSequence"));
+
   /* -- CArray class -- */
 
   rb_cCArray     = rb_define_class("CArray",    rb_cObject);
@@ -97,7 +98,7 @@ Init_carray_ext ()
   rb_eCADataTypeError =
     rb_define_class_under(rb_cCArray, "DataTypeError", rb_eStandardError);
 
-  /* rdoc:
+  /* yard:
      class CArray::DataTypeError # :nodoc:
      end
   */
@@ -111,7 +112,7 @@ Init_carray_ext ()
 
   /* -- version -- */
 
-  /* rdoc: 
+  /* yard: 
     class CArray
       VERSION = nil         # :nodoc:
       VERSION_CODE = nil    # :nodoc:
@@ -122,11 +123,17 @@ Init_carray_ext ()
     end
   */
   
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION", rb_str_new2(CA_VERSION));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_CODE", INT2NUM(CA_VERSION_CODE));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_MAJOR", INT2NUM(CA_VERSION_MAJOR));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_MINOR", INT2NUM(CA_VERSION_MINOR));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_TEENY", INT2NUM(CA_VERSION_TEENY));
+  /* @private */
   rb_define_const(rb_cCArray, "VERSION_DATE", rb_str_new2(CA_VERSION_DATE));
 
   /* -- system -- */
@@ -135,8 +142,10 @@ Init_carray_ext ()
   rb_define_const(rb_cObject, "CA_NIL", CA_NIL);
 
 #ifdef HAVE_COMPLEX_H
+  /* @private */
   rb_define_const(rb_cCArray, "HAVE_COMPLEX", Qtrue);
 #else
+  /* @private */
   rb_define_const(rb_cCArray, "HAVE_COMPLEX", Qfalse);
 #endif
 
@@ -169,7 +178,6 @@ Init_carray_ext ()
   rb_define_const(rb_cObject, "CA_DCOMPLEX",    INT2NUM(CA_DCOMPLEX));
   rb_define_const(rb_cObject, "CA_SIZE",        INT2NUM(CA_SIZE));
 
-
   rb_define_const(rb_cObject, "CA_ALIGN_VOIDP",    INT2NUM(CA_ALIGN_VOIDP));
   rb_define_const(rb_cObject, "CA_ALIGN_FIXLEN",   INT2NUM(CA_ALIGN_INT8));
   rb_define_const(rb_cObject, "CA_ALIGN_BOOLEAN",  INT2NUM(CA_ALIGN_INT8));

data/ext/ruby_ccomplex.c

@@ -3,10 +3,8 @@
   ruby_ccomplex.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
 
 ---------------------------------------------------------------------------- */
 
@@ -462,7 +460,7 @@ Init_ccomplex ()
   rb_define_method(rb_cCComplex, "coerce", rb_cc_coerce, 1);
 
   rb_define_method(rb_cCComplex, "==", rb_cc_equal, 1);
-  rb_define_method(rb_cCComplex, "-@", rb_cc_uminus, 1);
+  rb_define_method(rb_cCComplex, "-@", rb_cc_uminus, 0);
   rb_define_method(rb_cCComplex, "+", rb_cc_plus, 1);
   rb_define_method(rb_cCComplex, "-", rb_cc_minus, 1);
   rb_define_method(rb_cCComplex, "*", rb_cc_asterisk, 1);

data/ext/ruby_float_func.c

@@ -3,10 +3,8 @@
   ruby_numeric.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
 
 ---------------------------------------------------------------------------- */
 

data/ext/version.h

@@ -3,16 +3,14 @@
   version.h
 
   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
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.5.1"
-#define CA_VERSION_CODE 151
+#define CA_VERSION "1.5.6"
+#define CA_VERSION_CODE 156
 #define CA_VERSION_MAJOR 1
 #define CA_VERSION_MINOR 5
-#define CA_VERSION_TEENY 1
-#define CA_VERSION_DATE "2020/07/01"
+#define CA_VERSION_TEENY 6
+#define CA_VERSION_DATE "2021/02/25"

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
 #
 # ----------------------------------------------------------------------------
 
@@ -32,6 +30,7 @@ require 'carray/transform'
 require 'carray/convert'
 require 'carray/testing'
 require 'carray/ordering'
+require 'carray/broadcast'
 
 require 'carray/math'
 require 'carray/iterator'
@@ -46,6 +45,7 @@ require 'carray/obsolete'
 # autoload
 
 unless $CARRAY_NO_AUTOLOAD 
+  
   require 'carray/autoload'
   require 'carray/autoload/autoload_base'
   require 'carray/autoload/autoload_io_imagemagick'
@@ -59,12 +59,12 @@ unless $CARRAY_NO_AUTOLOAD
   require 'carray/autoload/autoload_gem_gnuplot'
   require 'carray/autoload/autoload_gem_narray'
   require 'carray/autoload/autoload_gem_numo_narray'
-  require 'carray/autoload/autoload_gem_io_csv'
-  require 'carray/autoload/autoload_gem_io_sqlite3'
-  require 'carray/autoload/autoload_gem_rmagick'
-  require 'carray/autoload/autoload_gem_cairo'
-  require 'carray/autoload/autoload_gem_opencv'
-  require 'carray/autoload/autoload_gem_ffi'
+#  require 'carray/autoload/autoload_gem_io_csv'
+#  require 'carray/autoload/autoload_gem_io_sqlite3'
+#  require 'carray/autoload/autoload_gem_rmagick'
+#  require 'carray/autoload/autoload_gem_cairo'
+#  require 'carray/autoload/autoload_gem_opencv'
+#  require 'carray/autoload/autoload_gem_ffi'
 
   undef autoload_method
 end

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/autoload/autoload_gem_numo_narray.rb

@@ -1,15 +1,15 @@
 class CArray
-  autoload_method :to_numo, "carray-numo-narray"
-  autoload_method :numo, "carray-numo-narray"
-  autoload_method "self.as_numo", "carray-numo-narray"
+  autoload_method :to_numo,        "carray-numo-narray"
+  autoload_method :numo,           "carray-numo-narray"
+  autoload_method "self.as_numo",  "carray-numo-narray"
   autoload_method "self.as_numo!", "carray-numo-narray"
-  autoload_method :as_numo, "carray-numo-narray"
-  autoload_method :as_numo!, "carray-numo-narray"
+  autoload_method :as_numo,        "carray-numo-narray"
+  autoload_method :as_numo!,       "carray-numo-narray"
 end
 
 module Numo
   class NArray
     autoload_method :to_ca, "carray-numo-narray"
-    autoload_method :ca, "carray-numo-narray"
+    autoload_method :ca,    "carray-numo-narray"
   end
 end

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

@@ -0,0 +1,101 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/broadcast.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#
+#  Copyright (C) 2005-2020 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
+
+class CArray
+
+  def broadcast_to (*newdim)
+    
+    if newdim.size < ndim
+      raise "(Broadcasting) can't broadcast to #{newdim.inspect} because too small rank is specified"
+    end
+
+    #
+    # 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
+        raise "(Broadcasting) can't broadcast to #{newdim.inspect} " 
+      end
+      dd = dstdim.pop
+    end
+
+    #
+    # Call Unbound repeat's bind
+    #
+    return self.reshape(*shape)[*repdim].bind(*newdim) if repdim.include?(:*)
+    
+    self
+  end
+
+end
+
+class CScalar
+  
+  def broadcast_to (*newdim)
+    out = CArray.new(data_type, newdim, bytes: bytes)
+    out[] = self
+    out
+  end
+
+end
+
+class CAUnboundRepeat
+
+  alias broadcast_to bind
+
+end
+
+def CArray.broadcast (*argv, expand_scalar: false, &block)
+  
+  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
+  end
+
+  if not expand_scalar
+    list = argv.map { |arg| 
+      case arg
+      when CScalar
+        arg
+      when CArray
+        arg.broadcast_to(*dim)
+      else
+        arg
+      end
+    }
+  else
+    list = argv.map { |arg| arg.is_a?(CArray) ? arg.broadcast_to(*dim) : arg }
+  end
+  
+  return block.call(*list) if block
+  return list
+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