carray 1.5.1 → 1.5.6

data/lib/carray/serialize.rb

@@ -3,10 +3,8 @@
 #  carray/serialize.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
 #
 # ----------------------------------------------------------------------------
 #
@@ -41,8 +39,10 @@
 #   has_attribute    : int32  
 #
 # offset 256 bytes
-#   data           : bytes*elements : value data
-#   mask           : int8*elements  : mask data if has_mask == 1
+#   data             : bytes*elements : value data
+#   mask             : int8*elements  : mask data if has_mask == 1
+#   attribute        : object marshal : attribute
+#   data_class_name  : string marshal : data_class_name
 
 require "stringio"
 
@@ -59,6 +59,7 @@ class CArray::Serializer   # :nodoc:
     int32     :has_mask
     array     :dim,            :type => CArray.int64(CA_RANK_MAX)
     int32     :has_attr
+    int32     :has_data_class
   }
 
   Header_Legacy = CA.struct(:pack=>1, :size=>256) {
@@ -83,7 +84,7 @@ class CArray::Serializer   # :nodoc:
     end
   end
 
-  def save (ca, opt = {})
+  def save (ca, **opt)
     endian = opt[:endian] || CArray.endian
     # ---
     header = Header.new()
@@ -95,15 +96,16 @@ class CArray::Serializer   # :nodoc:
     header[:ndim]           = ca.ndim
     header[:elements]       = ca.elements
     header[:has_mask]       = ca.has_mask? ? 1 : 0
+    header[:has_data_class] = ca.has_data_class? ? 1 : 0
     header[:dim][[0,ca.ndim]] = ca.dim
-    attr = nil
+    attributes = nil
     if ca.attribute
-      attr = ca.attribute.clone
+      attributes = ca.attribute.clone
     end
     if opt[:attribute]
-      (attr ||= {}).update(opt[:attribute])
+      (attributes ||= {}).update(opt[:attribute])
     end
-    header[:has_attr]       = attr.empty? ? 0 : 1
+    header[:has_attr]       = attributes.empty? ? 0 : 1
     unless CArray.endian == endian
       header.swap_bytes!
     end
@@ -121,14 +123,17 @@ class CArray::Serializer   # :nodoc:
     if ca.has_mask?
       ca.mask.dump_binary(@io)
     end
-    if attr
-      Marshal.dump(attr, @io)
+    if attributes
+      Marshal.dump(attributes, @io)
+    end
+    if ca.has_data_class?
+      Marshal.dump(ca.data_class.to_s, @io)
     end
     return ca
   end
   
-  def load (opt = {}, legacy: false)
-    if legacy
+  def load (**opt)
+    if opt[:legacy]
       header = Header_Legacy.decode(@io.read(256))
     else
       header = Header.decode(@io.read(256))
@@ -151,7 +156,8 @@ class CArray::Serializer   # :nodoc:
     elements  = header[:elements]
     has_mask  = header[:has_mask] != 0 ? true : false
     dim       = header[:dim][[0, ndim]].to_a
-    has_attr  = header[:has_attr]
+    has_attr  = header[:has_attr] != 0 ? true : false
+    has_data_class = header[:has_data_class] != 0 ? true : false
     if data_type == 255
       data_type = header[:data_type_name].strip.to_sym
     end
@@ -172,9 +178,12 @@ class CArray::Serializer   # :nodoc:
       ca.mask = 0
       ca.mask.load_binary(@io)
     end
-    if has_attr == 1
+    if has_attr
       ca.attribute = Marshal.load(@io)
     end
+    if has_data_class 
+      ca.data_class = Kernel.const_get(Marshal.load(@io))
+    end
     return ca
   end
   
@@ -182,36 +191,36 @@ end
 
 class CArray
 
-  def self.save(ca, output, opt={})
+  def self.save(ca, output, **opt)
     case output
     when String
       open(output, "wb:ASCII-8BIT") { |io|
-        return Serializer.new(io).save(ca, opt)
+        return Serializer.new(io).save(ca, **opt)
       }
     else
-      return Serializer.new(output).save(ca, opt) 
+      return Serializer.new(output).save(ca, **opt) 
     end
   end
 
-  def self.load (input, opt={})
+  def self.load (input, **opt)
     case input
     when String
       if input.length >= 256 and input =~ /\A_CARRAY_.{8}_(LE|BE)_/
         io = StringIO.new(input)
-        return Serializer.new(io).load(opt)
+        return Serializer.new(io).load(**opt)
       else
         open(input, "rb:ASCII-8BIT") { |io|
-          return Serializer.new(io).load(opt)
+          return Serializer.new(io).load(**opt)
         }
       end
     else
-      return Serializer.new(input).load(opt)   
+      return Serializer.new(input).load(**opt)   
     end
   end
 
-  def self.dump (ca, opt={})
+  def self.dump (ca, **opt)
     io = StringIO.new("")
-    Serializer.new(io).save(ca, opt) 
+    Serializer.new(io).save(ca, **opt) 
     return io.string
   end
 

data/lib/carray/string.rb

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

@@ -3,19 +3,17 @@
 #  carray/struct.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
 #
 # ----------------------------------------------------------------------------
 #
 # The data class for fixed length carray are required to satisfy only
-# four conditions.
+# five conditions.
 #
 #   * constant data_class::DATA_SIZE    -> integer
-#   * constant data_class::MEMBERS      -> array of string
 #   * constant data_class::MEMBER_TABLE -> hash
+#   * constant data_class::MEMBERS      -> array (MEMBER_TABLE.keys as usual)
 #   * method   data_class.decode(data)  -> new data_class object
 #   * method   data_class#encode()      -> string 
 #

data/lib/carray/testing.rb

@@ -3,10 +3,8 @@
 #  carray/test.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
 #
 # ----------------------------------------------------------------------------
 
@@ -41,16 +39,13 @@ class CArray
   
   # Returns the array eliminated all the duplicated elements.
   def uniq
-    ary = to_a.uniq
+    ary = flatten.to_a.uniq
     if has_mask?
       ary.delete(UNDEF)
     end
-    if has_data_class?
-      return CArray.new(data_class, [ary.length]) { ary }
-    else
-      return CArray.new(data_type, [ary.length], :bytes=>bytes) { ary }
-    end
+    out = CArray.new(data_type, [ary.length], :bytes=>bytes) { ary }
+    out.data_class = data_class if has_data_class?
+    return out
   end
 
-
 end

data/lib/carray/time.rb

@@ -3,10 +3,8 @@
 #  carray/time.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/transform.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
 #
 # ----------------------------------------------------------------------------
 
@@ -96,5 +94,16 @@ class CArray
     return self[:%,1]
   end
 
+  # pulled
+
+  def pulled (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx]
+  end
   
+  def pull (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx].to_ca
+  end
+
 end

data/misc/NOTE

@@ -1,42 +1,6 @@
 Note for developper
 ===================
 
-Make targets
-------------
-
-### create Makefile
-
-    ruby extconf.rb
-
-### build extensions
-
-    make all
-    
-### install via RubyGems
-
-    make build-gem
-    make install-gem
-    make uninstall-gem  ### for uninstall this version
-
-### install via extconf.rb
-
-    ruby extconf.rb
-    make all
-    make install
-
-### cleaning temporary files
-
-    make clean
-    make distclean
-
-### create gem package
-
-    make package        ### -> rake package
-    
-### run test
-
-    make test           ### -> rake test
-
 Utility scripts
 ---------------
 
@@ -53,8 +17,11 @@ Check Points for Debug
 
   * 'elements' should be checked with double float number
 
-  * ca_update_mask/ca_attach/ca_create_mask/ca_has_mask should be called 
-    before ca->mask refered
+  * One of the following methods should be called before ca->mask refered
+    + ca_attach
+    + ca_has_mask 
+    + ca_update_mask
+    + ca_create_mask
 
   * Avoid the exposition of raw VALUE data in object array
 
@@ -71,3 +38,14 @@ OpenMP
 ------
 
   * '--with-cc="gcc -fopenmp"' ... and so on.
+
+Range
+-----
+
+ int rb_arithmetic_sequence_extract(VALUE, VALUE *, VALUE *, VALUE *, int *);
+
+ /* range.c */
+ #define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
+ #define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
+ #define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
+ 

data/spec/Classes/CABitfield_spec.rb

@@ -0,0 +1,58 @@
+
+require 'carray'
+require "rspec-power_assert"
+
+describe "TestCArrayCABitfield " do
+
+  example "virtual_array" do
+    a = CArray.int(3,3) { 1 }
+    b = a.bitfield(0)
+    r = b.parent
+    is_asserted_by { b.class == CABitfield }
+    is_asserted_by { true == b.virtual? }
+    is_asserted_by { a == r }
+  end
+
+  example "basic_features" do
+    # ---
+    a = CArray.int(3,3)
+    b = a.bitfield(0)
+    b[] = 1
+    is_asserted_by { a.template { 1 } == a }
+    is_asserted_by { b.template { 1 } == b }
+    b[] = 0
+    is_asserted_by { a.template { 0 } == a }
+    is_asserted_by { b.template { 0 } == b }
+    # ---
+    a = CArray.int(3,3)
+    b = a.bitfield(0..1)
+    b[] = 3
+    is_asserted_by { a.template { 3 } == a }
+    is_asserted_by { b.template { 3 } == b }
+    
+    # ---
+    a = CArray.int(3,3)
+    b = a.bitfield(5..6)
+    b[] = 3
+    is_asserted_by { a.template { 3 << 5 } == a }
+    is_asserted_by { b.template { 3 } == b }
+    
+    # ---
+    a = CArray.int(3,3)
+    b = a.bitfield(27..28)
+    b[] = 3
+    is_asserted_by { a.template { 3 << 27 } == a }
+    is_asserted_by { b.template { 3 } == b }
+  end
+  
+  example "out_of_index" do
+    # ---
+    a = CArray.int8(3)
+    expect { a.bitfield(-1..0) }.to raise_error(IndexError)
+    expect { a.bitfield(0..16) }.to raise_error(IndexError)
+    expect { a.bitfield([nil,2]) }.to raise_error(IndexError)
+    expect { a.bitfield([nil,1]) }.not_to raise_error()
+  end
+
+  
+end

data/spec/Classes/CABlockIterator_spec.rb

@@ -0,0 +1,114 @@
+require "carray"
+require "rspec-power_assert"
+
+describe CABlockIterator do
+
+  describe "each method" do
+
+    before do
+      @original = CArray.object(4,4).seq!
+      @it = @original.blocks(0..1, 0..1)
+    end
+
+    example "should call 4-times its block" do
+      count = 0
+      @it.each do |blk|
+        count += 1
+      end
+      is_asserted_by { count == 4 }
+    end
+
+    example "should have the block parameter of 2x2 CABlock object" do
+      @it.each do |blk|
+        is_asserted_by { blk.class == CABlock }
+        is_asserted_by { blk.data_type == CA_OBJECT }
+        is_asserted_by { blk.dim == [2,2] }
+      end
+    end
+
+  end
+
+  describe "reference method []" do
+
+    before do
+      @original = CArray.object(4,4).seq!
+      @it = @original.blocks(0..1, 0..1)
+    end
+
+    example "should return a 2x2 CABlock object" do
+      blk = @it[0]
+      is_asserted_by { blk.class == CABlock }
+      is_asserted_by { blk.data_type == CA_OBJECT }
+      is_asserted_by { blk == CA_OBJECT([[0,1],[4,5]]) }
+      blk = @it[1,0]
+      is_asserted_by { blk.class == CABlock }
+      is_asserted_by { blk.data_type == CA_OBJECT }
+      is_asserted_by { blk == CA_OBJECT([[8,9],[12,13]]) }
+    end
+
+    example "should return a 2x2 CABlock object" do
+      is_asserted_by { @it[0] == @it.kernel_at_addr(0, @it.reference) }
+      is_asserted_by { @it[1,0] == @it.kernel_at_index([1,0], @it.reference) }
+    end
+
+  end
+
+  describe "store method []=" do
+
+    before do
+      @original = CArray.object(4,4).seq!
+      @it = @original.blocks(0..1, 0..1)
+    end
+
+    example "should return a 2x2 CABlock object" do
+      @it[0] = 1
+      @it[1,0] = 2
+      is_asserted_by { @it.reference == CA_OBJECT( [ [ 1, 1, 2, 3 ],
+                                               [ 1, 1, 6, 7 ],
+                                               [ 2, 2, 10, 11 ],
+                                               [ 2, 2, 14, 15 ] ] ) }
+    end
+
+  end
+
+  describe "pick method" do
+
+    before do
+      @original = CArray.object(4,4).seq!
+      @it = @original.blocks(0..1, 0..1)
+    end
+
+    example "should return a 2x2 CABlock object" do
+      blk = @it.pick(0)
+      is_asserted_by { blk.class == CArray }
+      is_asserted_by { blk.data_type == CA_OBJECT }
+      is_asserted_by { blk == CA_OBJECT([[0,2],[8,10]]) }
+      blk = @it.pick(1,0)
+      is_asserted_by { blk.class == CArray }
+      is_asserted_by { blk.data_type == CA_OBJECT }
+      is_asserted_by { blk == CA_OBJECT([[4,6],[12,14]]) }
+    end
+
+  end
+
+  describe "put method" do
+
+    before do
+      @original = CArray.object(4,4).seq!
+      @it = @original.blocks(0..1, 0..1)
+    end
+
+    example "should store value via 2x2 CBlock object" do
+      @it.put(0,1)
+      @it.put(0,1,2)
+      is_asserted_by { @it.pick(0) == CA_OBJECT([[1,1],[1,1]]) }
+      is_asserted_by { @it.pick(0,1) == CA_OBJECT([[2,2],[2,2]]) }
+      is_asserted_by { @it.reference == CA_OBJECT([[ 1, 2, 1, 2 ],
+                                             [ 4, 5, 6, 7 ],
+                                             [ 1, 2, 1, 2 ],
+                                             [ 12, 13, 14, 15 ]]) }
+    end
+
+  end
+
+end